Clean up, move re-validation adding to a method

Kevinrob · Jul 16, 2015 · 865528a · 865528a
1 parent 76ab442
commit 865528a
Showing 1 changed file with 35 additions and 17 deletions.
diff --git a/src/CacheMiddleware.php b/src/CacheMiddleware.php
@@ -75,23 +75,7 @@ public static function getMiddleware(CacheStorageInterface $cacheStorage = null)
                         $request = static::getRequestWithReValidationHeader($request, $cacheEntry);
 
                         if ($cacheEntry->staleWhileValidate()) {
-                            // Add the promise for revalidate
-                            if (static::$client !== null) {
-                                /** @var RequestInterface $reValidationRequest */
-                                $reValidationRequest = $request->withHeader("X-ReValidation", "1");
-                                static::$waitingRevalidate[] = static::$client
-                                    ->sendAsync($reValidationRequest)
-                                    ->then(function (ResponseInterface $response) use ($request, &$cacheStorage, $cacheEntry) {
-                                        if ($response->getStatusCode() == 304) {
-                                            // Not modified => cache entry is re-validate
-                                            /** @var ResponseInterface $response */
-                                            $response = $response->withStatus($cacheEntry->getResponse()->getStatusCode());
-                                            $response = $response->withBody($cacheEntry->getResponse()->getBody());
-                                        }
-
-                                        $cacheStorage->cache($request, $response);
-                                    });
-                            }
+                            static::addReValidationRequest($request, $cacheStorage, $cacheEntry);
 
                             return new FulfilledPromise(
                                 $cacheEntry->getResponse()
@@ -180,4 +164,38 @@ protected static function getRequestWithReValidationHeader(RequestInterface $req
         return $request;
     }
 
+    /**
+     * @param RequestInterface $request
+     * @param CacheStorageInterface $cacheStorage
+     * @param CacheEntry $cacheEntry
+     * @return bool if added
+     */
+    protected static function addReValidationRequest(
+        RequestInterface $request,
+        CacheStorageInterface &$cacheStorage,
+        CacheEntry $cacheEntry
+    ) {
+        // Add the promise for revalidate
+        if (static::$client !== null) {
+            /** @var RequestInterface $request */
+            $request = $request->withHeader("X-ReValidation", "1");
+            static::$waitingRevalidate[] = static::$client
+                ->sendAsync($request)
+                ->then(function (ResponseInterface $response) use ($request, &$cacheStorage, $cacheEntry) {
+                    if ($response->getStatusCode() == 304) {
+                        // Not modified => cache entry is re-validate
+                        /** @var ResponseInterface $response */
+                        $response = $response->withStatus($cacheEntry->getResponse()->getStatusCode());
+                        $response = $response->withBody($cacheEntry->getResponse()->getBody());
+                    }
+
+                    $cacheStorage->cache($request, $response);
+                });
+
+            return true;
+        }
+
+        return false;
+    }
+
 }