minor #14964 Clean up conflicts for sylius/sylius (jakubtobiasz)

This PR was merged into the 1.13 branch. Discussion ---------- | Q | A | |-----------------|--------------------------------------------------------------| | Branch? | 1.13 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT As we usually bump dependencies version in minor versions of Sylius, I've prepared a cleanup of conflicts for the `sylius/sylius` package. Also, we should do the same for every package (as some packages have conflict for `twig/twig:^1.0` when it cannot be installed). Commits ------- d7f2080 Clean up conflicts for sylius/sylius 5118850 Drop support for DBAL 2.7
Sylius · Apr 27, 2023 · 0b65067 · 0b65067
2 parents ecb820b + 5118850
commit 0b65067
Show file tree

Hide file tree

Showing 36 changed files with 181 additions and 259 deletions.
diff --git a/.github/workflows/ci_e2e-mariadb.yaml b/.github/workflows/ci_e2e-mariadb.yaml
@@ -41,7 +41,7 @@ jobs:
     behat-no-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MariaDB ${{ matrix.mariadb }}, DBAL ${{ matrix.dbal }}"
+        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MariaDB ${{ matrix.mariadb }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
@@ -62,10 +62,6 @@ jobs:
                 if: "${{ inputs.branch == '' }}"
                 uses: actions/checkout@v3
 
-            -   name: Restrict packages
-                if: matrix.dbal == '^2.7'
-                run: composer require --no-update --no-scripts --no-interaction "doctrine/dbal:${{ matrix.dbal }}"
-
             -   name: Build application
                 uses: SyliusLabs/BuildTestAppAction@v2.1
                 with:
@@ -91,7 +87,7 @@ jobs:
                 uses: actions/upload-artifact@v3
                 if: failure()
                 with:
-                    name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MariaDB ${{ matrix.mariadb }}), DBAL ${{ matrix.dbal }}"
+                    name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MariaDB ${{ matrix.mariadb }})"
                     path: |
                         etc/build/
                         var/log

diff --git a/.github/workflows/ci_e2e-mysql.yaml b/.github/workflows/ci_e2e-mysql.yaml
@@ -41,7 +41,7 @@ jobs:
     behat-no-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, DBAL ${{ matrix.dbal }}.x, API Platform ${{ matrix.api-platform }}"
+        name: "Non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
@@ -66,10 +66,6 @@ jobs:
                 if: matrix.twig == '^2.12'
                 run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
 
-            -   name: Restrict DBAL
-                if: matrix.dbal == '^2.7'
-                run: composer require --no-update --no-scripts --no-interaction "doctrine/dbal:${{ matrix.dbal }}"
-
             -   name: Build application
                 uses: SyliusLabs/BuildTestAppAction@v2.1
                 with:
@@ -97,7 +93,7 @@ jobs:
                 uses: actions/upload-artifact@v3
                 if: failure()
                 with:
-                    name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}), ApiPlatform ${{ matrix.api-platform }}, Twig ${{ matrix.twig }}, MySQL ${{ matrix.mysql }}, DBAL ${{ matrix.dbal }}"
+                    name: "Logs (non-JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}), ApiPlatform ${{ matrix.api-platform }}, Twig ${{ matrix.twig }}, MySQL ${{ matrix.mysql }}"
                     path: |
                         etc/build/
                         var/log
@@ -106,7 +102,7 @@ jobs:
     behat-ui-js:
         needs: get-matrix
         runs-on: ubuntu-latest
-        name: "JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, DBAL ${{ matrix.dbal }}, API Platform ${{ matrix.api-platform }}"
+        name: "JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, MySQL ${{ matrix.mysql }}, Twig ${{ matrix.twig }}, API Platform ${{ matrix.api-platform }}"
         timeout-minutes: 45
         strategy:
             fail-fast: false
@@ -135,10 +131,6 @@ jobs:
                 if: matrix.twig == '^2.12'
                 run: composer require --no-update --no-scripts --no-interaction "twig/twig:${{ matrix.twig }}"
 
-            -   name: Restrict DBAL
-                if: matrix.dbal == '^2.7'
-                run: composer require --no-update --no-scripts --no-interaction "doctrine/dbal:${{ matrix.dbal }}"
-
             -   name: Build application
                 uses: jakubtobiasz/SyliusBuildTestAppAction@v2.0
                 with:
@@ -158,7 +150,7 @@ jobs:
                 uses: actions/upload-artifact@v3
                 if: failure()
                 with:
