Skip to content

Commit b439823

Browse files
Merge branch '5.4' into 6.4
* 5.4: [TwigBridge] Fix compat with Twig v3.9 [Mailer] Simplify fix
2 parents 18e3906 + 2e9c2b1 commit b439823

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

Tests/Dumper/CliDumperTest.php

+1-3
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,7 @@ public function testThrowingCaster()
348348
› twig source
349349
350350
}
351-
%s%eTemplate.php:%d { …}
352-
%s%eTemplate.php:%d { …}
353-
%s%eTemplate.php:%d { …}
351+
%A%eTemplate.php:%d { …}
354352
%s%eTests%eDumper%eCliDumperTest.php:%d { …}
355353
%A }
356354
}

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"symfony/http-kernel": "^5.4|^6.0|^7.0",
2828
"symfony/process": "^5.4|^6.0|^7.0",
2929
"symfony/uid": "^5.4|^6.0|^7.0",
30-
"twig/twig": "^2.13|~3.8.0"
30+
"twig/twig": "^2.13|^3.0.4"
3131
},
3232
"conflict": {
3333
"symfony/console": "<5.4"

0 commit comments

Comments
 (0)