Merge branch '6.4' into 7.0

derrabus · derrabus · commit 73fb4add22c5 · 2023-11-25T21:12:27.000+01:00
* 6.4:
  Remove obsolete PHP version checks
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php
@@ -21,14 +21,14 @@ class ConstraintValidatorTest extends TestCase
     /**
      * @dataProvider formatValueProvider
      */
-    public function testFormatValue($expected, $value, $format = 0)
+    public function testFormatValue(string $expected, mixed $value, int $format = 0)
     {
         \Locale::setDefault('en');
 
         $this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format));
     }
 
-    public static function formatValueProvider()
+    public static function formatValueProvider(): array
     {
         $defaultTimezone = date_default_timezone_get();
         date_default_timezone_set('Europe/Moscow'); // GMT+3

Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,14 @@ class ConstraintValidatorTest extends TestCase`
`21`	`21`	`/**`
`22`	`22`	`* @dataProvider formatValueProvider`
`23`	`23`	`*/`
`24`		`- public function testFormatValue($expected, $value, $format = 0)`
	`24`	`+ public function testFormatValue(string $expected, mixed $value, int $format = 0)`
`25`	`25`	`{`
`26`	`26`	`\Locale::setDefault('en');`
`27`	`27`
`28`	`28`	`$this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format));`
`29`	`29`	`}`
`30`	`30`
`31`		`- public static function formatValueProvider()`
	`31`	`+ public static function formatValueProvider(): array`
`32`	`32`	`{`
`33`	`33`	`$defaultTimezone = date_default_timezone_get();`
`34`	`34`	`date_default_timezone_set('Europe/Moscow'); // GMT+3`