Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit f42f96326c86 · 2023-10-31T09:18:17.000+01:00
* 6.3:
  [Console] Fix horizontal table top border is incorrectly rendered
  [Tests] Streamline
  [Uid] Fix UuidV7 collisions within the same ms
  [Validator] updated Romanian translation
diff --git a/Tests/AbstractRequestHandlerTestCase.php b/Tests/AbstractRequestHandlerTestCase.php
@@ -59,7 +59,7 @@ public function getNormalizedIniPostMaxSize(): string
         $this->request = null;
     }
 
-    public static function methodExceptGetProvider()
+    public static function methodExceptGetProvider(): array
     {
         return [
             ['POST'],
@@ -69,7 +69,7 @@ public static function methodExceptGetProvider()
         ];
     }
 
-    public static function methodProvider()
+    public static function methodProvider(): array
     {
         return array_merge([
             ['GET'],
diff --git a/Tests/CompoundFormTest.php b/Tests/CompoundFormTest.php
@@ -575,7 +575,7 @@ public function testSubmitMapsSubmittedChildrenOntoEmptyData()
         $this->assertSame('Bernhard', $object['name']);
     }
 
-    public static function requestMethodProvider()
+    public static function requestMethodProvider(): array
     {
         return [
             ['POST'],
diff --git a/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php b/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
@@ -30,7 +30,13 @@ protected function setUp(): void
         $this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);
     }
 
-    public static function transformProvider()
+    protected function tearDown(): void
+    {
+        $this->transformer = null;
+        $this->transformerWithNull = null;
+    }
+
+    public static function transformProvider(): array
     {
         return [
             // more extensive test set can be found in FormUtilTest
diff --git a/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateIntervalToStringTransformerTest.php
@@ -20,23 +20,21 @@
  */
 class DateIntervalToStringTransformerTest extends DateIntervalTestCase
 {
-    public static function dataProviderISO()
+    public static function dataProviderISO(): array
     {
-        $data = [
+        return [
             ['P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'],
             ['P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'],
             ['P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'],
             ['P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'],
             ['P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'],
             ['P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'],
         ];
-
-        return $data;
     }
 
-    public static function dataProviderDate()
+    public static function dataProviderDate(): array
     {
-        $data = [
+        return [
             [
                 '%y years %m months %d days %h hours %i minutes %s seconds',
                 '10 years 2 months 3 days 16 hours 5 minutes 6 seconds',
@@ -52,8 +50,6 @@ public static function dataProviderDate()
             ['%y years %m months', '10 years 2 months', 'P10Y2M'],
             ['%y year', '1 year', 'P1Y'],
         ];
-
-        return $data;
     }
 
     /**
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformerTest.php
@@ -30,7 +30,7 @@ public function testTransform(\DateTime $expectedOutput, \DateTimeImmutable $inp
         $this->assertEquals($expectedOutput->getTimezone(), $actualOutput->getTimezone());
     }
 
-    public static function provider()
+    public static function provider(): array
     {
         return [
             [
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToHtml5LocalDateTimeTransformerTest.php
@@ -20,7 +20,7 @@ class DateTimeToHtml5LocalDateTimeTransformerTest extends BaseDateTimeTransforme
 {
     use DateTimeEqualsTrait;
 
-    public static function transformProvider()
+    public static function transformProvider(): array
     {
         return [
             ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06', true],
@@ -36,7 +36,7 @@ public static function transformProvider()
         ];
     }
 
-    public static function reverseTransformProvider()
+    public static function reverseTransformProvider(): array
     {
         return [
             // format without seconds, as appears in some browsers
diff --git a/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -31,7 +31,13 @@ protected function setUp(): void
         $this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC');
     }
 
-    public static function allProvider()
+    protected function tearDown(): void
+    {
+        $this->dateTime = null;
+        $this->dateTimeWithoutSeconds = null;
+    }
+
+    public static function allProvider(): array
     {
         return [
             ['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],
diff --git a/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php b/Tests/Extension/Core/DataTransformer/PercentToLocalizedStringTransformerTest.php
@@ -87,7 +87,7 @@ public function testReverseTransform()
         $this->assertEquals(2, $transformer->reverseTransform('200'));
     }
 
-    public static function reverseTransformWithRoundingProvider()
+    public static function reverseTransformWithRoundingProvider(): array
     {
         return [
             // towards positive infinity (1.6 -> 2, -1.6 -> -1)
diff --git a/Tests/Extension/Core/Type/CheckboxTypeTest.php b/Tests/Extension/Core/Type/CheckboxTypeTest.php
@@ -162,7 +162,7 @@ public function testCustomModelTransformer($data, $checked)
         $this->assertEquals($checked, $view->vars['checked']);
     }
 
-    public static function provideCustomModelTransformerData()
+    public static function provideCustomModelTransformerData(): array
     {
         return [
             ['checked', true],
@@ -182,7 +182,7 @@ public function testCustomFalseValues($falseValue)
         $this->assertFalse($form->getData());
     }
 
-    public static function provideCustomFalseValues()
+    public static function provideCustomFalseValues(): array
     {
         return [
             [''],
diff --git a/Tests/Extension/Core/Type/ColorTypeTest.php b/Tests/Extension/Core/Type/ColorTypeTest.php
@@ -33,7 +33,7 @@ public function testValidationShouldPass(bool $html5, ?string $submittedValue)
         $this->assertEmpty($form->getErrors());
     }
 
-    public static function validationShouldPassProvider()
+    public static function validationShouldPassProvider(): array
     {
         return [
             [false, 'foo'],
@@ -71,7 +71,7 @@ public function testValidationShouldFail(string $expectedValueParameterValue, ?s
         $this->assertEquals([$expectedFormError], iterator_to_array($form->getErrors()));
     }
 
-    public static function validationShouldFailProvider()
+    public static function validationShouldFailProvider(): array
     {
         return [
             ['foo', 'foo'],
diff --git a/Tests/Extension/Core/Type/DateIntervalTypeTest.php b/Tests/Extension/Core/Type/DateIntervalTypeTest.php
@@ -440,7 +440,7 @@ public function testSubmitNullUsesDateEmptyData($widget, $emptyData, $expectedDa
         $this->assertEquals($expectedData, $form->getData());
     }
 
-    public static function provideEmptyData()
+    public static function provideEmptyData(): array
     {
         $expectedData = new \DateInterval('P6Y4M');
 
diff --git a/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php b/Tests/Extension/Core/Type/ExtendedChoiceTypeTest.php
@@ -58,7 +58,7 @@ public function testChoiceLoaderIsOverridden($type)
         $this->assertSame('lazy_b', $choices[1]->value);
     }
 
-    public static function provideTestedTypes()
+    public static function provideTestedTypes(): iterable
     {
         yield [CountryTypeTest::TESTED_TYPE];
         yield [CurrencyTypeTest::TESTED_TYPE];
diff --git a/Tests/Extension/Core/Type/FileTypeTest.php b/Tests/Extension/Core/Type/FileTypeTest.php
@@ -183,7 +183,7 @@ public function testSubmitNonArrayValueWhenMultiple(RequestHandlerInterface $req
         $this->assertSame([], $form->getViewData());
     }
 
-    public static function requestHandlerProvider()
+    public static function requestHandlerProvider(): array
     {
         return [
             [new HttpFoundationRequestHandler()],
diff --git a/Tests/Extension/Core/Type/TextTypeTest.php b/Tests/Extension/Core/Type/TextTypeTest.php
@@ -32,7 +32,7 @@ public function testSubmitNullReturnsNullWithEmptyDataAsString()
         $this->assertSame('', $form->getViewData());
     }
 
-    public static function provideZeros()
+    public static function provideZeros(): array
     {
         return [
             [0, '0'],
diff --git a/Tests/Extension/Core/Type/WeekTypeTest.php b/Tests/Extension/Core/Type/WeekTypeTest.php
@@ -313,7 +313,7 @@ public function testSubmitNullUsesDateEmptyDataString($widget, $emptyData, $expe
         $this->assertSame($expectedData, $form->getData());
     }
 
-    public static function provideEmptyData()
+    public static function provideEmptyData(): array
     {
         return [
             'Compound text field' => ['text', ['year' => '2019', 'week' => '1'], ['year' => 2019, 'week' => 1]],
diff --git a/Tests/FormErrorIteratorTest.php b/Tests/FormErrorIteratorTest.php
@@ -51,7 +51,7 @@ public function testFindByCodes($code, $violationsCount)
         $this->assertCount($violationsCount, $specificFormErrors);
     }
 
-    public static function findByCodesProvider()
+    public static function findByCodesProvider(): array
     {
         return [
             ['code1', 2],
diff --git a/Tests/ResolvedFormTypeTest.php b/Tests/ResolvedFormTypeTest.php
@@ -161,7 +161,7 @@ public function testBlockPrefixDefaultsToFQCNIfNoName($typeClass, $blockPrefix)
         $this->assertSame($blockPrefix, $resolvedType->getBlockPrefix());
     }
 
-    public static function provideTypeClassBlockPrefixTuples()
+    public static function provideTypeClassBlockPrefixTuples(): array
     {
         return [
             [Fixtures\FooType::class, 'foo'],
diff --git a/Tests/SimpleFormTest.php b/Tests/SimpleFormTest.php
@@ -86,7 +86,7 @@ public function testGetPropertyPath($name, $propertyPath)
         $this->assertEquals($propertyPath, $form->getPropertyPath());
     }
 
-    public static function provideFormNames()
+    public static function provideFormNames(): iterable
     {
         yield [null, null];
         yield ['', null];
diff --git a/Tests/Util/StringUtilTest.php b/Tests/Util/StringUtilTest.php
@@ -16,7 +16,7 @@
 
 class StringUtilTest extends TestCase
 {
-    public static function trimProvider()
+    public static function trimProvider(): array
     {
         return [
             [' Foo! ', 'Foo!'],
@@ -49,7 +49,7 @@ public function testTrimUtf8Separators($hex)
         $this->assertSame("ab\ncd", StringUtil::trim($symbol));
     }
 
-    public static function spaceProvider()
+    public static function spaceProvider(): array
     {
         return [
             // separators
@@ -97,7 +97,7 @@ public function testFqcnToBlockPrefix($fqcn, $expectedBlockPrefix)
         $this->assertSame($expectedBlockPrefix, $blockPrefix);
     }
 
-    public static function fqcnToBlockPrefixProvider()
+    public static function fqcnToBlockPrefixProvider(): array
     {
         return [
             ['TYPE', 'type'],

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function getNormalizedIniPostMaxSize(): string`
`59`	`59`	`$this->request = null;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public static function methodExceptGetProvider()`
	`62`	`+ public static function methodExceptGetProvider(): array`
`63`	`63`	`{`
`64`	`64`	`return [`
`65`	`65`	`['POST'],`
`@@ -69,7 +69,7 @@ public static function methodExceptGetProvider()`
`69`	`69`	`];`
`70`	`70`	`}`
`71`	`71`
`72`		`- public static function methodProvider()`
	`72`	`+ public static function methodProvider(): array`
`73`	`73`	`{`
`74`	`74`	`return array_merge([`
`75`	`75`	`['GET'],`
Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ public function testSubmitMapsSubmittedChildrenOntoEmptyData()`
`575`	`575`	`$this->assertSame('Bernhard', $object['name']);`
`576`	`576`	`}`
`577`	`577`
`578`		`- public static function requestMethodProvider()`
	`578`	`+ public static function requestMethodProvider(): array`
`579`	`579`	`{`
`580`	`580`	`return [`
`581`	`581`	`['POST'],`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,13 @@ protected function setUp(): void`
`30`	`30`	`$this->transformerWithNull = new ChoiceToValueTransformer($listWithNull);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public static function transformProvider()`
	`33`	`+ protected function tearDown(): void`
	`34`	`+ {`
	`35`	`+ $this->transformer = null;`
	`36`	`+ $this->transformerWithNull = null;`
	`37`	`+ }`
	`38`	`+`
	`39`	`+ public static function transformProvider(): array`
`34`	`40`	`{`
`35`	`41`	`return [`
`36`	`42`	`// more extensive test set can be found in FormUtilTest`
Original file line number	Diff line number	Diff line change
`@@ -20,23 +20,21 @@`
`20`	`20`	`*/`
`21`	`21`	`class DateIntervalToStringTransformerTest extends DateIntervalTestCase`
`22`	`22`	`{`
`23`		`- public static function dataProviderISO()`
	`23`	`+ public static function dataProviderISO(): array`
`24`	`24`	`{`
`25`		`- $data = [`
	`25`	`+ return [`
`26`	`26`	`['P%YY%MM%DDT%HH%IM%SS', 'P00Y00M00DT00H00M00S', 'PT0S'],`
`27`	`27`	`['P%yY%mM%dDT%hH%iM%sS', 'P0Y0M0DT0H0M0S', 'PT0S'],`
`28`	`28`	`['P%yY%mM%dDT%hH%iM%sS', 'P10Y2M3DT16H5M6S', 'P10Y2M3DT16H5M6S'],`
`29`	`29`	`['P%yY%mM%dDT%hH%iM', 'P10Y2M3DT16H5M', 'P10Y2M3DT16H5M'],`
`30`	`30`	`['P%yY%mM%dDT%hH', 'P10Y2M3DT16H', 'P10Y2M3DT16H'],`
`31`	`31`	`['P%yY%mM%dD', 'P10Y2M3D', 'P10Y2M3DT0H'],`
`32`	`32`	`];`
`33`		`-`
`34`		`- return $data;`
`35`	`33`	`}`
`36`	`34`
`37`		`- public static function dataProviderDate()`
	`35`	`+ public static function dataProviderDate(): array`
`38`	`36`	`{`
`39`		`- $data = [`
	`37`	`+ return [`
`40`	`38`	`[`
`41`	`39`	`'%y years %m months %d days %h hours %i minutes %s seconds',`
`42`	`40`	`'10 years 2 months 3 days 16 hours 5 minutes 6 seconds',`
`@@ -52,8 +50,6 @@ public static function dataProviderDate()`
`52`	`50`	`['%y years %m months', '10 years 2 months', 'P10Y2M'],`
`53`	`51`	`['%y year', '1 year', 'P1Y'],`
`54`	`52`	`];`
`55`		`-`
`56`		`- return $data;`
`57`	`53`	`}`
`58`	`54`
`59`	`55`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function testTransform(\DateTime $expectedOutput, \DateTimeImmutable $inp`
`30`	`30`	`$this->assertEquals($expectedOutput->getTimezone(), $actualOutput->getTimezone());`
`31`	`31`	`}`
`32`	`32`
`33`		`- public static function provider()`
	`33`	`+ public static function provider(): array`
`34`	`34`	`{`
`35`	`35`	`return [`
`36`	`36`	`[`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DateTimeToHtml5LocalDateTimeTransformerTest extends BaseDateTimeTransforme`
`20`	`20`	`{`
`21`	`21`	`use DateTimeEqualsTrait;`
`22`	`22`
`23`		`- public static function transformProvider()`
	`23`	`+ public static function transformProvider(): array`
`24`	`24`	`{`
`25`	`25`	`return [`
`26`	`26`	`['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06', true],`
`@@ -36,7 +36,7 @@ public static function transformProvider()`
`36`	`36`	`];`
`37`	`37`	`}`
`38`	`38`
`39`		`- public static function reverseTransformProvider()`
	`39`	`+ public static function reverseTransformProvider(): array`
`40`	`40`	`{`
`41`	`41`	`return [`
`42`	`42`	`// format without seconds, as appears in some browsers`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,13 @@ protected function setUp(): void`
`31`	`31`	`$this->dateTimeWithoutSeconds = new \DateTime('2010-02-03 04:05:00 UTC');`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static function allProvider()`
	`34`	`+ protected function tearDown(): void`
	`35`	`+ {`
	`36`	`+ $this->dateTime = null;`
	`37`	`+ $this->dateTimeWithoutSeconds = null;`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ public static function allProvider(): array`
`35`	`41`	`{`
`36`	`42`	`return [`
`37`	`43`	`['UTC', 'UTC', '2010-02-03 04:05:06 UTC', '2010-02-03T04:05:06Z'],`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function testReverseTransform()`
`87`	`87`	`$this->assertEquals(2, $transformer->reverseTransform('200'));`
`88`	`88`	`}`
`89`	`89`
`90`		`- public static function reverseTransformWithRoundingProvider()`
	`90`	`+ public static function reverseTransformWithRoundingProvider(): array`
`91`	`91`	`{`
`92`	`92`	`return [`
`93`	`93`	`// towards positive infinity (1.6 -> 2, -1.6 -> -1)`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public function testCustomModelTransformer($data, $checked)`
`162`	`162`	`$this->assertEquals($checked, $view->vars['checked']);`
`163`	`163`	`}`
`164`	`164`
`165`		`- public static function provideCustomModelTransformerData()`
	`165`	`+ public static function provideCustomModelTransformerData(): array`
`166`	`166`	`{`
`167`	`167`	`return [`
`168`	`168`	`['checked', true],`
`@@ -182,7 +182,7 @@ public function testCustomFalseValues($falseValue)`
`182`	`182`	`$this->assertFalse($form->getData());`
`183`	`183`	`}`
`184`	`184`
`185`		`- public static function provideCustomFalseValues()`
	`185`	`+ public static function provideCustomFalseValues(): array`
`186`	`186`	`{`
`187`	`187`	`return [`
`188`	`188`	`[''],`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function testValidationShouldPass(bool $html5, ?string $submittedValue)`
`33`	`33`	`$this->assertEmpty($form->getErrors());`
`34`	`34`	`}`
`35`	`35`
`36`		`- public static function validationShouldPassProvider()`
	`36`	`+ public static function validationShouldPassProvider(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`[false, 'foo'],`
`@@ -71,7 +71,7 @@ public function testValidationShouldFail(string $expectedValueParameterValue, ?s`
`71`	`71`	`$this->assertEquals([$expectedFormError], iterator_to_array($form->getErrors()));`
`72`	`72`	`}`
`73`	`73`
`74`		`- public static function validationShouldFailProvider()`
	`74`	`+ public static function validationShouldFailProvider(): array`
`75`	`75`	`{`
`76`	`76`	`return [`
`77`	`77`	`['foo', 'foo'],`