Fix CachedResponseAdapter

Author: willdurand

tests/Geocoder/Tests/CachedResponseAdapter.php

@@ -8,11 +8,14 @@ class CachedResponseAdapter implements HttpAdapterInterface
 {
     private $adapter;
 
+    private $useCache;
+
     private $cacheDir;
 
-    public function __construct(HttpAdapterInterface $adapter, $cacheDir = '.cached_responses')
+    public function __construct(HttpAdapterInterface $adapter, $useCache = false, $cacheDir = '.cached_responses')
     {
         $this->adapter  = $adapter;
+        $this->useCache = $useCache;
         $this->cacheDir = $cacheDir;
     }
 
@@ -21,10 +24,9 @@ public function __construct(HttpAdapterInterface $adapter, $cacheDir = '.cached_
      */
     public function getContent($url)
     {
-        $useCache = isset($_SERVER['USE_CACHED_RESPONSES']) && true === $_SERVER['USE_CACHED_RESPONSES'];
-        $file     = sprintf('%s/%s/%s', realpath(__DIR__ . '/../../'), $this->cacheDir, sha1($url));
+        $file = sprintf('%s/%s/%s', realpath(__DIR__ . '/../../'), $this->cacheDir, sha1($url));
 
-        if ($useCache && is_file($file) && is_readable($file)) {
+        if ($this->useCache && is_file($file) && is_readable($file)) {
             $response = unserialize(file_get_contents($file));
 
             if (!empty($response)) {
@@ -34,7 +36,7 @@ public function getContent($url)
 
         $response = $this->adapter->getContent($url);
 
-        if ($useCache) {
+        if ($this->useCache) {
             file_put_contents($file, serialize($response));
         }
 

tests/Geocoder/Tests/TestCase.php

@@ -49,8 +49,14 @@ protected function getMockAdapterReturns($returnValue)
      */
     protected function getAdapter()
     {
-        return new CachedResponseAdapter(
-            new CurlHttpAdapter()
-        );
+        return new CachedResponseAdapter(new CurlHttpAdapter(), $this->useCache());
+    }
+
+    /**
+     * @return boolean
+     */
+    protected function useCache()
+    {
+        return isset($_SERVER['USE_CACHED_RESPONSES']) && true === $_SERVER['USE_CACHED_RESPONSES'];
     }
 }