- adds PHP 8 types

Author: kodeart

CacheItem.php

@@ -4,70 +4,52 @@
 
 use Psr\Cache\CacheItemInterface;
 
-
 abstract class CacheItem implements CacheItemInterface
 {
-    /** @var bool */
-    protected $isHit = false;
-
-    /** @var string Expects a valid cache key name */
-    private $key;
-
-    /** @var mixed */
-    private $value;
-    
-    /** @var int Number of seconds for the expiration time */
-    private $expiresAt;
-
+    protected bool $isHit = false;
+    private string $key;
+    private mixed $value = null;
+    private ?int $expiresAt;
 
     public function __construct($key, ?int $ttl)
     {
         $this->key = $key;
         $this->expiresAt = $ttl;
     }
 
-
     public function getKey(): string
     {
         return $this->key;
     }
 
-
     public function get()
     {
         return $this->value;
     }
 
-
     public function isHit(): bool
     {
         return $this->isHit;
     }
 
-
     public function set($value)
     {
         $this->value = $value;
-
         return $this;
     }
 
-
-    public function expiresAfter($time)
+    public function expiresAfter($time): static
     {
         // The TTL is calculated in the cache client instance
         return $this->expiresAt($time);
     }
 
-
-    public function expiresAt($expiration)
+    public function expiresAt($expiration): static
     {
         $this->expiresAt = normalize_ttl($expiration ?? $this->expiresAt);
-
         if ($this->expiresAt < 1) {
             $this->isHit = false;
         }
-
         return $this;
     }
 

CacheItemPool.php

@@ -6,15 +6,12 @@
 use Psr\Cache\{CacheItemInterface, CacheItemPoolInterface};
 use function Koded\Stdlib\now;
 
-
 abstract class CacheItemPool implements CacheItemPoolInterface
 {
-    /** @var Cache */
-    protected $client;
+    protected Cache $client;
 
     /** @var CacheItemInterface[] */
-    private $deferred = [];
-
+    private array $deferred = [];
 
     abstract public function __construct(string $client, array $parameters);
 
@@ -32,34 +29,28 @@ public function commit(): bool
                 unset($this->deferred[$key]);
             }
         }
-
         return empty($this->deferred);
     }
 
-
     public function save(CacheItemInterface $item): bool
     {
         /** @var CacheItem $item */
         return $this->client->set($item->getKey(), $item->get(), $item->getExpiresAt());
     }
 
-
     public function getItems(array $keys = []): array
     {
         $items = [];
         foreach ($keys as $key) {
             $items[$key] = $this->getItem($key);
         }
-
         return $items;
     }
 
-
     public function getItem($key): CacheItemInterface
     {
         try {
             $item = new class($key, $this->client->getTtl()) extends CacheItem {};
-
             if (false === $this->client->has($key)) {
                 if (isset($this->deferred[$key])) {
                     return clone $this->deferred[$key];
@@ -79,7 +70,6 @@ public function getItem($key): CacheItemInterface
         }
     }
 
-
     public function hasItem($key): bool
     {
         try {
@@ -89,17 +79,14 @@ public function hasItem($key): bool
         }
     }
 
-
     public function clear(): bool
     {
         if ($cleared = $this->client->clear()) {
             $this->deferred = [];
         }
-
         return $cleared;
     }
 
-
     public function deleteItems(array $keys): bool
     {
         try {
@@ -109,22 +96,18 @@ public function deleteItems(array $keys): bool
         }
     }
 
-
     public function deleteItem($key): bool
     {
         try {
             if ($deleted = $this->client->delete($key)) {
                 unset($this->deferred[$key]);
             }
-
             return $deleted;
-
         } catch (Exception $e) {
             throw CachePoolException::from($e);
         }
     }
 
-
     public function saveDeferred(CacheItemInterface $item): bool
     {
         /** @var CacheItem $item */
@@ -139,4 +122,4 @@ public function saveDeferred(CacheItemInterface $item): bool
 
         return true;
     }
-}
+}

CachePool.php

@@ -22,25 +22,20 @@
  */
 final class CachePool
 {
-    /**
-     * @var CacheItemPoolInterface[] The registry
-     */
-    private static $instances = [];
+    /** @var CacheItemPoolInterface[] The registry */
+    private static array $instances = [];
 
     /**
      * @param string $client     The name of the cache client
      * @param array  $parameters [optional] Configuration parameters for the cache client
-     *
      * @return CacheItemPoolInterface
      */
     public static function use(string $client, array $parameters = []): CacheItemPoolInterface
     {
-        $ident = md5($client . serialize($parameters));
-
+        $ident = \md5($client . \serialize($parameters));
         if (isset(self::$instances[$ident])) {
             return self::$instances[$ident];
         }
-
         return self::$instances[$ident] = new class($client, $parameters) extends CacheItemPool
         {
             public function __construct(string $client, array $parameters)
@@ -57,8 +52,8 @@ public function __construct(string $client, array $parameters)
  */
 class CachePoolException extends Exception implements InvalidArgumentException
 {
-    public static function from(Exception $e)
+    public static function from(Exception $e): static
     {
-        return new self($e->getMessage(), $e->getCode());
+        return new static($e->getMessage(), $e->getCode());
     }
-}
+}