Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 6c0b8115bf2e · 2023-02-11T11:58:06.000+01:00
* 5.4:
  Fix merge
diff --git a/Tests/EventListener/PasswordMigratingListenerTest.php b/Tests/EventListener/PasswordMigratingListenerTest.php
@@ -60,7 +60,7 @@ public function testUnsupportedEvents($event)
     public static function provideUnsupportedEvents()
     {
         // no password upgrade badge
-        yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(UserInterface::class); })))];
+        yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return new DummyTestPasswordAuthenticatedUser(); })))];
 
         // blank password
         yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return new DummyTestPasswordAuthenticatedUser(); }), [new PasswordUpgradeBadge('', self::createPasswordUpgrader())]))];

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function testUnsupportedEvents($event)`
`60`	`60`	`public static function provideUnsupportedEvents()`
`61`	`61`	`{`
`62`	`62`	`// no password upgrade badge`
`63`		`- yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return $this->createMock(UserInterface::class); })))];`
	`63`	`+ yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return new DummyTestPasswordAuthenticatedUser(); })))];`
`64`	`64`
`65`	`65`	`// blank password`
`66`	`66`	`yield [self::createEvent(new SelfValidatingPassport(new UserBadge('test', function () { return new DummyTestPasswordAuthenticatedUser(); }), [new PasswordUpgradeBadge('', self::createPasswordUpgrader())]))];`