-                    name: "Logs (JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, ApiPlatform ${{ matrix.api-platform }}, Twig ${{ matrix.twig }}, MySQL ${{ matrix.mysql }}, DBAL ${{ matrix.dbal }})"
+                    name: "Logs (JS, PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}, ApiPlatform ${{ matrix.api-platform }}, Twig ${{ matrix.twig }}, MySQL ${{ matrix.mysql }})"
                     path: |
                         etc/build/
                         var/log

diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
@@ -19,14 +19,12 @@
         {
           "php": "8.0",
           "symfony": "^5.4",
-          "mariadb": "10.4.10",
-          "dbal": "^2.7"
+          "mariadb": "10.4.10"
         },
         {
           "php": "8.2",
           "symfony": "^6.0",
-          "mariadb": "10.4.10",
-          "dbal": "^3.0"
+          "mariadb": "10.4.10"
         }
       ]
     },
@@ -37,16 +35,14 @@
           "symfony": "^5.4",
           "api-platform": "^2.7.10",
           "mysql": "5.7",
-          "twig": "^2.12",
-          "dbal": "^2.7"
+          "twig": "^2.12"
         },
         {
           "php": "8.2",
           "symfony": "^6.0",
           "api-platform": "^2.7.10",
           "mysql": "8.0",
-          "twig": "^3.3",
-          "dbal": "^3.0"
+          "twig": "^3.3"
         }
       ]
     },
@@ -94,48 +90,21 @@
     "e2e-mariadb": {
       "php": [ "8.0", "8.1", "8.2" ],
       "symfony": [ "^5.4", "^6.0" ],
-      "mariadb": [ "10.4.10" ],
-      "dbal": [ "^2.7", "^3.0" ]
+      "mariadb": [ "10.4.10" ]
     },
     "e2e-mysql": {
       "php": [ "8.0", "8.1", "8.2" ],
       "symfony": [ "^5.4", "^6.0" ],
       "api-platform": [ "^2.7.10" ],
       "mysql": [ "5.7", "8.0" ],
       "twig": [ "^3.3" ],
-      "dbal": [ "^3.0" ],
       "include": [
         {
           "php": "8.0",
           "symfony": "^5.4",
           "api-platform": "^2.7.10",
           "mysql": "5.7",
-          "twig": "^2.12",
-          "dbal": "^3.0"
-        },
-        {
-          "php": "8.0",
-          "symfony": "^5.4",
-          "api-platform": "^2.7.10",
-          "mysql": "5.7",
-          "twig": "^2.12",
-          "dbal": "^2.7"
-        },
-        {
-          "php": "8.1",
-          "symfony": "^5.4",
-          "api-platform": "^2.7.10",
-          "mysql": "8.0",
-          "twig": "^3.3",
-          "dbal": "^3.0"
-        },
-        {
-          "php": "8.1",
-          "symfony": "^6.0",
-          "api-platform": "^2.7.10",
-          "mysql": "8.0",
-          "twig": "^3.3",
-          "dbal": "^3.0"
+          "twig": "^2.12"
         }
       ]
     },

diff --git a/CONFLICTS.md b/CONFLICTS.md
@@ -3,36 +3,6 @@
 This document explains why certain conflicts were added to `composer.json` and
 references related issues.
 
- - `doctrine/doctrine-bundle:2.3.0`:
-
-   This version makes Gedmo Doctrine Extensions fail (tree and position behaviour mostly).
-
-   References: https://github.com/doctrine/DoctrineBundle/issues/1305
-
- - `jms/serializer-bundle:4.1.0`:
-
-   This version contains service with a wrong constructor arguments:
-   `Invalid definition for service ".container.private.profiler": argument 4 of "JMS\SerializerBundle\Debug\DataCollector::__construct()" accepts "JMS\SerializerBundle\Debug\TraceableDriver", "JMS\SerializerBundle\Debug\TraceableMetadataFactory" passed.`
-
-   References: https://github.com/schmittjoh/JMSSerializerBundle/issues/902
-
- - `symfony/dependency-injection:5.4.5`:
-
-   This version is causing a problem with mink session:
-  `InvalidArgumentException: Specify session name to get in vendor/friends-of-behat/mink/src/Mink.php:198`,
-   Psalm error: 
-   `UndefinedDocblockClass: Docblock-defined class, interface or enum named UnitEnum does not exist`.
-
- - `symfony/framework-bundle:5.4.5`:
-
-   This version is causing a problem with returning null as token from `Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage`
-   which leads to wrong solving path prefix by `Sylius\Bundle\ApiBundle\Provider\PathPrefixProvider` in API scenarios
-
-- `doctrine/migrations:3.5.3`:
-
-  This version is causing a problem with migrations and results in throwing a `Doctrine\Migrations\Exception\MetadataStorageError` exception e.g. when executing `sylius:install` command.
-  References: https://github.com/doctrine/migrations/issues/1302
-
 - `lexik/jwt-authentication-bundle: ^2.18`
 
   After bumping to this version ApiBundle starts failing due to requesting a non-existing `api_platform.openapi.factory.legacy` service.

