diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c3e0d67f11..25b5b68fdb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,6 +40,9 @@ jobs: strategy: fail-fast: false matrix: + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' php: - '8.3' @@ -52,6 +55,7 @@ jobs: gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} + composer-options: "--with ${{ matrix.orm }}" - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" @@ -93,6 +97,9 @@ jobs: image: - 'postgres:14' - 'postgres:18' + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' steps: - uses: actions/checkout@v5 @@ -103,6 +110,7 @@ jobs: gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} + composer-options: "--with ${{ matrix.orm }}" - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" @@ -144,6 +152,9 @@ jobs: image: - 'mysql:8.0' - 'mysql:8.4' + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' steps: - uses: actions/checkout@v5 @@ -154,6 +165,7 @@ jobs: gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }} satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }} + composer-options: "--with ${{ matrix.orm }}" - name: Setup problem matchers for PHPUnit run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" diff --git a/composer.json b/composer.json index b86a5aa795..16d216a783 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "doctrine/annotations": "^2.0", "doctrine/dbal": "^3.7.0", "doctrine/doctrine-bundle": "^2.11.0", - "doctrine/orm": "^2.7", + "doctrine/orm": "^2.7 || ^3.0", "doctrine/persistence": "^3.0", "friendsofphp/proxy-manager-lts": "^1.0", "friendsofsymfony/http-cache-bundle": "^3.0",