Skip to content

Commit 3682db4

Browse files
Merge branch '5.3' into 5.4
* 5.3: [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
2 parents a835e78 + ef81ab1 commit 3682db4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

LoginLink/LoginLinkHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function __construct(UrlGeneratorInterface $urlGenerator, UserProviderInt
4646

4747
public function createLoginLink(UserInterface $user, Request $request = null): LoginLinkDetails
4848
{
49-
$expiresAt = new \DateTimeImmutable(sprintf('+%d seconds', $this->options['lifetime']));
49+
$expires = time() + $this->options['lifetime'];
50+
$expiresAt = new \DateTimeImmutable('@'.$expires);
5051

51-
$expires = $expiresAt->format('U');
5252
$parameters = [
5353
// @deprecated since Symfony 5.3, change to $user->getUserIdentifier() in 6.0
5454
'user' => method_exists($user, 'getUserIdentifier') ? $user->getUserIdentifier() : $user->getUsername(),

Tests/LoginLink/LoginLinkHandlerTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ protected function setUp(): void
5252
}
5353

5454
/**
55+
* @group time-sensitive
5556
* @dataProvider provideCreateLoginLinkData
5657
*/
5758
public function testCreateLoginLink($user, array $extraProperties, Request $request = null)

0 commit comments

Comments
 (0)