Merge pull request #11 from elliotchance/adapter-bug

Fix another bug
elliotchance · Apr 29, 2014 · 785af6b · 785af6b
2 parents 232ce01 + 0492f22
commit 785af6b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 16 deletions.
diff --git a/src/Hoard/AbstractPool.php b/src/Hoard/AbstractPool.php
@@ -19,10 +19,10 @@ abstract class AbstractPool implements PoolInterface
     protected $logger = null;
 
     /**
-     * Create a pool with an adapter.
+     * Set the adapter.
      * @param \Hoard\AdapterInterface $adapter The adapter.
      */
-    public function __construct(\Hoard\AdapterInterface $adapter)
+    public function setAdapter(\Hoard\AdapterInterface $adapter)
     {
         $this->adapter = $adapter;
     }

diff --git a/src/Hoard/CacheManager.php b/src/Hoard/CacheManager.php
@@ -51,17 +51,18 @@ public static function getPool($poolName, array $config = array())
             throw new NoSuchPoolException($poolName);
         }
 
+        // create pool
+        $pool = new $className();
+        $adapterOptions = $pool->getAdapterOptions();
+
         // create adapter
         $adapterClass = '\Hoard\Adapter\Memcached';
-        if(array_key_exists('adapter', $config)) {
-            $adapterClass = $config['adapter'];
+        if(array_key_exists('adapter', $adapterOptions)) {
+            $adapterClass = $adapterOptions['adapter'];
         }
-        $adapter = new $adapterClass($config);
-
-        // create pool
-        $pool = new $className($adapter);
+        $adapter = new $adapterClass($adapterOptions);
         $adapter->setPool($pool);
-        $adapter->setAdapterOptions($pool->getAdapterOptions());
+        $pool->setAdapter($adapter);
 
         // attach the default logger
         $pool->setLogger(self::getDefaultLogger());

diff --git a/test/Hoard/CacheManagerTest.php b/test/Hoard/CacheManagerTest.php
@@ -27,17 +27,14 @@ public function testWillUseMemcacheAdapterIfNotProvided()
 
     public function testWillUseAdapterIfProvided()
     {
-        $config = array(
-            'adapter' => '\Hoard\DummyAdapter'
-        );
-        $pool = CacheManager::getPool('test.simple', $config);
+        $pool = CacheManager::getPool('test.custom_adapter');
         $this->assertInstanceOf('\Hoard\DummyAdapter', $pool->getAdapter());
     }
 
     public function testWillSetAdapterOptionsWhenCreatingThePool()
     {
         $pool = CacheManager::getPool('test.simple');
-        $this->assertEquals($pool->getAdapter()->getAdapterOptions(), array('adapter' => 'options'));
+        $this->assertEquals($pool->getAdapter()->getAdapterOptions(), array('foo' => 'bar'));
     }
 
     public function testDefaultLoggerIsASingleton()

diff --git a/test/Hoard/PoolTestCase.php b/test/Hoard/PoolTestCase.php
@@ -43,7 +43,8 @@ public function getMockedPool(array $items = array(), $poolName = '')
         }
 
         // mock the original business logic
-        $mock = $this->getMock($className, null, array($adapter));
+        $mock = $this->getMock($className, null);
+        $mock->setAdapter($adapter);
         $adapter->setPool($mock);
 
         // load in the items

diff --git a/test/HoardPool/Test/CustomAdapter.php b/test/HoardPool/Test/CustomAdapter.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace HoardPool\Test;
+
+class CustomAdapter extends Simple
+{
+
+    public function getAdapterOptions()
+    {
+        return array(
+            'adapter' => '\Hoard\DummyAdapter'
+        );
+    }
+
+}
+
diff --git a/test/HoardPool/Test/Simple.php b/test/HoardPool/Test/Simple.php
@@ -13,7 +13,7 @@ public static function getAdapterName()
     public function getAdapterOptions()
     {
         return array(
-            'adapter' => 'options'
+            'foo' => 'bar'
         );
     }