Merge branch '5.4' into 6.4

nicolas-grekas · nicolas-grekas · commit b2e94633986b · 2024-08-30T18:03:21.000+02:00
* 5.4:
  [VarDumper] Fix tests
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -343,7 +343,7 @@ public function testThrowingCaster()
     #message: "Unexpected Exception thrown from a caster: Foobar"
     trace: {
       %sTwig.php:2 {
-        __TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = [])
+        __TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = []): array
         › foo bar
         ›   twig source
         › 
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -28,7 +28,7 @@ public function __construct(?Twig\Environment $env = null, $path = null)
         $this->path = $path;
     }
 
-    protected function doDisplay(array $context, array $blocks = [])
+    protected function doDisplay(array $context, array $blocks = []): array
     {
         // line 2
         throw new \Exception('Foobar');

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(?Twig\Environment $env = null, $path = null)`
`28`	`28`	`$this->path = $path;`
`29`	`29`	`}`
`30`	`30`
`31`		`- protected function doDisplay(array $context, array $blocks = [])`
	`31`	`+ protected function doDisplay(array $context, array $blocks = []): array`
`32`	`32`	`{`
`33`	`33`	`// line 2`
`34`	`34`	`throw new \Exception('Foobar');`