Merge branch '7.1' into 7.2

nicolas-grekas · nicolas-grekas · commit b0c050b7cc4a · 2024-11-20T12:48:06.000+01:00
* 7.1:
  Fix merge
diff --git a/Tests/Security/RememberMe/DoctrineTokenProviderPostgresTest.php b/Tests/Security/RememberMe/DoctrineTokenProviderPostgresTest.php
@@ -21,7 +21,7 @@ public static function setUpBeforeClass(): void
         }
     }
 
-    protected function bootstrapProvider()
+    protected function bootstrapProvider(): DoctrineTokenProvider
     {
         $config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();
         if (class_exists(DefaultSchemaManagerFactory::class)) {
diff --git a/Tests/Security/RememberMe/DoctrineTokenProviderTest.php b/Tests/Security/RememberMe/DoctrineTokenProviderTest.php
@@ -117,7 +117,7 @@ public function testVerifyOutdatedTokenAfterParallelRequestFailsAfter60Seconds()
         $this->assertFalse($provider->verifyToken($token, $oldValue));
     }
 
-    private function bootstrapProvider(): DoctrineTokenProvider
+    protected function bootstrapProvider(): DoctrineTokenProvider
     {
         $config = ORMSetup::createConfiguration(true);
         $config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static function setUpBeforeClass(): void`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- protected function bootstrapProvider()`
	`24`	`+ protected function bootstrapProvider(): DoctrineTokenProvider`
`25`	`25`	`{`
`26`	`26`	`$config = class_exists(ORMSetup::class) ? ORMSetup::createConfiguration(true) : new Configuration();`
`27`	`27`	`if (class_exists(DefaultSchemaManagerFactory::class)) {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function testVerifyOutdatedTokenAfterParallelRequestFailsAfter60Seconds()`
`117`	`117`	`$this->assertFalse($provider->verifyToken($token, $oldValue));`
`118`	`118`	`}`
`119`	`119`
`120`		`- private function bootstrapProvider(): DoctrineTokenProvider`
	`120`	`+ protected function bootstrapProvider(): DoctrineTokenProvider`
`121`	`121`	`{`
`122`	`122`	`$config = ORMSetup::createConfiguration(true);`
`123`	`123`	`$config->setSchemaManagerFactory(new DefaultSchemaManagerFactory());`