Merge pull request #3 from php-elementary/memcached

Memcached

Author: vendelev

composer.json

@@ -1,6 +1,6 @@
 {
     "name":         "elementary/mem-cache",
-    "description":  "Cache your data while PHP application is working.",
+    "description":  "Cache your data in Memcached.",
     "license":      "MIT",
     "authors": [
         {
@@ -17,6 +17,8 @@
     "require": {
         "php": ">=5.6",
         "phpunit/phpunit": ">=5.7",
-        "elementary/runtime-cache": "^1.0.0"
+        "psr/simple-cache": "^1.0",
+        "elementary/runtime-cache": "^1.0.0",
+        "elementary/singleton": "^1.0.0"
     }
 }

src/MemCache.php

@@ -26,6 +26,11 @@ class MemCache
      */
     protected $servers = [];
 
+    /**
+     * @var array
+     */
+    protected $options = [];
+
     /**
      * @link http://php.net/manual/en/memcached.add.php
      * @param string $key
@@ -318,9 +323,6 @@ public function getMemcached()
     {
         if ($this->memcached === null) {
             $this->setMemcached(new Memcached());
-
-            $servers = array_values($this->getServers());
-            $this->memcached->addServers($servers);
         }
 
         return $this->memcached;
@@ -335,6 +337,16 @@ public function setMemcached(Memcached $cache)
     {
         $this->memcached = $cache;
 
+        $servers = array_values($this->getServers());
+        if ($servers) {
+            $this->memcached->addServers($servers);
+        }
+
+        $options = $this->getOptions();
+        if ($options) {
+            $this->memcached->setOptions($options);
+        }
+
         return $this;
     }
 
@@ -386,7 +398,7 @@ public function setServers( array $servers)
 
                 $key = implode('', $server);
                 if (!array_key_exists($key, $this->servers)) {
-                    $nServers[] = $servers;
+                    $nServers[] = $server;
                     $this->servers[$key] = $server;
                 }
             }
@@ -398,4 +410,29 @@ public function setServers( array $servers)
 
         return $this;
     }
+
+    /**
+     * @return array
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * @link http://php.net/manual/en/memcached.setoptions.php
+     * @param array $options
+     *
+     * @return $this
+     */
+    public function setOptions(array $options)
+    {
+        $this->options = array_merge($this->options, $options);
+
+        if ($this->memcached !== null && !empty($options)) {
+            $this->memcached->setOptions($options);
+        }
+
+        return $this;
+    }
 }

tests/MemCacheTest.php

@@ -200,6 +200,8 @@ public function stats()
      */
     public function getResult()
     {
+        fwrite(STDOUT, "\n". __METHOD__);
+
         $this->assertInternalType('integer', $this->getMemory()->getResultCode());
         $this->assertInternalType('string', $this->getMemory()->getResultMessage());
     }
@@ -214,6 +216,8 @@ public function getResult()
      */
     public function servers()
     {
+        fwrite(STDOUT, "\n". __METHOD__);
+
         $mem = new MemCache();
         $mem->addServer('test', 123);
         $this->assertEquals([['test', 123, 0]], array_values($mem->getServers()));
@@ -225,6 +229,21 @@ public function servers()
         $this->assertEquals([], $mem->getServers());
     }
 
+    /**
+     * @test
+     * @covers ::getOptions
+     * @covers ::setOptions
+     */
+    public function options()
+    {
+        fwrite(STDOUT, "\n". __METHOD__);
+
+        $mem = new MemCache();
+        $mem->setOptions(['test' => 123]);
+        $mem->setOptions(['test' => 1234, 'test2' => 12345]);
+        $this->assertEquals(['test' => 123, 'test2' => 12345], $mem->getOptions());
+    }
+
     protected function setUp()
     {
         $this->setMemory(new MemCache())