Update GuzzleHttpAdapter.php

stadline · Jan 23, 2020 · 4811cfe · 4811cfe
1 parent e6a1bd6
commit 4811cfe
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/ClientHydra/Adapter/GuzzleHttpAdapter.php b/ClientHydra/Adapter/GuzzleHttpAdapter.php
@@ -23,7 +23,7 @@ class GuzzleHttpAdapter implements HttpAdapterInterface
     ];
     private $authorizationToken = null;
 
-    /** @var CacheItemPoolInterface */
+    /** @var ?CacheItemPoolInterface */
     private $persistantCache;
 
     /**
@@ -45,9 +45,6 @@ public function __construct(string $baseUrl, CacheItemPoolInterface $persistantC
         $this->debugEnabled = $debugEnabled;
         $this->debugData = [];
         $this->executionCache = new ArrayAdapter();
-        if (null === $persistantCache) {
-            $persistantCache = new ArrayAdapter();
-        }
         $this->persistantCache = $persistantCache;
     }
 
@@ -165,7 +162,7 @@ public function call(Request $request, bool $useExecutionCache = true): Response
                 $requestData['cacheOrigin'] = 'execution';
             }
             $arrayResponse = $this->executionCache->getItem($requestHash)->get();
-        } elseif ($useExecutionCache && $this->persistantCache->hasItem($requestHash)) {
+        } elseif ($useExecutionCache && null !== $this->persistantCache && $this->persistantCache->hasItem($requestHash)) {
             if ($this->debugEnabled) {
                 $requestData['cacheOrigin'] = 'persistant';
             }
@@ -178,7 +175,7 @@ public function call(Request $request, bool $useExecutionCache = true): Response
             $requestData['cache']['savedIn'][] = 'execution';
         } else {
             try {
-                $rUri = '/' === \substr($request->getUri(), 0, 1) ? \substr($request->getUri(), 1) : $request->getUri();
+                $rUri = substr($request->getUri(), 0, 1) === '/' ? substr($request->getUri(), 1) : $request->getUri();
                 /** @var Response $response */
                 $response = $this->client->send(
                     new \GuzzleHttp\Psr7\Request($request->getMethod(), $rUri, $request->getHeaders(), $request->getBody())
@@ -197,7 +194,7 @@ public function call(Request $request, bool $useExecutionCache = true): Response
                     }
                     $requestData['cacheSavedIn'][] = 'execution';
 
-                    if ($request->isPersistantCacheEnable()) {
+                    if (null !== $this->persistantCache && $request->isPersistantCacheEnable()) {
                         $cacheItem = $this->persistantCache->getItem($requestHash);
                         $cacheItem->set($arrayResponse);
                         $cacheItem->expiresAfter($request->getPersistantCacheTTL());
@@ -264,4 +261,9 @@ public function call(Request $request, bool $useExecutionCache = true): Response
 
         return $response;
     }
+
+    public function getPersistantCache(): ?CacheItemPoolInterface
+    {
+        return $this->persistantCache;
+    }
 }