Merge branch '6.4' into 7.1

* 6.4: Fix expected missing return types [VarDumper] Fix tests
symfony · Aug 30, 2024 · a5fa748 · a5fa748
2 parents 6c7d1f0 + ee14c82
commit a5fa748
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Tests/Dumper/CliDumperTest.php b/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/Tests/Fixtures/Twig.php b/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');