From 9c0e2881d9f6c57cdda185abb747c54c96df24c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Thu, 11 Dec 2025 13:16:57 +0100 Subject: [PATCH 1/4] Allow Doctrine ORM v3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From f6005c851b2bf68e608e962af2baede7b945e9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edi=20Modri=C4=87?= Date: Sun, 4 Jan 2026 15:04:45 +0100 Subject: [PATCH 2/4] Update GitHub actions to test Doctrine v2 and v3 --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c3e0d67f11..b0f84055f7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -40,18 +40,22 @@ jobs: strategy: fail-fast: false matrix: + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' php: - '8.3' steps: - uses: actions/checkout@v5 - - uses: ibexa/gh-workflows/actions/composer-install@main + - uses: ibexa/gh-workflows/actions/composer-install@allow-custom-composer-options with: gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }} 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" From b5414d378bbb9c9d6eefaa55bbd01ad3d9d98659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= Date: Fri, 27 Feb 2026 11:22:01 +0100 Subject: [PATCH 3/4] Update .github/workflows/ci.yaml --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b0f84055f7..06351667ad 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,7 +49,7 @@ jobs: steps: - uses: actions/checkout@v5 - - uses: ibexa/gh-workflows/actions/composer-install@allow-custom-composer-options + - uses: ibexa/gh-workflows/actions/composer-install@main with: gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }} gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }} From 26a0691e09c711dd7c7a8c5eb2a93eab0854923e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Niedzielski?= Date: Thu, 5 Mar 2026 09:26:55 +0100 Subject: [PATCH 4/4] Added matrix configuration for Doctrine ORM versions in CI workflows --- .github/workflows/ci.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06351667ad..25b5b68fdb 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -97,6 +97,9 @@ jobs: image: - 'postgres:14' - 'postgres:18' + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' steps: - uses: actions/checkout@v5 @@ -107,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" @@ -148,6 +152,9 @@ jobs: image: - 'mysql:8.0' - 'mysql:8.4' + orm: + - 'doctrine/orm:^2.7' + - 'doctrine/orm:^3' steps: - uses: actions/checkout@v5 @@ -158,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"