Added many missing types; in particular, mixed and union types.

Author: Bilge

src/Cache/CacheItem.php

@@ -10,47 +10,32 @@
  */
 final class CacheItem implements CacheItemInterface
 {
-    private $key;
-
-    private $value;
-
-    private $hit;
-
-    private function __construct(string $key, $value, bool $hit)
+    private function __construct(private readonly string $key, private mixed $value, private readonly bool $hit)
     {
-        $this->key = $key;
-        $this->value = $value;
-        $this->hit = $hit;
     }
 
     public function getKey(): string
     {
         return $this->key;
     }
 
-    /**
-     * @return mixed
-     */
-    public function get()
+    public function get(): mixed
     {
         return $this->value;
     }
 
-    public function isHit(): bool
-    {
-        return $this->hit;
-    }
-
-    /**
-     * @param mixed $value
-     */
-    public function set($value): self
+    public function set(mixed $value): self
     {
         $this->value = $value;
 
         return $this;
     }
 
+    public function isHit(): bool
+    {
+        return $this->hit;
+    }
+
     public function expiresAt($expiration): self
     {
         throw new NotImplementedException;

src/Cache/MemoryCache.php

@@ -13,10 +13,8 @@ class MemoryCache extends \ArrayObject implements CacheItemPoolInterface
 {
     /**
      * @param string $key
-     *
-     * @return mixed
      */
-    public function getItem($key)
+    public function getItem($key): mixed
     {
         return \Closure::bind(
             function () use ($key): self {

src/Collection/ProviderRecords.php

@@ -7,7 +7,7 @@
 
 class ProviderRecords extends RecordCollection
 {
-    private $resource;
+    private ProviderResource $resource;
 
     public function __construct(\Iterator $providerRecords, ProviderResource $resource)
     {

src/Connector/CachingConnector.php

@@ -16,21 +16,12 @@ class CachingConnector implements Connector, ConnectorWrapper
 {
     public const RESERVED_CHARACTERS = '{}()/\@:';
 
-    /**
-     * @var Connector
-     */
-    private $connector;
-
-    /**
-     * @var CacheItemPoolInterface
-     */
-    private $cache;
+    private CacheItemPoolInterface $cache;
 
     public function __construct(
-        Connector $connector,
+        private Connector $connector,
         CacheItemPoolInterface $cache = null
     ) {
-        $this->connector = $connector;
         $this->cache = $cache ?: new MemoryCache;
     }
 
@@ -45,7 +36,7 @@ public function __clone()
     /**
      * @throws InvalidCacheKeyException Cache key contains invalid data.
      */
-    public function fetch(DataSource $source)
+    public function fetch(DataSource $source): mixed
     {
         $this->validateCacheKey($key = $source->computeHash());
 

src/Connector/Connector.php

@@ -15,5 +15,5 @@ interface Connector
      *
      * @return mixed Data.
      */
-    public function fetch(DataSource $source);
+    public function fetch(DataSource $source): mixed;
 }

src/Connector/NullConnector.php

@@ -5,8 +5,8 @@
 
 final class NullConnector implements Connector
 {
-    public function fetch(DataSource $source)
+    public function fetch(DataSource $source): mixed
     {
-        // Intentionally empty.
+        return null;
     }
 }

src/Connector/Recoverable/ExponentialAsyncDelayRecoverableExceptionHandler.php

@@ -10,22 +10,17 @@
  */
 class ExponentialAsyncDelayRecoverableExceptionHandler implements RecoverableExceptionHandler
 {
-    private $initialDelay;
-
-    /**
-     * @var AsyncExponentialBackoffExceptionHandler
-     */
-    private $handler;
+    private AsyncExponentialBackoffExceptionHandler $handler;
 
     /**
      * Initializes this instance with the specified initial delay. The initial delay will be used when the first
      * exception is handled; subsequent exceptions will cause longer delays.
      *
      * @param int $initialDelay Initial delay in milliseconds.
      */
-    public function __construct(int $initialDelay = AsyncExponentialBackoffExceptionHandler::DEFAULT_COEFFICIENT)
-    {
-        $this->initialDelay = $initialDelay;
+    public function __construct(
+        private readonly int $initialDelay = AsyncExponentialBackoffExceptionHandler::DEFAULT_COEFFICIENT
+    ) {
     }
 
     public function initialize(): void

src/Connector/Recoverable/ExponentialSleepRecoverableExceptionHandler.php

@@ -10,22 +10,17 @@
  */
 class ExponentialSleepRecoverableExceptionHandler implements RecoverableExceptionHandler
 {
-    private $initialDelay;
-
-    /**
-     * @var ExponentialBackoffExceptionHandler
-     */
-    private $handler;
+    private ExponentialBackoffExceptionHandler $handler;
 
     /**
      * Initializes this instance with the specified initial delay. The initial delay will be used when the first
      * exception is handled; subsequent exceptions will cause longer delays.
      *
      * @param int $initialDelay Initial delay in microseconds.
      */
-    public function __construct(int $initialDelay = ExponentialBackoffExceptionHandler::DEFAULT_COEFFICIENT)
-    {
-        $this->initialDelay = $initialDelay;
+    public function __construct(
+        private readonly int $initialDelay = ExponentialBackoffExceptionHandler::DEFAULT_COEFFICIENT
+    ) {
     }
 
     public function initialize(): void

src/PorterAwareTrait.php

@@ -5,8 +5,7 @@
 
 trait PorterAwareTrait
 {
-    /** @var Porter */
-    private $porter;
+    private Porter $porter;
 
     private function getPorter(): Porter
     {

src/Provider/Resource/StaticResource.php

@@ -8,11 +8,8 @@
 
 class StaticResource implements ProviderResource
 {
-    private $data;
-
-    public function __construct(\Iterator $data)
+    public function __construct(private readonly \Iterator $data)
     {
-        $this->data = $data;
     }
 
     public function getProviderClassName(): string