Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit f09847c9e570 · 2023-10-31T09:37:52.000+01:00
* 6.4:
  Fix tests
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
     {
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
     {

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`	`{`
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`	`{`