From 8d4dd01be013aab84ae627d6fed9d29fc7a499fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Wed, 17 Apr 2024 07:45:57 +0200 Subject: [PATCH 1/4] Add twig 3.9.0 conflict --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 48fab3f133a..392a944208a 100644 --- a/composer.json +++ b/composer.json @@ -189,7 +189,8 @@ "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" }, "require-dev": { "behat/behat": "^3.6.1", From f4335fd6e01f3b4a4913b82aae23e52b5afc11e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Wed, 17 Apr 2024 08:06:03 +0200 Subject: [PATCH 2/4] Add conflicts in bundles --- src/Sylius/Bundle/AdminBundle/composer.json | 3 +++ src/Sylius/Bundle/ChannelBundle/composer.json | 3 ++- src/Sylius/Bundle/CurrencyBundle/composer.json | 2 +- src/Sylius/Bundle/InventoryBundle/composer.json | 2 +- src/Sylius/Bundle/LocaleBundle/composer.json | 2 +- src/Sylius/Bundle/MoneyBundle/composer.json | 2 +- src/Sylius/Bundle/ShopBundle/composer.json | 3 +++ src/Sylius/Bundle/UiBundle/composer.json | 2 +- 8 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 1eb35a1491c..d7705dc2857 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -47,6 +47,9 @@ "symfony/dotenv": "^5.4 || ^6.0", "php-http/message-factory": "^1.0" }, + "conflict": { + "twig/twig": "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 index 423b28b7bc1..05c6514cf8d 100644 --- 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 index 053a6925fc8..397a2816a32 100644 --- 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 index c9e0677fa20..877667d269f 100644 --- 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 index ad35276fd67..742eb0fc886 100644 --- 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 index baa3aa6fdc6..c88c69bd509 100644 --- 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 index 9dd68e9877e..25fd6a0860b 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -43,6 +43,9 @@ "phpunit/phpunit": "^8.5", "symfony/dependency-injection": "^5.4 || ^6.0" }, + "conflict": { + "twig/twig": "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 index 6fcc8c75118..e317e5b3537 100644 --- 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", From 0c6f8558170336d84062dbc52fe7d51c84a509df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Wed, 17 Apr 2024 08:36:15 +0200 Subject: [PATCH 3/4] Add twig/intl-extra conflict --- composer.json | 3 ++- src/Sylius/Bundle/AdminBundle/composer.json | 3 ++- src/Sylius/Bundle/ShopBundle/composer.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 392a944208a..08351568684 100644 --- a/composer.json +++ b/composer.json @@ -190,7 +190,8 @@ "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", - "twig/twig": "3.9.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 index d7705dc2857..77084b96691 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -48,7 +48,8 @@ "php-http/message-factory": "^1.0" }, "conflict": { - "twig/twig": "3.9.0" + "twig/twig": "3.9.0", + "twig/intl-extra": "3.9.0" }, "config": { "allow-plugins": { diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index 25fd6a0860b..543b4004d5d 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -44,7 +44,8 @@ "symfony/dependency-injection": "^5.4 || ^6.0" }, "conflict": { - "twig/twig": "3.9.0" + "twig/twig": "3.9.0", + "twig/intl-extra": "3.9.0" }, "config": { "allow-plugins": { From a5afa245a389ab5750e03f8e725d2e8cf1bd3cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Pysiak?= Date: Wed, 17 Apr 2024 09:47:46 +0200 Subject: [PATCH 4/4] Add conflicts --- CONFLICTS.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CONFLICTS.md b/CONFLICTS.md index ab11173e246..6dea846f80f 100644 --- 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()").`