refactor: don't make cahce if $ttl is 0

codeigniter4 · Jul 3, 2023 · d748ef1 · d748ef1
1 parent 80465c6
commit d748ef1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/system/Cache/ResponseCache.php b/system/Cache/ResponseCache.php
@@ -52,11 +52,6 @@ public function __construct(CacheConfig $config, CacheInterface $cache)
         $this->cache            = $cache;
     }
 
-    public function getTtl(): int
-    {
-        return $this->ttl;
-    }
-
     /**
      * @return $this
      */
@@ -90,12 +85,16 @@ public function generateCacheKey($request): string
     }
 
     /**
-     * Caches the full response from the current request.
+     * Caches the response.
      *
      * @param CLIRequest|IncomingRequest $request
      */
     public function make($request, ResponseInterface $response): bool
     {
+        if ($this->ttl === 0) {
+            return true;
+        }
+
         $headers = [];
 
         foreach ($response->headers() as $header) {

diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
@@ -527,9 +527,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
             // Cache it without the performance metrics replaced
             // so that we can have live speed updates along the way.
             // Must be run after filters to preserve the Response headers.
-            if ($this->pageCache->getTtl() > 0) {
-                $this->pageCache->make($this->request, $this->response);
-            }
+            $this->pageCache->make($this->request, $this->response);
 
             // Update the performance metrics
             $body = $this->response->getBody();