fix phpstan

Author: bshaffer

composer.json

@@ -31,7 +31,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5||9.5"
+        "phpunit/phpunit": "^7.5||9.5",
         "psr/cache": "^3.0",
         "guzzlehttp/guzzle": "^7.4",
         "phpspec/prophecy-phpunit": "^2.0"

src/CachedKeySet.php

@@ -7,29 +7,64 @@
 use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Cache\CacheItemPoolInterface;
+use Psr\Cache\CacheItemInterface;
 use LogicException;
 use OutOfBoundsException;
 use RuntimeException;
 
+/**
+ * @template-implements ArrayAccess<string, Key>
+ */
 class CachedKeySet implements ArrayAccess
 {
+    /**
+     * @var string
+     */
     private $jwkUri;
+    /**
+     * @var ClientInterface
+     */
     private $httpClient;
+    /**
+     * @var RequestFactoryInterface
+     */
     private $httpFactory;
+    /**
+     * @var CacheItemPoolInterface
+     */
     private $cache;
+    /**
+     * @var int
+     */
     private $expiresAfter;
 
+    /**
+     * @var ?CacheItemInterface
+     */
     private $cacheItem;
+    /**
+     * @var array<string, Key>
+     */
     private $keySet;
+    /**
+     * @var string
+     */
+    private $cacheKey;
+    /**
+     * @var string
+     */
     private $cacheKeyPrefix = 'jwk';
+    /**
+     * @var int
+     */
     private $maxKeyLength = 64;
 
     public function __construct(
-        $jwkUri,
+        string $jwkUri,
         ClientInterface $httpClient,
         RequestFactoryInterface $httpFactory,
         CacheItemPoolInterface $cache,
-        $expiresAfter = null
+        int $expiresAfter = null
     ) {
         $this->jwkUri = $jwkUri;
         $this->cacheKey = $this->getCacheKey($jwkUri);
@@ -39,30 +74,45 @@ public function __construct(
         $this->expiresAfter = $expiresAfter;
     }
 
-    public function offsetGet($keyId)
+    /**
+     * @param string $keyId
+     * @return Key
+     */
+    public function offsetGet($keyId): Key
     {
         if (!$this->keyIdExists($keyId)) {
             throw new OutOfBoundsException('Key ID not found');
         }
         return $this->keySet[$keyId];
     }
 
-    public function offsetExists($keyId)
+    /**
+     * @param string $keyId
+     * @return bool
+     */
+    public function offsetExists($keyId): bool
     {
         return $this->keyIdExists($keyId);
     }
 
-    public function offsetSet($offset, $value)
+    /**
+     * @param string $offset
+     * @param Key $value
+     */
+    public function offsetSet($offset, $value): void
     {
         throw new LogicException('Method not implemented');
     }
 
-    public function offsetUnset($offset)
+    /**
+     * @param string $offset
+     */
+    public function offsetUnset($offset): void
     {
         throw new LogicException('Method not implemented');
     }
 
-    private function keyIdExists($keyId)
+    private function keyIdExists(string $keyId): bool
     {
         $keySetToCache = null;
         if (null === $this->keySet) {
@@ -97,18 +147,18 @@ private function keyIdExists($keyId)
         return true;
     }
 
-    private function getCacheItem()
+    private function getCacheItem(): CacheItemInterface
     {
-        if ($this->cacheItem) {
-            return $this->cacheItem;
+        if (is_null($this->cacheItem)) {
+            $this->cacheItem = $this->cache->getItem($this->cacheKey);
         }
 
-        return $this->cacheItem = $this->cache->getItem($this->cacheKey);
+        return $this->cacheItem;
     }
 
-    private function getCacheKey($jwkUri)
+    private function getCacheKey(string $jwkUri): string
     {
-        if (is_null($jwkUri)) {
+        if (empty($jwkUri)) {
             throw new RuntimeException('JWK URI is empty');
         }
 

src/JWT.php

@@ -60,7 +60,7 @@ class JWT
      * Decodes a JWT string into a PHP object.
      *
      * @param string                 $jwt            The JWT
-     * @param Key|array<string, Key> $keyOrKeyArray  The Key or associative array of key IDs (kid) to Key objects.
+     * @param Key|array<string,Key> $keyOrKeyArray  The Key or associative array of key IDs (kid) to Key objects.
      *                                               If the algorithm used is asymmetric, this is the public key
      *                                               Each Key object contains an algorithm and matching key.
      *                                               Supported algorithms are 'ES384','ES256', 'HS256', 'HS384',
@@ -395,7 +395,7 @@ public static function urlsafeB64Encode(string $input): string
     /**
      * Determine if an algorithm has been provided for each Key
      *
-     * @param Key|ArrayAccess|array<string, Key> $keyOrKeyArray
+     * @param Key|ArrayAccess<string,Key>|array<string,Key> $keyOrKeyArray
      * @param string|null            $kid
      *
      * @throws UnexpectedValueException
@@ -411,18 +411,11 @@ private static function getKey(
         }
 
         if ($keyOrKeyArray instanceof CachedKeySet) {
+            // Skip "isset" check, as this will automatically refresh if not set
             return $keyOrKeyArray[$kid];
         }
 
-        foreach ($keyOrKeyArray as $keyId => $key) {
-            if (!$key instanceof Key) {
-                throw new TypeError(
-                    '$keyOrKeyArray must be an instance of Firebase\JWT\Key key or an '
-                    . 'array of Firebase\JWT\Key keys'
-                );
-            }
-        }
-        if (!isset($kid)) {
+        if (empty($kid)) {
             throw new UnexpectedValueException('"kid" empty, unable to lookup correct key');
         }
         if (!isset($keyOrKeyArray[$kid])) {