fix for invalid expires value

Cherry-picked from #929
thephpleague · Dec 11, 2024 · 8cee80a · 8cee80a
1 parent 3c8c2b4
commit 8cee80a
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/src/Token/AccessToken.php b/src/Token/AccessToken.php
@@ -118,7 +118,7 @@ public function __construct(array $options = [])
         } elseif (!empty($options['expires'])) {
             // Some providers supply the seconds until expiration rather than
             // the exact timestamp. Take a best guess at which we received.
-            $expires = $options['expires'];
+            $expires = (int) $options['expires'];
 
             if (!$this->isExpirationTimestamp($expires)) {
                 $expires += $this->getTimeNow();

diff --git a/test/src/Token/AccessTokenTest.php b/test/src/Token/AccessTokenTest.php
@@ -222,6 +222,32 @@ public function testInvalidExpiresIn()
         self::tearDownForBackwardsCompatibility();
     }
 
+    public function testInvalidExpiresWhenExpiresDoesNotCastToInteger()
+    {
+        $options = [
+            'access_token' => 'access_token',
+            'expires' => 'TEXT',
+        ];
+
+        $token = $this->getAccessToken($options);
+
+        $this->assertSame($token->getTimeNow(), $token->getExpires());
+    }
+
+    public function testInvalidExpiresWhenExpiresCastsToInteger()
+    {
+        $options = [
+            'access_token' => 'access_token',
+            'expires' => '3TEXT',
+        ];
+
+        $token = $this->getAccessToken($options);
+
+        $this->assertSame($token->getTimeNow() + 3, $token->getExpires());
+        $this->assertFalse($token->hasExpired());
+
+        self::tearDownForBackwardsCompatibility();
+    }
 
     public function testJsonSerializable()
     {