Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 402912e71c09 · 2023-01-11T14:55:09.000+01:00
* 5.4:
  [Intl] Fix tests
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -17,9 +17,8 @@ class Foo
 {
     /**
      * @required
-     * @return static
      */
-    public function cloneFoo()
+    public function cloneFoo(): static
     {
         return clone $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,8 @@ class Foo`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @required`
`20`		`- * @return static`
`21`	`20`	`*/`
`22`		`- public function cloneFoo()`
	`21`	`+ public function cloneFoo(): static`
`23`	`22`	`{`
`24`	`23`	`return clone $this;`
`25`	`24`	`}`