Merge branch 'review-cache'

Author: lkrms

src/Store/CacheStore.php

@@ -5,6 +5,7 @@
 use Lkrms\Store\Concept\SqliteStore;
 use DateTimeInterface;
 use InvalidArgumentException;
+use LogicException;
 
 /**
  * A SQLite-backed key-value store
@@ -61,10 +62,12 @@ public function set(string $key, $value, $expires = null)
         } elseif (!$expires) {
             $expires = null;
         } elseif (!is_int($expires) || $expires < 0) {
+            // @codeCoverageIgnoreStart
             throw new InvalidArgumentException(sprintf(
                 'Invalid $expires: %s',
                 $expires
             ));
+            // @codeCoverageIgnoreEnd
         } elseif ($expires < 1625061600) {
             // Assume values less than the timestamp of 1 Jul 2021 00:00:00 AEST
             // are lifetimes in seconds
@@ -274,7 +277,11 @@ public function flush()
      */
     public function maybeGet(string $key, callable $callback, $expires = null)
     {
-        $store = $this->asOfNow();
+        $store =
+            $this->Now === null
+                ? $this->asOfNow()
+                : $this;
+
         if ($store->has($key)) {
             return $store->get($key);
         }
@@ -299,8 +306,12 @@ public function maybeGet(string $key, callable $callback, $expires = null)
      */
     public function asOfNow(?int $now = null)
     {
-        if ($now === null && $this->Now !== null) {
-            return $this;
+        if ($this->Now !== null) {
+            // @codeCoverageIgnoreStart
+            throw new LogicException(
+                sprintf('Calls to %s cannot be nested', __METHOD__)
+            );
+            // @codeCoverageIgnoreEnd
         }
 
         $clone = clone $this;

tests/unit/Store/CacheStoreTest.php

@@ -47,6 +47,7 @@ public function testWithExpiration(): void
     {
         $arr = ['foo' => 'bar'];
         $this->Cache->set(__METHOD__, $arr, new DateTimeImmutable('24 hours ago'));
+        $this->Cache->set('key0', 'value0', new DateTimeImmutable('10 seconds ago'));
         $this->Cache->set('key1', 'value1', 60);
         $this->Cache->set('key2', 'value2', time() + 60);
         $now = time();
@@ -57,6 +58,10 @@ public function testWithExpiration(): void
         $this->assertTrue($this->Cache->has(__METHOD__, 0));
         $this->assertSame($arr, $this->Cache->get(__METHOD__, 0));
 
+        $this->assertFalse($this->Cache->has('key0'));
+        $this->assertTrue($this->Cache->has('key0', 60));
+        $this->assertSame('value0', $this->Cache->get('key0', 60));
+
         $this->Cache->flush();
         $this->assertFalse($this->Cache->has(__METHOD__, 0));
         $this->assertFalse($this->Cache->get(__METHOD__, 0));