Merge branch '2.0' into bootstrap-admin-panel

* 2.0: Add conflicts Add twig/intl-extra conflict Add conflicts in bundles Add twig 3.9.0 conflict
mpysiak · Apr 17, 2024 · 4ef7dda · 4ef7dda
2 parents ceb9294 + 7ea0d7d
commit 4ef7dda
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 6 deletions.
diff --git a/CONFLICTS.md b/CONFLICTS.md
@@ -33,3 +33,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
@@ -194,7 +194,9 @@
         "api-platform/core": "2.7.17",
         "doctrine/orm": ">= 2.16.0",
         "lexik/jwt-authentication-bundle": "^2.18",
-        "stof/doctrine-extensions-bundle": "1.8.0"
+        "stof/doctrine-extensions-bundle": "1.8.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
@@ -53,6 +53,10 @@
         "symfony/dependency-injection": "^6.4.1",
         "symfony/dotenv": "^6.4.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
@@ -33,7 +33,8 @@
         "symfony/templating": "^6.4.0"
     },
     "conflict": {
-        "doctrine/orm": ">= 2.16.0"
+        "doctrine/orm": ">= 2.16.0",
+        "twig/twig": "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
@@ -34,7 +34,8 @@
         "symfony/validator": "^6.4.0"
     },
     "conflict": {
-        "doctrine/orm": ">= 2.16.0"
+        "doctrine/orm": ">= 2.16.0",
+        "twig/twig": "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,8 @@
         "symfony/templating": "^6.4.0"
     },
     "conflict": {
-        "doctrine/orm": ">= 2.16.0"
+        "doctrine/orm": ">= 2.16.0",
+        "twig/twig": "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
@@ -33,7 +33,8 @@
         "webmozart/assert": "^1.9"
     },
     "conflict": {
-        "doctrine/orm": ">= 2.16.0"
+        "doctrine/orm": ">= 2.16.0",
+        "twig/twig": "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": "^9.5",
         "symfony/dependency-injection": "^6.4.1"
     },
+    "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
@@ -45,6 +45,9 @@
         "symfony/webpack-encore-bundle": "^1.17.1",
         "laminas/laminas-stdlib": "^3.3.1"
     },
+    "conflict": {
+        "twig/twig": "3.9.0"
+    },
     "require-dev": {
         "matthiasnoback/symfony-config-test": "^4.2",
         "matthiasnoback/symfony-dependency-injection-test": "^4.2",