minor #16128 Add twig 3.9.0 conflict (mpysiak)

This PR was merged into the 1.12 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.12 | | Bug fix? | no | | New feature? | no | | BC breaks? | no | | Deprecations? | no | | Related tickets | n/a | | License | MIT | Commits ------- Add twig 3.9.0 conflict Add conflicts in bundles Add twig/intl-extra conflict Add conflicts
Sylius · Apr 17, 2024 · 71c8b98 · 71c8b98
2 parents a37c7dc + a5afa24
commit 71c8b98
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 7 deletions.
diff --git a/CONFLICTS.md b/CONFLICTS.md
@@ -74,3 +74,13 @@ references related issues.
 
   This version introduced class aliases, which lead to a fatal error:
   `The autoloader expected class "ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\ApiPlatformExtension" to be defined in file ".../vendor/api-platform/core/src/Core/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php". The file was found but the class was not in it, the class name or namespace probably has a typo.`
+
+- `twig/twig:3.9.0`:
+
+  This version has a bug, which lead to a fatal error:
+  `An exception has been thrown during the rendering of a template ("Warning: Undefined variable $blocks").`
+
+- `twig/intl-extra:3.9.0`:
+
+  This version call function `dateConverter` which is only available in `twig/twig:3.9.0`, that leads to a fatal error:
+  `An exception has been thrown during the rendering of a template ("Call to undefined method Twig\Extension\CoreExtension::dateConverter()").`
diff --git a/composer.json b/composer.json
@@ -189,7 +189,9 @@
         "symfony/dependency-injection": "5.4.5",
         "symfony/framework-bundle": "5.4.5 || 6.2.8",
         "symfony/validator": "5.4.25 || 6.2.12 || 6.3.1",
-        "liip/imagine-bundle": "2.7.0"
+        "liip/imagine-bundle": "2.7.0",
+        "twig/twig": "3.9.0",
+        "twig/intl-extra": "3.9.0"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",

diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json
@@ -47,6 +47,10 @@
         "symfony/dotenv": "^5.4 || ^6.0",
         "php-http/message-factory": "^1.0"
     },
+    "conflict": {
+        "twig/twig": "3.9.0",
+        "twig/intl-extra": "3.9.0"
+    },
     "config": {
         "allow-plugins": {
             "symfony/flex": true

diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json
@@ -42,7 +42,8 @@
         "twig/twig": "^2.12 || ^3.3"
     },
     "conflict": {
-        "doctrine/orm": ">= 2.16.0"
+        "doctrine/orm": ">= 2.16.0",
+        "twig/twig": "3.9.0"
     },
     "config": {
         "allow-plugins": {

diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json
@@ -34,7 +34,7 @@
     },
     "conflict": {
         "doctrine/orm": ">= 2.16.0",
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0 || 3.9.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.13",

diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json
@@ -35,7 +35,7 @@
     },
     "conflict": {
         "doctrine/orm": ">= 2.16.0",
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0 || 3.9.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.13",

diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json
@@ -34,7 +34,7 @@
     },
     "conflict": {
         "doctrine/orm": ">= 2.16.0",
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0 || 3.9.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.13",

diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json
@@ -34,7 +34,7 @@
     },
     "conflict": {
         "doctrine/orm": ">= 2.16.0",
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0 || 3.9.0"
     },
     "require-dev": {
         "doctrine/orm": "^2.13",

diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json
@@ -43,6 +43,10 @@
         "phpunit/phpunit": "^8.5",
         "symfony/dependency-injection": "^5.4 || ^6.0"
     },
+    "conflict": {
+        "twig/twig": "3.9.0",
+        "twig/intl-extra": "3.9.0"
+    },
     "config": {
         "allow-plugins": {
             "symfony/flex": true

diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json
@@ -44,7 +44,7 @@
         "laminas/laminas-stdlib": "^3.3.1"
     },
     "conflict": {
-        "twig/twig": "^1.0"
+        "twig/twig": "^1.0 || 3.9.0"
     },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.2",