diff --git a/composer.json b/composer.json
@@ -34,12 +34,12 @@
         "behat/transliterator": "^1.3",
         "doctrine/collections": "^1.6",
         "doctrine/common": "^3.2",
-        "doctrine/dbal": "^2.7 || ^3.0",
-        "doctrine/doctrine-bundle": "^1.12 || ^2.0",
+        "doctrine/dbal": "^3.0",
+        "doctrine/doctrine-bundle": "^1.12 || ^2.3.1",
         "doctrine/doctrine-migrations-bundle": "^3.0.1",
         "doctrine/event-manager": "^1.1",
         "doctrine/inflector": "^1.4 || ^2.0",
-        "doctrine/migrations": "^3.0",
+        "doctrine/migrations": "^3.5.5",
         "doctrine/orm": "^2.13",
         "doctrine/persistence": "^2.3",
         "egulias/email-validator": "^3.1",
@@ -50,15 +50,15 @@
         "gedmo/doctrine-extensions": "^3.2",
         "guzzlehttp/guzzle": "^6.5",
         "guzzlehttp/psr7": "^1.8",
-        "jms/serializer-bundle": "^4.0",
+        "jms/serializer-bundle": "^4.2",
         "knplabs/gaufrette": "^0.10 || ^0.11",
         "knplabs/knp-gaufrette-bundle": "^0.7 || ^0.8",
         "knplabs/knp-menu": "^3.1",
         "knplabs/knp-menu-bundle": "^3.0",
         "laminas/laminas-stdlib": "^3.3.1",
         "league/flysystem-bundle": "^2.4",
         "lexik/jwt-authentication-bundle": "^2.11",
-        "liip/imagine-bundle": "^2.3",
+        "liip/imagine-bundle": "^2.10",
         "pagerfanta/pagerfanta": "^3.0",
         "payum/payum": "^1.7.2",
         "payum/payum-bundle": "^2.5",
@@ -84,49 +84,49 @@
         "sylius/resource": "^1.9",
         "sylius/resource-bundle": "^1.9",
         "sylius/theme-bundle": "^2.1.1 || ^2.3",
-        "symfony/asset": "^5.4 || ^6.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/console": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
+        "symfony/asset": "^5.4.21 || ^6.0",
+        "symfony/config": "^5.4.21 || ^6.0",
+        "symfony/console": "^5.4.21 || ^6.0",
+        "symfony/dependency-injection": "^5.4.21 || ^6.0",
         "symfony/deprecation-contracts": "^2.5",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0",
-        "symfony/doctrine-messenger": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
-        "symfony/expression-language": "^5.4 || ^6.0",
-        "symfony/filesystem": "^5.4 || ^6.0",
-        "symfony/finder": "^5.4 || ^6.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/mailer": "^5.4 || ^6.0",
-        "symfony/messenger": "^5.4 || ^6.0",
+        "symfony/doctrine-bridge": "^5.4.21 || ^6.0",
+        "symfony/doctrine-messenger": "^5.4.21 || ^6.0",
+        "symfony/event-dispatcher": "^5.4.21 || ^6.0",
+        "symfony/expression-language": "^5.4.21 || ^6.0",
+        "symfony/filesystem": "^5.4.21 || ^6.0",
+        "symfony/finder": "^5.4.21 || ^6.0",
+        "symfony/form": "^5.4.21 || ^6.0",
+        "symfony/framework-bundle": "^5.4.21 || ^6.0",
+        "symfony/http-foundation": "^5.4.21 || ^6.0",
+        "symfony/http-kernel": "^5.4.21 || ^6.0",
+        "symfony/intl": "^5.4.21 || ^6.0",
+        "symfony/mailer": "^5.4.21 || ^6.0",
+        "symfony/messenger": "^5.4.21 || ^6.0",
         "symfony/monolog-bundle": "^3.5",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/password-hasher": "^5.4 || ^6.0",
+        "symfony/options-resolver": "^5.4.21 || ^6.0",
+        "symfony/password-hasher": "^5.4.21 || ^6.0",
         "symfony/polyfill-iconv": "^1.17",
         "symfony/polyfill-intl-icu": "^1.22",
         "symfony/polyfill-mbstring": "^1.17",
         "symfony/polyfill-php80": "^1.17",
