improve cache

nyamsprod · nyamsprod · commit 162b4e8ce874 · 2018-11-21T15:56:23.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ docs
 *~
 build
 .idea
+.php_cs.cache
diff --git a/src/Cache.php b/src/Cache.php
@@ -169,6 +169,7 @@ public function set($key, $value, $ttl = null)
      */
     private function getExpireAt($ttl): int
     {
+        $ttl = $ttl ?? self::CACHE_TTL;
         if (is_int($ttl)) {
             return time() + $ttl;
         }
@@ -177,10 +178,6 @@ private function getExpireAt($ttl): int
             return date_create_immutable('@'.time())->add($ttl)->getTimestamp();
         }
 
-        if (null === $ttl) {
-            return time() + self::CACHE_TTL;
-        }
-
         throw new CacheException(sprintf('Expected TTL to be an int, a DateInterval or null; received "%s"', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
     }
 

-Original file line number
+Diff line change
 *~
 build
 .idea
 +.php_cs.cache
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ public function set($key, $value, $ttl = null)`
`169`	`169`	`*/`
`170`	`170`	`private function getExpireAt($ttl): int`
`171`	`171`	`{`
	`172`	`+ $ttl = $ttl ?? self::CACHE_TTL;`
`172`	`173`	`if (is_int($ttl)) {`
`173`	`174`	`return time() + $ttl;`
`174`	`175`	`}`
`@@ -177,10 +178,6 @@ private function getExpireAt($ttl): int`
`177`	`178`	`return date_create_immutable('@'.time())->add($ttl)->getTimestamp();`
`178`	`179`	`}`
`179`	`180`
`180`		`- if (null === $ttl) {`
`181`		`- return time() + self::CACHE_TTL;`
`182`		`- }`
`183`		`-`
`184`	`181`	`throw new CacheException(sprintf('Expected TTL to be an int, a DateInterval or null; received "%s"', is_object($ttl) ? get_class($ttl) : gettype($ttl)));`
`185`	`182`	`}`
`186`	`183`