From af01957aa5c22f7c66ca08551e1b621cc12f6f20 Mon Sep 17 00:00:00 2001
From: stlgaits <estelle.gaits@gmail.com>
Date: Mon, 21 Sep 2026 11:37:11 +0200
Subject: [PATCH 1/2] build: add conflict with twig/twig 3.29

---
 CONFLICTS.md  | 17 +++++++++++++++++
 composer.json |  3 +++
 2 files changed, 20 insertions(+)
 create mode 100644 CONFLICTS.md

diff --git a/CONFLICTS.md b/CONFLICTS.md
new file mode 100644
index 00000000..c86d5ebe
--- /dev/null
+++ b/CONFLICTS.md
@@ -0,0 +1,17 @@
+# Conflicts
+
+This document explains why certain conflicts were added to `composer.json` and references related issues.
+
+## twig/twig 3.29.*
+
+**Added:** 2026-09-21
+
+**Reason:** Twig 3.29.0 changed `TemplateWrapper::unwrap()` to require an
+`Environment $env` argument (twigphp/Twig#4935). `symfony/twig-bridge`'s
+`TwigRendererEngine` still calls it with no arguments when loading form
+themes, so every form render throws `ArgumentCountError`. `sylius/mailer-bundle`
+had the same call in `EmailTwigAdapter`. 
+
+**Remove when:** releases of `symfony/twig-bridge` and `sylius/mailer-bundle`
+shipping the fix are available (see Sylius/SyliusMailerBundle#292,
+symfony/symfony#66062).
diff --git a/composer.json b/composer.json
index 68965f7d..59fc9566 100644
--- a/composer.json
+++ b/composer.json
@@ -113,6 +113,9 @@
             "require": "8.0.*"
         }
     },
+    "conflict": {
+        "twig/twig": "3.29.*"
+    },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",

From fc69294c3933caf3fe5ff3f7ed635f325923064b Mon Sep 17 00:00:00 2001
From: TheMilek <kam.grygierzec@gmail.com>
Date: Wed, 23 Sep 2026 09:32:56 +0200
Subject: [PATCH 2/2] build: narrow twig/twig conflict to 3.29.0

---
 CONFLICTS.md  | 10 +++++-----
 composer.json |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONFLICTS.md b/CONFLICTS.md
index c86d5ebe..b62f9c57 100644
--- a/CONFLICTS.md
+++ b/CONFLICTS.md
@@ -2,7 +2,7 @@
 
 This document explains why certain conflicts were added to `composer.json` and references related issues.
 
-## twig/twig 3.29.*
+## twig/twig 3.29.0
 
 **Added:** 2026-09-21
 
@@ -10,8 +10,8 @@ This document explains why certain conflicts were added to `composer.json` and r
 `Environment $env` argument (twigphp/Twig#4935). `symfony/twig-bridge`'s
 `TwigRendererEngine` still calls it with no arguments when loading form
 themes, so every form render throws `ArgumentCountError`. `sylius/mailer-bundle`
-had the same call in `EmailTwigAdapter`. 
+had the same call in `EmailTwigAdapter`. The BC break is reverted in the next
+Twig release (twigphp/Twig#4936), so only 3.29.0 is affected.
 
-**Remove when:** releases of `symfony/twig-bridge` and `sylius/mailer-bundle`
-shipping the fix are available (see Sylius/SyliusMailerBundle#292,
-symfony/symfony#66062).
+**Remove when:** Twig 3.29.0 is no longer worth guarding against (the fix ships
+in the next Twig release, see twigphp/Twig#4936).
diff --git a/composer.json b/composer.json
index 59fc9566..8471d84e 100644
--- a/composer.json
+++ b/composer.json
@@ -114,7 +114,7 @@
         }
     },
     "conflict": {
-        "twig/twig": "3.29.*"
+        "twig/twig": "3.29.0"
     },
     "scripts": {
         "auto-scripts": {