Merge pull request #4 from dorantor/master

Fixed broken server config merge.

Author: dracony

src/PHPixie/Cache/Drivers/Driver.php

@@ -28,12 +28,25 @@ public function __construct($builder, $configData)
         $this->configData = $configData;
     }
 
+    /**
+     * Delete item
+     *
+     * @param $key
+     * @return bool
+     */
     public function deleteItem($key)
     {
         $this->deleteItems(array($key));
         return true;
     }
 
+    /**
+     * Save multiple items
+     *
+     * @param array(Item) $items
+     * @param array $expiryTimes corresponding expiry times
+     * @return bool
+     */
     public function saveMultiple($items, $expiryTimes)
     {
         /** @var Item $item */
@@ -44,6 +57,13 @@ public function saveMultiple($items, $expiryTimes)
         return true;
     }
 
+    /**
+     * Build Items
+     *
+     * @param array $keys
+     * @param array $data
+     * @return array
+     */
     protected function buildItems($keys, $data)
     {
         $result = array();
@@ -58,11 +78,24 @@ protected function buildItems($keys, $data)
         return $result;
     }
 
+    /**
+     * Build Item object
+     *
+     * @param string $key
+     * @param bool $isHit
+     * @param mixed $value stored value
+     * @return Item
+     */
     public function buildItem($key, $isHit, $value = null)
     {
         return new Item($key, $isHit, $value);
     }
 
+    /**
+     * Check if cleanup is required. And perform cleanup(if required)/
+     *
+     * @return void
+     */
     protected function cleanupCheck()
     {
         if($this->cleanupProbability === null) {
@@ -74,10 +107,13 @@ protected function cleanupCheck()
         }
     }
 
+    /**
+     * Default cleanup implementation.
+     *
+     * @return void
+     */
     public function cleanup()
-    {
-
-    }
+    {}
 
     /**
      * @param string $key

src/PHPixie/Cache/Drivers/Type/Memcached.php

@@ -10,14 +10,19 @@ class Memcached extends Driver
     /** @var \Memcached */
     protected $client;
 
-
+    /**
+     * @inheritdoc
+     */
     public function hasItem($key)
     {
         $client = $this->client();
         $client->get($key);
         return $client->getResultCode() == \Memcached::RES_SUCCESS;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getItems(array $keys = array())
     {
         if(empty($keys)) {
@@ -33,12 +38,18 @@ public function getItems(array $keys = array())
         return $this->buildItems($keys, $data);
     }
 
+    /**
+     * @inheritdoc
+     */
     public function deleteItems(array $keys = array())
     {
         $this->client()->deleteMulti($keys);
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function clear()
     {
         $this->client()->flush();
@@ -65,6 +76,9 @@ public function saveItem($item, $expiresAt)
         return true;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getItem($key)
     {
         $client = $this->client();
@@ -88,14 +102,31 @@ public function client()
         return $this->client;
     }
 
+    /**
+     * Prepare server config, because in app config it could be defined w/o port or weight
+     *
+     * @param array $value
+     * @return array
+     */
+    protected function prepareServerConfig(array $value)
+    {
+        return $value + array(null, 11211, 1);
+    }
+
+    /**
+     * Build client
+     *
+     * @return \Memcached
+     */
     protected function buildClient()
     {
         $client = new \Memcached();
         $servers = $this->configData->getRequired('servers');
         foreach($servers as $key => $value) {
-            $servers[$key] = array(null, 11211, 1) + $value;
+            $servers[$key] = $this->prepareServerConfig($value);
         }
         $client->addServers($servers);
+
         return $client;
     }
 }

src/PHPixie/Cache/Item.php

@@ -19,31 +19,49 @@ public function __construct($key, $isHit, $value = null, $expiresAt = null)
         $this->expiresAt = $expiresAt;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function getKey()
     {
         return $this->key;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function get()
     {
         return $this->value;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function isHit()
     {
         return $this->isHit;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function set($value)
     {
         $this->value = $value;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function expiresAt($expiresAt)
     {
         $this->expiresAt = $expiresAt;
     }
 
+    /**
+     * @inheritdoc
+     */
     public function expiresAfter($interval)
     {
         if($interval === null) {
@@ -59,6 +77,11 @@ public function expiresAfter($interval)
         $this->expiresAt = $expires->add($interval);
     }
 
+    /**
+     * Get exiration datetime
+     *
+     * @return null|\DateTimeInterface
+     */
     public function getExpiresAt()
     {
         return $this->expiresAt;

tests/PHPixie/Tests/Cache/Driver/MemcachedTest.php

@@ -16,4 +16,48 @@ class MemcachedTest extends DriverTest
             )
         )
     );
+
+    public function testServerConfig()
+    {
+        $driver = $this->cache->storage('default')->driver();
+
+        $params = array(
+            array('127.0.0.1'),
+            array('192.168.1.100'),
+            array('192.168.1.100', 11212),
+            array('192.168.1.100', 11212, 3),
+        );
+        $expected = array(
+            array('127.0.0.1', 11211, 1),
+            array('192.168.1.100', 11211, 1),
+            array('192.168.1.100', 11212, 1),
+            array('192.168.1.100', 11212, 3),
+        );
+
+        foreach (array_keys($params) as $key) {
+            $this->assertEquals(
+                $expected[$key],
+                $this->invokeMethod($driver, 'prepareServerConfig', array($params[$key]))
+            );
+        }
+    }
+
+    /**
+     * Call protected/private method of a class.
+     *
+     * @param object &$object    Instantiated object that we will run method on.
+     * @param string $methodName Method name to call
+     * @param array  $parameters Array of parameters to pass into method.
+     * @link https://jtreminio.com/2013/03/unit-testing-tutorial-part-3-testing-protected-private-methods-coverage-reports-and-crap/
+     *
+     * @return mixed Method return.
+     */
+    public function invokeMethod(&$object, $methodName, array $parameters = array())
+    {
+        $reflection = new \ReflectionClass(get_class($object));
+        $method = $reflection->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method->invokeArgs($object, $parameters);
+    }
 }