Minor

Author: Nyholm

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## UNRELEASED
+
+### Fixed
+
+- Issue when you use `respect_cache_headers=>false` in combination with `default_ttl=>null`.
 
 ## 1.1.0 - 2016-08-04
 

src/CachePlugin.php

@@ -144,7 +144,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
     private function calculateCacheItemExpiresAfter($maxAge)
     {
         if ($this->config['cache_lifetime'] === null && $maxAge === null) {
-            return null;
+            return;
         }
 
         return $this->config['cache_lifetime'] + $maxAge;
@@ -157,11 +157,11 @@ private function calculateCacheItemExpiresAfter($maxAge)
      */
     private function getResponseExpiresAt($maxAge)
     {
-        if ($maxAge !== null) {
-            return time() + $maxAge;
+        if ($maxAge === null) {
+            return;
         }
 
-        return null;
+        return time() + $maxAge;
     }
 
     /**