Merge branch '6.4' into 7.0

xabbuh · xabbuh · commit cded64e5bbf9 · 2024-03-28T22:02:11.000+01:00
* 6.4:
  Fix implicit nullable parameters
  Remove whitespaces from block form_help
  Fix TypeError on ProgressBar
diff --git a/Tests/Fixtures/AttributeFixtures/ExtendedRoute.php b/Tests/Fixtures/AttributeFixtures/ExtendedRoute.php
@@ -7,7 +7,7 @@
 #[\Attribute(\Attribute::IS_REPEATABLE | \Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD)]
 class ExtendedRoute extends Route
 {
-    public function __construct(array|string $path = null, ?string $name = null, array $defaults = [])
+    public function __construct(array|string|null $path = null, ?string $name = null, array $defaults = [])
     {
         parent::__construct("/{section<(foo|bar|baz)>}" . $path, $name, [], [], array_merge(['section' => 'foo'], $defaults));
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#[\Attribute(\Attribute::IS_REPEATABLE \| \Attribute::TARGET_CLASS \| \Attribute::TARGET_METHOD)]`
`8`	`8`	`class ExtendedRoute extends Route`
`9`	`9`	`{`
`10`		`- public function __construct(array\|string $path = null, ?string $name = null, array $defaults = [])`
	`10`	`+ public function __construct(array\|string\|null $path = null, ?string $name = null, array $defaults = [])`
`11`	`11`	`{`
`12`	`12`	`parent::__construct("/{section<(foo\|bar\|baz)>}" . $path, $name, [], [], array_merge(['section' => 'foo'], $defaults));`
`13`	`13`	`}`