Fix PHP 8.2 compat issue in uses of DateTime::modify()

markitosgv · Dec 6, 2022 · a06c98d · a06c98d
1 parent d05b77c
commit a06c98d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/Model/AbstractRefreshToken.php b/Model/AbstractRefreshToken.php
@@ -41,7 +41,13 @@ abstract class AbstractRefreshToken implements RefreshTokenInterface
     public static function createForUserWithTtl(string $refreshToken, UserInterface $user, int $ttl): RefreshTokenInterface
     {
         $valid = new \DateTime();
-        $valid->modify('+'.$ttl.' seconds');
+
+        // Explicitly check for a negative number based on a behavior change in PHP 8.2, see https://github.com/php/php-src/issues/9950
+        if ($ttl > 0) {
+            $valid->modify('+'.$ttl.' seconds');
+        } elseif ($ttl < 0) {
+            $valid->modify($ttl.' seconds');
+        }
 
         $model = new static();
         $model->setRefreshToken($refreshToken);

diff --git a/Security/Http/Authenticator/RefreshTokenAuthenticator.php b/Security/Http/Authenticator/RefreshTokenAuthenticator.php
@@ -116,7 +116,14 @@ public function authenticate(Request $request): Passport
 
         if ($this->options['ttl_update']) {
             $expirationDate = new \DateTime();
-            $expirationDate->modify(sprintf('+%d seconds', $this->options['ttl']));
+
+            // Explicitly check for a negative number based on a behavior change in PHP 8.2, see https://github.com/php/php-src/issues/9950
+            if ($this->options['ttl'] > 0) {
+                $expirationDate->modify(sprintf('+%d seconds', $this->options['ttl']));
+            } elseif ($this->options['ttl'] < 0) {
+                $expirationDate->modify(sprintf('%d seconds', $this->options['ttl']));
+            }
+
             $refreshToken->setValid($expirationDate);
 
             $this->refreshTokenManager->save($refreshToken);