-        "symfony/process": "^5.4 || ^6.0",
-        "symfony/property-access": "^5.4 || ^6.0",
-        "symfony/property-info": "^5.4 || ^6.0",
-        "symfony/proxy-manager-bridge": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
-        "symfony/security-bundle": "^5.4 || ^6.0",
-        "symfony/security-core": "^5.4 || ^6.0",
-        "symfony/security-csrf": "^5.4 || ^6.0",
-        "symfony/security-http": "^5.4 || ^6.0",
-        "symfony/serializer": "^5.4 || ^6.0",
-        "symfony/string": "^5.4 || ^6.0",
-        "symfony/templating": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0",
+        "symfony/process": "^5.4.21 || ^6.0",
+        "symfony/property-access": "^5.4.21 || ^6.0",
+        "symfony/property-info": "^5.4.21 || ^6.0",
+        "symfony/proxy-manager-bridge": "^5.4.21 || ^6.0",
+        "symfony/routing": "^5.4.21 || ^6.0",
+        "symfony/security-bundle": "^5.4.21 || ^6.0",
+        "symfony/security-core": "^5.4.21 || ^6.0",
+        "symfony/security-csrf": "^5.4.21 || ^6.0",
+        "symfony/security-http": "^5.4.21 || ^6.0",
+        "symfony/serializer": "^5.4.21 || ^6.0",
+        "symfony/string": "^5.4.21 || ^6.0",
+        "symfony/templating": "^5.4.21 || ^6.0",
+        "symfony/translation": "^5.4.21 || ^6.0",
         "symfony/translation-contracts": "^2.5",
-        "symfony/twig-bundle": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0",
+        "symfony/twig-bundle": "^5.4.21 || ^6.0",
+        "symfony/validator": "^5.4.21 || ^6.0",
         "symfony/webpack-encore-bundle": "^1.15",
-        "symfony/yaml": "^5.4 || ^6.0",
+        "symfony/yaml": "^5.4.21 || ^6.0",
         "twig/intl-extra": "^2.12 || ^3.4",
         "twig/twig": "^2.12 || ^3.3",
         "webmozart/assert": "^1.9",
@@ -178,13 +178,8 @@
         "sylius/user-bundle": "self.version"
     },
     "conflict": {
-        "doctrine/doctrine-bundle": "2.3.0",
-        "doctrine/migrations": "3.5.3",
-        "jms/serializer-bundle": "4.1.0",
         "lexik/jwt-authentication-bundle": "^2.18",
-        "symfony/framework-bundle": "5.4.5 || 6.2.8",
-        "symfony/dependency-injection": "5.4.5",
-        "liip/imagine-bundle": "2.7.0"
+        "symfony/framework-bundle": "6.2.8"
     },
     "require-dev": {
         "behat/behat": "^3.6.1",
@@ -222,12 +217,12 @@
         "rector/rector": "^0.15.13",
         "stripe/stripe-php": "^10.4",
         "sylius-labs/coding-standard": "^4.2",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/debug-bundle": "^5.4 || ^6.0",
-        "symfony/dotenv": "^5.4 || ^6.0",
+        "symfony/browser-kit": "^5.4.21 || ^6.0",
+        "symfony/debug-bundle": "^5.4.21 || ^6.0",
+        "symfony/dotenv": "^5.4.21 || ^6.0",
         "symfony/flex": "^2.2",
-        "symfony/runtime": "^5.4 || ^6.0",
-        "symfony/web-profiler-bundle": "^5.4 || ^6.0",
+        "symfony/runtime": "^5.4.21 || ^6.0",
+        "symfony/web-profiler-bundle": "^5.4.21 || ^6.0",
         "symplify/monorepo-builder": "^11.0",
         "vimeo/psalm": "^4.19"
     },
@@ -252,7 +247,7 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "^5.4 || ^6.0"
+            "require": "5.4.*"
         }
     },
     "autoload": {

diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json
@@ -30,8 +30,8 @@
         "stof/doctrine-extensions-bundle": "^1.4",
         "sylius/addressing": "^1.12",
         "sylius/resource-bundle": "^1.9",
-        "symfony/framework-bundle": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0"
+        "symfony/framework-bundle": "^5.4.21 || ^6.0",
+        "symfony/intl": "^5.4.21 || ^6.0"
     },
     "conflict": {
         "twig/twig": "^1.0 || ^3.0"
@@ -42,10 +42,10 @@
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/validator": "^5.4 || ^6.0"
+        "symfony/browser-kit": "^5.4.21 || ^6.0",
+        "symfony/dependency-injection": "^5.4.21 || ^6.0",
+        "symfony/form": "^5.4.21 || ^6.0",
+        "symfony/validator": "^5.4.21 || ^6.0"
     },
     "config": {
         "allow-plugins": {