Merge branch 'wip-version-7' into wip-version-7-dbal

Author: cicnavi

composer.json

@@ -52,6 +52,9 @@
         "testcontainers/testcontainers": "^0.2",
         "nimut/phpunit-merger": "^2.0"
     },
+    "conflict": {
+        "rector/rector": "2.3.0"
+    },
     "config": {
         "preferred-install": {
             "*": "dist"

src/Repositories/AccessTokenRepository.php

@@ -245,16 +245,18 @@ public function removeExpired(): void
     {
         $accessTokenTableName = $this->getTableName();
         $refreshTokenTableName = $this->database->applyPrefix(RefreshTokenRepository::TABLE_NAME);
+        $now = $this->helpers->dateTime()->getUtc()->format(DateFormatsEnum::DB_DATETIME->value);
 
         // Delete expired access tokens, but only if the corresponding refresh token is also expired.
         $this->database->write(
             "DELETE FROM $accessTokenTableName WHERE expires_at < :now AND
                 NOT EXISTS (
                     SELECT 1 FROM {$refreshTokenTableName}
-                    WHERE $accessTokenTableName.id = $refreshTokenTableName.access_token_id AND expires_at > :now
+                    WHERE $accessTokenTableName.id = $refreshTokenTableName.access_token_id AND expires_at > :now2
                 )",
             [
-                'now' => $this->helpers->dateTime()->getUtc()->format(DateFormatsEnum::DB_DATETIME->value),
+                'now' => $now,
+                'now2' => $now,
             ],
         );
     }