use isset instead of in array, code style, fix typo

Author: rhysemmerson

src/CacheMiddleware.php

@@ -56,7 +56,7 @@ class CacheMiddleware
      * 
      * @var array
      */
-    protected $safeMethods = ['GET', 'HEAD', 'OPTIONS', 'TRACE'];
+    protected $safeMethods = ['GET' => true, 'HEAD' => true, 'OPTIONS' => true, 'TRACE' => true];
 
     /**
      * @param CacheStrategyInterface|null $cacheStrategy
@@ -126,7 +126,7 @@ public function __invoke(callable $handler)
 
                 return $handler($request, $options)->then(  
                     function (ResponseInterface $response) use ($request) {
-                        if (!in_array($request->getMethod(), $this->safeMethods)) {
+                        if (!isset($this->safeMethods[$request->getMethod()])) {
                             // Invalidate cache after a call of non-safe method on the same URI
                             $response = $this->invalidateCache($request, $response);
                         }
@@ -386,9 +386,7 @@ public static function getMiddleware(CacheStrategyInterface $cacheStorage = null
      */
     private function invalidateCache(RequestInterface $request, ResponseInterface $response)
     {
-        $this->cacheStorage->delete($request);
-
-        foreach (array_diff(array_keys($this->httpMethods), [$request->getMethod()]) as $method) {
+        foreach (array_keys($this->httpMethods) as $method) {
             $this->cacheStorage->delete($request->withMethod($method));
         }
 

tests/InvalidateCacheTest.php

@@ -22,7 +22,7 @@ class InvalidateCacheTest extends TestCase
     /**
      * @var CacheMiddleware
      */
-    protected $middelware;
+    protected $middleware;
 
     protected function setUp(): void
     {
@@ -32,11 +32,11 @@ protected function setUp(): void
             ]));
         });
 
-        $this->middelware = new CacheMiddleware(new PrivateCacheStrategy(
+        $this->middleware = new CacheMiddleware(new PrivateCacheStrategy(
             new Psr6CacheStorage(new ArrayCachePool()),
         ));
 
-        $stack->push($this->middelware, 'cache');
+        $stack->push($this->middleware, 'cache');
 
         $this->client = new Client(['handler' => $stack]);
     }
@@ -46,7 +46,7 @@ protected function setUp(): void
      */
     public function testItInvalidatesForUnsafeHttpMethods($unsafeMethod)
     {
-        $this->middelware->setHttpMethods([
+        $this->middleware->setHttpMethods([
             'GET' => true,
             'HEAD' => true,
         ]);