Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 311c91af9f17 · 2021-12-29T11:14:09.000+01:00
* 5.4:
  [Lock] Release DoctrineDbalPostgreSqlStore connection lock on failure
  [DependencyInjection][HttpKernel] Fix enum typed bindings
  make login link handler tests time sensitive
  [CI] Remove macOS jobs
  Suppress psalm error for UndefinedDocblockClass for PHP 8.1 classes
diff --git a/LoginLink/LoginLinkHandler.php b/LoginLink/LoginLinkHandler.php
@@ -46,9 +46,9 @@ public function __construct(UrlGeneratorInterface $urlGenerator, UserProviderInt
 
     public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails
     {
-        $expiresAt = new \DateTimeImmutable(sprintf('+%d seconds', $this->options['lifetime']));
+        $expires = time() + $this->options['lifetime'];
+        $expiresAt = new \DateTimeImmutable('@'.$expires);
 
-        $expires = $expiresAt->format('U');
         $parameters = [
             'user' => $user->getUserIdentifier(),
             'expires' => $expires,
diff --git a/Tests/LoginLink/LoginLinkHandlerTest.php b/Tests/LoginLink/LoginLinkHandlerTest.php
@@ -52,6 +52,7 @@ protected function setUp(): void
     }
 
     /**
+     * @group time-sensitive
      * @dataProvider provideCreateLoginLinkData
      */
     public function testCreateLoginLink($user, array $extraProperties, Request $request = null)

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ protected function setUp(): void`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
	`55`	`+ * @group time-sensitive`
`55`	`56`	`* @dataProvider provideCreateLoginLinkData`
`56`	`57`	`*/`
`57`	`58`	`public function testCreateLoginLink($user, array $extraProperties, Request $request = null)`