Merge pull request #11 from portier/feat/php81

PHP 8.1 support

Author: stephank

.github/workflows/check.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.4', '8.0']
+        php-versions: ['7.4', '8.0', '8.1']
     steps:
 
       - name: Checkout

composer.json

@@ -15,14 +15,14 @@
     }
   },
   "require": {
-    "fgrosse/phpasn1": "2.2",
+    "fgrosse/phpasn1": "^2.2",
     "lcobucci/clock": "^2.0",
     "lcobucci/jwt": "^4.1",
     "guzzlehttp/guzzle": "^7.3"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
-    "phpstan/phpstan": "^0.12",
+    "phpstan/phpstan": "^1.2.0",
     "squizlabs/php_codesniffer": "^3.6",
     "phpspec/prophecy-phpunit": "^2.0"
   }

src/Client.php

@@ -176,10 +176,20 @@ public function verify(string $token): string
             throw new \Exception(sprintf('Token is missing claims: %s', implode(', ', $missing)));
         }
 
-        // Consume the nonce.
         $nonce = $claims->get('nonce');
         $email = $claims->get('email');
         $emailOriginal = $claims->get('email_original', $email);
+        if (!is_string($nonce)) {
+            throw new \Exception(sprintf('Token claim "nonce" is not a string'));
+        }
+        if (!is_string($email)) {
+            throw new \Exception(sprintf('Token claim "email" is not a string'));
+        }
+        if (!is_string($emailOriginal)) {
+            throw new \Exception(sprintf('Token claim "email_original" is not a string'));
+        }
+
+        // Consume the nonce.
         $this->store->consumeNonce($nonce, $emailOriginal);
 
         // Return the normalized email.

src/RedisStore.php

@@ -29,7 +29,10 @@ public function fetchCached(string $cacheId, string $url): \stdClass
 
         $data = $this->redis->get($key);
         if ($data) {
-            return json_decode($data);
+            $data = json_decode($data);
+            assert($data instanceof \stdClass);
+
+            return $data;
         }
 
         $res = $this->fetch($url);