Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 5bff8c5d975d · 2023-10-31T15:41:59.000+01:00
* 5.4:
  do not install FrameworkBundle 6.4
  [Tests] Add `array` return type for provider methods
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=8.1",
         "symfony/config": "^5.4|^6.0",
-        "symfony/framework-bundle": "^5.4|^6.0",
+        "symfony/framework-bundle": "^5.4|^6.0,<6.4",
         "symfony/http-kernel": "^6.3",
         "symfony/routing": "^5.4|^6.0",
         "symfony/twig-bundle": "^5.4|^6.0",
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
@@ -43,12 +43,12 @@ public static function allProvider(): array
         ];
     }
 
-    public static function transformProvider()
+    public static function transformProvider(): array
     {
         return self::allProvider();
     }
 
-    public static function reverseTransformProvider()
+    public static function reverseTransformProvider(): array
     {
         return array_merge(self::allProvider(), [
             // format without seconds, as appears in some browsers
@@ -126,7 +126,7 @@ public function testReverseTransformExpectsValidDateString($date)
         $transformer->reverseTransform($date);
     }
 
-    public static function invalidDateStringProvider()
+    public static function invalidDateStringProvider(): array
     {
         return [
             'invalid month' => ['2010-2010-01'],

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,12 @@ public static function allProvider(): array`
`43`	`43`	`];`
`44`	`44`	`}`
`45`	`45`
`46`		`- public static function transformProvider()`
	`46`	`+ public static function transformProvider(): array`
`47`	`47`	`{`
`48`	`48`	`return self::allProvider();`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static function reverseTransformProvider()`
	`51`	`+ public static function reverseTransformProvider(): array`
`52`	`52`	`{`
`53`	`53`	`return array_merge(self::allProvider(), [`
`54`	`54`	`// format without seconds, as appears in some browsers`
`@@ -126,7 +126,7 @@ public function testReverseTransformExpectsValidDateString($date)`
`126`	`126`	`$transformer->reverseTransform($date);`
`127`	`127`	`}`
`128`	`128`
`129`		`- public static function invalidDateStringProvider()`
	`129`	`+ public static function invalidDateStringProvider(): array`
`130`	`130`	`{`
`131`	`131`	`return [`
`132`	`132`	`'invalid month' => ['2010-2010-01'],`