Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 714ca9b24c48 · 2023-10-31T14:00:04.000+01:00
* 6.3:
  [Form] Clean up in tests
  remove invalid test
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
@@ -566,26 +566,6 @@ public function testSecretRememberMeHasher()
         $this->assertSame('very', $handler->getArgument(2));
     }
 
-    public function testSecretRememberMeHandler()
-    {
-        $container = $this->getRawContainer();
-
-        $container->register('custom_remember_me', \stdClass::class);
-        $container->loadFromExtension('security', [
-            'enable_authenticator_manager' => true,
-            'firewalls' => [
-                'default' => [
-                    'remember_me' => ['secret' => 'very', 'token_provider' => 'token_provider_id'],
-                ],
-            ],
-        ]);
-
-        $container->compile();
-
-        $handler = $container->getDefinition('security.authenticator.remember_me_handler.default');
-        $this->assertSame('very', $handler->getArgument(1));
-    }
-
     public static function sessionConfigurationProvider(): array
     {
         return [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
@@ -18,8 +18,8 @@
 
 class ChoiceToValueTransformerTest extends TestCase
 {
-    protected ?ChoiceToValueTransformer $transformer;
-    protected ?ChoiceToValueTransformer $transformerWithNull;
+    protected ChoiceToValueTransformer $transformer;
+    protected ChoiceToValueTransformer $transformerWithNull;
 
     protected function setUp(): void
     {
@@ -30,12 +30,6 @@ protected function setUp(): void
         $this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);
     }
 
-    protected function tearDown(): void
-    {
-        $this->transformer = null;
-        $this->transformerWithNull = null;
-    }
-
     public static function transformProvider(): array
     {
         return [
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -20,8 +20,8 @@ class DateTimeToRfc3339TransformerTest extends BaseDateTimeTransformerTestCase
 {
     use DateTimeEqualsTrait;
 
-    protected ?\DateTime $dateTime;
-    protected ?\DateTime $dateTimeWithoutSeconds;
+    protected \DateTime $dateTime;
+    protected \DateTime $dateTimeWithoutSeconds;
 
     protected function setUp(): void
     {
@@ -31,12 +31,6 @@ protected function setUp(): void
         $this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC');
     }
 
-    protected function tearDown(): void
-    {
-        $this->dateTime = null;
-        $this->dateTimeWithoutSeconds = null;
-    }
-
     public static function allProvider(): array
     {
         return [

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@`
`18`	`18`
`19`	`19`	`class ChoiceToValueTransformerTest extends TestCase`
`20`	`20`	`{`
`21`		`- protected ?ChoiceToValueTransformer $transformer;`
`22`		`- protected ?ChoiceToValueTransformer $transformerWithNull;`
	`21`	`+ protected ChoiceToValueTransformer $transformer;`
	`22`	`+ protected ChoiceToValueTransformer $transformerWithNull;`
`23`	`23`
`24`	`24`	`protected function setUp(): void`
`25`	`25`	`{`
`@@ -30,12 +30,6 @@ protected function setUp(): void`
`30`	`30`	`$this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);`
`31`	`31`	`}`
`32`	`32`
`33`		`- protected function tearDown(): void`
`34`		`- {`
`35`		`- $this->transformer = null;`
`36`		`- $this->transformerWithNull = null;`
`37`		`- }`
`38`		`-`
`39`	`33`	`public static function transformProvider(): array`
`40`	`34`	`{`
`41`	`35`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ class DateTimeToRfc3339TransformerTest extends BaseDateTimeTransformerTestCase`
`20`	`20`	`{`
`21`	`21`	`use DateTimeEqualsTrait;`
`22`	`22`
`23`		`- protected ?\DateTime $dateTime;`
`24`		`- protected ?\DateTime $dateTimeWithoutSeconds;`
	`23`	`+ protected \DateTime $dateTime;`
	`24`	`+ protected \DateTime $dateTimeWithoutSeconds;`
`25`	`25`
`26`	`26`	`protected function setUp(): void`
`27`	`27`	`{`
`@@ -31,12 +31,6 @@ protected function setUp(): void`
`31`	`31`	`$this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC');`
`32`	`32`	`}`
`33`	`33`
`34`		`- protected function tearDown(): void`
`35`		`- {`
`36`		`- $this->dateTime = null;`
`37`		`- $this->dateTimeWithoutSeconds = null;`
`38`		`- }`
`39`		`-`
`40`	`34`	`public static function allProvider(): array`
`41`	`35`	`{`
`42`	`36`	`return [`