Merge branch '5.4' into 6.4

* 5.4: [TwigBridge] Fix compat with Twig v3.9 [Mailer] Simplify fix
symfony · Feb 15, 2024 · b439823 · b439823
2 parents 18e3906 + 2e9c2b1
commit b439823
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Tests/Dumper/CliDumperTest.php b/Tests/Dumper/CliDumperTest.php
@@ -348,9 +348,7 @@ public function testThrowingCaster()
         ›   twig source
         › 
       }
-      %s%eTemplate.php:%d { …}
-      %s%eTemplate.php:%d { …}
-      %s%eTemplate.php:%d { …}
+      %A%eTemplate.php:%d { …}
       %s%eTests%eDumper%eCliDumperTest.php:%d { …}
 %A  }
   }

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "symfony/http-kernel": "^5.4|^6.0|^7.0",
         "symfony/process": "^5.4|^6.0|^7.0",
         "symfony/uid": "^5.4|^6.0|^7.0",
-        "twig/twig": "^2.13|~3.8.0"
+        "twig/twig": "^2.13|^3.0.4"
     },
     "conflict": {
         "symfony/console": "<5.4"