Simplify cache setup for CachedHttpClient

Author: stloyd

README.markdown

@@ -71,14 +71,17 @@ $client = new Github\Client(
 );
 
 // Or select directly which cache you want to use
-$client = new Github\Client(
-    new Github\HttpClient\CachedHttpClient(
-        new Github\HttpClient\Cache\FilesystemCache('/tmp/github-api-cache')
-    )
+$client = new Github\HttpClient\CachedHttpClient();
+$client->setCache(
+    // Built in one, or any cache implementing this interface:
+    // Github\HttpClient\Cache\CacheInterface
+    new Github\HttpClient\Cache\FilesystemCache('/tmp/github-api-cache')
 );
+
+$client = new Github\Client($client);
 ```
 
-Using cache, the client will get cached responses if resources haven't changed since last time,  
+Using cache, the client will get cached responses if resources haven't changed since last time,
 **without** reaching the `X-Rate-Limit` [imposed by github](http://developer.github.com/v3/#rate-limiting).
 
 

lib/Github/HttpClient/CachedHttpClient.php

@@ -2,8 +2,6 @@
 
 namespace Github\HttpClient;
 
-use Buzz\Client\ClientInterface;
-
 use Github\HttpClient\Cache\CacheInterface;
 use Github\HttpClient\Cache\FilesystemCache;
 
@@ -22,15 +20,23 @@ class CachedHttpClient extends HttpClient
     protected $cache;
 
     /**
-     * @param array                $options
-     * @param null|ClientInterface $client
-     * @param null|CacheInterface  $cache
+     * @return CacheInterface
      */
-    public function __construct(array $options = array(), ClientInterface $client = null, CacheInterface $cache = null)
+    public function getCache()
     {
-        parent::__construct($options, $client);
+        if (null === $this->cache) {
+            $this->cache = new FilesystemCache($this->options['cache_dir'] ?: sys_get_temp_dir().DIRECTORY_SEPARATOR.'php-github-api-cache');
+        }
+
+        return $this->cache;
+    }
 
-        $this->cache = $cache ?: new FilesystemCache($this->options['cache_dir'] ?: sys_get_temp_dir().DIRECTORY_SEPARATOR.'php-github-api-cache');
+    /**
+     * @param $cache CacheInterface
+     */
+    public function setCache(CacheInterface $cache)
+    {
+        $this->cache = $cache;
     }
 
     /**
@@ -42,10 +48,10 @@ public function request($path, array $parameters = array(), $httpMethod = 'GET',
 
         $key = trim($this->options['base_url'].$path, '/');
         if ($response->isNotModified()) {
-            return $this->cache->get($key);
+            return $this->getCache()->get($key);
         }
 
-        $this->cache->set($key, $response);
+        $this->getCache()->set($key, $response);
 
         return $response;
     }
@@ -58,7 +64,7 @@ public function request($path, array $parameters = array(), $httpMethod = 'GET',
     protected function createRequest($httpMethod, $url)
     {
         $request = parent::createRequest($httpMethod, $url);
-        $request->addHeader(sprintf('If-Modified-Since: %s', date('r', $this->cache->getModifiedSince($url))));
+        $request->addHeader(sprintf('If-Modified-Since: %s', date('r', $this->getCache()->getModifiedSince($url))));
 
         return $request;
     }

test/Github/Tests/HttpClient/CachedHttpClientTest.php

@@ -16,9 +16,9 @@ public function shouldCacheResponseAtFirstTime()
 
         $httpClient = new TestCachedHttpClient(
             array('base_url' => ''),
-            $this->getMock('Buzz\Client\ClientInterface', array('setTimeout', 'setVerifyPeer', 'send')),
-            $cache
+            $this->getMock('Buzz\Client\ClientInterface', array('setTimeout', 'setVerifyPeer', 'send'))
         );
+        $httpClient->setCache($cache);
 
         $cache->expects($this->once())->method('set')->with('test', new Response);
 
@@ -40,9 +40,9 @@ public function shouldGetCachedResponseWhileResourceNotModified()
 
         $httpClient = new TestCachedHttpClient(
             array('base_url' => ''),
-            $client,
-            $cache
+            $client
         );
+        $httpClient->setCache($cache);
         $httpClient->fakeResponse = $response;
 
         $cache->expects($this->once())->method('get')->with('test');
@@ -65,9 +65,9 @@ public function shouldRenewCacheWhenResourceHasChanged()
 
         $httpClient = new TestCachedHttpClient(
             array('base_url' => ''),
-            $client,
-            $cache
+            $client
         );
+        $httpClient->setCache($cache);
         $httpClient->fakeResponse = $response;
 
         $cache->expects($this->once())->method('set')->with('test', $response);