diff --git a/.github/workflows/ci_e2e-mariadb.yaml b/.github/workflows/ci_e2e-mariadb.yaml index 3eaaa4dd74..ce5d6e06df 100644 --- 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.0 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 index 1ac0bf61f7..3a71d0a82a 100644 --- 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.0 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 index 0313769fe0..90560ca246 100644 --- 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,8 +90,7 @@ "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" ], @@ -103,39 +98,13 @@ "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 index 0c613c634c..7c99f86896 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -3,11 +3,6 @@ This document explains why certain conflicts were added to `composer.json` and references related issues. -- `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 index c53335f3c2..fd045d6b76 100644 --- 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/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", @@ -178,7 +178,6 @@ "sylius/user-bundle": "self.version" }, "conflict": { - "doctrine/migrations": "3.5.3", "lexik/jwt-authentication-bundle": "^2.18", "symfony/framework-bundle": "6.2.8" }, diff --git a/src/Sylius/Bundle/ApiBundle/composer.json b/src/Sylius/Bundle/ApiBundle/composer.json index 68ddf5263d..3b5e5b6a49 100644 --- a/src/Sylius/Bundle/ApiBundle/composer.json +++ b/src/Sylius/Bundle/ApiBundle/composer.json @@ -24,7 +24,7 @@ ], "require": { "php": "^8.0", - "doctrine/dbal": "^2.7 || ^3.0", + "doctrine/dbal": "^3.0", "api-platform/core": "^2.7.10", "enshrined/svg-sanitize": "^0.16", "lexik/jwt-authentication-bundle": "^2.11",