removed cache not working with guzzle 5 properly

Author: pulkit

README.md

@@ -57,39 +57,31 @@ use GuzzleHttp\Client as GuzzleClient;
 $requester = new Requester(new GuzzleClient());
 
 // simple get request
-$requester->url('github.com')->get();
+$requester->url('example.com')->get();
 ```
 
 Altering the default retry behaviour
 ```php
-// retry 10 times, with a 1 second wait on a 404 error
-$requester->url('github.com')->retry(10)->every(1000)->on([404])->get();
+// retry 10 times, with a 1 second wait on a 503 error
+$requester->url('example.com')->retry(10)->every(1000)->on([503])->get();
 
 // disabling retry
-$requester->url('github.com')->retry(false)->get();
+$requester->url('example.com')->retry(false)->get();
 ```
 
 Disabling ssl check
 ```php
 // ssl check disabled
-$requester->url('github.com')->veify(false)->get();
+$requester->url('example.com')->veify(false)->get();
 ```
 
 Use http instead of https
 ```php
 // disable https and use http
-$requester->url('github.com')->secure(false)->get();
+$requester->url('example.com')->secure(false)->get();
 
 // use http
-$requester->url('http://github.com')->get();
-```
-
-Caching
-```php
-$response = $requester->url('github.com')->cache(true)->get();
-
-// Same request should return 304 response
-$response = $requester->url('github.com')->cache(true)->get();
+$requester->url('http://example.com')->get();
 ```
 
 Create a Post request

composer.json

@@ -13,7 +13,6 @@
         "php": ">=5.4.0",
         "guzzlehttp/guzzle": "5.*",
         "guzzlehttp/retry-subscriber": "2.*",
-        "guzzlehttp/cache-subscriber": "0.*",
         "illuminate/support": "~4|~5"
     },
     "require-dev": {

src/Requester.php

@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Client as GuzzleClient;
 use GuzzleHttp\Subscriber\Retry\RetrySubscriber;
-use GuzzleHttp\Subscriber\Cache\CacheSubscriber;
 use PulkitJalan\Requester\Exceptions\InvalidUrlException;
 
 class Requester
@@ -62,13 +61,6 @@ class Requester
      */
     protected $retry = 5;
 
-    /**
-     * Use cache subscriber
-     *
-     * @var boolean
-     */
-    protected $cache = false;
-
     /**
      * @param \GuzzleHttp\Client $guzzleClient
      * @param array              $config
@@ -94,10 +86,6 @@ public function getGuzzleClient()
             $guzzle = $this->addRetrySubscriber($guzzle);
         }
 
-        if ($this->cache) {
-            $guzzle = $this->addCacheSubscriber($guzzle);
-        }
-
         return $guzzle;
     }
 
@@ -192,19 +180,6 @@ public function on(array $retryOn)
         return $this;
     }
 
-    /**
-     * Enable or disable the cache subscriber
-     *
-     * @param  boolean                          $cache
-     * @return \PulkitJalan\Requester\Requester
-     */
-    public function cache($cache)
-    {
-        $this->cache = $cache;
-
-        return $this;
-    }
-
     /**
      * Add a file to the request
      *
@@ -364,19 +339,6 @@ protected function addRetrySubscriber(GuzzleClient $guzzle)
         return $guzzle;
     }
 
-    /**
-     * Add the cache subscriber to the guzzle client
-     *
-     * @param  \GuzzleHttp\Client $guzzle
-     * @return \GuzzleHttp\Client
-     */
-    protected function addCacheSubscriber(GuzzleClient $guzzle)
-    {
-        CacheSubscriber::attach($guzzle);
-
-        return $guzzle;
-    }
-
     /**
      * Get the protocol
      *
@@ -401,7 +363,6 @@ protected function initialize()
         $this->retryOn = array_get($this->config, 'retry.on', [500, 502, 503, 504]);
         $this->retryDelay = array_get($this->config, 'retry.delay', 10);
         $this->retry = array_get($this->config, 'retry.times', 5);
-        $this->cache = array_get($this->config, 'cache', false);
         $this->verify(array_get($this->config, 'verify', true));
     }
 }

src/config/config.php

@@ -62,17 +62,6 @@
         |
         */
         'on' => [500, 502, 503, 504],
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Enable or disable request caching
-    |--------------------------------------------------------------------------
-    |
-    | Uses the guzzle cache subscriber
-    | https://github.com/guzzle/cache-subscriber
-    |
-    */
-    'cache' => false
+    ]
 
 ];

tests/RequesterTest.php

@@ -113,19 +113,6 @@ public function test_changing_retry_options()
         $this->assertEquals(false, $this->readAttribute($this->requester, 'retry'));
     }
 
-    public function test_changing_cache_options()
-    {
-        $this->requester->cache(true);
-
-        $this->assertEquals(true, $this->readAttribute($this->requester, 'cache'));
-
-        $this->guzzle->shouldReceive('get')->once()->with('https://example.com', [
-            'verify' => true,
-        ]);
-
-        $this->requester->url('example.com')->cache(true)->get();
-    }
-
     public function test_sending_get_request()
     {
         $this->guzzle->shouldReceive('get')->once()->with('https://example.com', [