GitHub Actions

Author: byjg

src/Psr6/CacheItem.php

@@ -25,7 +25,7 @@ class CacheItem implements CacheItemInterface
     protected bool $hit;
 
     /**
-     * @var DateTime
+     * @var DateTimeInterface
      */
     protected DateTimeInterface $expiration;
 
@@ -85,7 +85,8 @@ public function isHit(): bool
     public function expiresAt(?DateTimeInterface $expiration): static
     {
         if (empty($expiration)) {
-            $this->expiration = new DateTime('now +1 year');
+            // We need to set a especific date far from now
+            $this->expiration = new DateTime('now +99 year');
             return $this;
         }
 
@@ -98,21 +99,22 @@ public function expiresAt(?DateTimeInterface $expiration): static
     #[\Override]
     public function expiresAfter(int|\DateInterval|null $time): static
     {
-        $this->expiration = new DateTime('now +1 year');
         if (is_numeric($time)) {
-            $this->expiration = new DateTime('now +' . $time . ' seconds');
+            $this->expiresAt(new DateTime('now +' . $time . ' seconds'));
         } else if ($time instanceof DateInterval) {
             $expiration = new DateTime();
             $expiration->add($time);
-            $this->expiration = $expiration;
+            $this->expiresAt($expiration);
+        } else {
+            $this->expiresAt(null);
         }
         return $this;
     }
 
     /**
-     * @return DateTime
+     * @return ?DateTime
      */
-    public function getExpiresAt(): DateTime
+    public function getExpiresAt(): ?DateTime
     {
         return $this->expiration;
     }