From 247ed64cfd0e21da6f59b115bc216974e41c0596 Mon Sep 17 00:00:00 2001 From: Alex Cicovic <23142906+acicovic@users.noreply.github.com> Date: Wed, 7 Jan 2026 11:50:42 +0200 Subject: [PATCH 1/4] Fix integration tests on PHP 8.2 --- .github/workflows/integration-tests.yml | 4 +--- composer.json | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3e2d77298d..3184986126 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -68,9 +68,7 @@ jobs: - name: Install Composer dependencies for PHP >= 8.2 if: ${{ matrix.php >= 8.2 }} - uses: ramsey/composer-install@v3 - with: - composer-options: --ignore-platform-reqs + run: composer update --ignore-platform-reqs --no-interaction - name: Install Subversion run: | diff --git a/composer.json b/composer.json index f2bcbc30bb..9235d8055f 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,8 @@ "rector/rector": "^1.0.0", "szepeviktor/phpstan-wordpress": "^1.0", "tomasvotruba/type-coverage": "^1.0.0", - "yoast/wp-test-utils": "^1" + "yoast/wp-test-utils": "^1", + "doctrine/instantiator": "^1.5 || ^2.0" }, "config": { "allow-plugins": { From ecfeb819a9e182997e33dc804cb3e0c777383ae9 Mon Sep 17 00:00:00 2001 From: Alex Cicovic <23142906+acicovic@users.noreply.github.com> Date: Wed, 7 Jan 2026 12:02:03 +0200 Subject: [PATCH 2/4] Fix integration tests on PHP 8.2 - Attempt 2 --- .github/workflows/integration-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3184986126..c3e7ef9e17 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -68,7 +68,9 @@ jobs: - name: Install Composer dependencies for PHP >= 8.2 if: ${{ matrix.php >= 8.2 }} - run: composer update --ignore-platform-reqs --no-interaction + run: | + composer install --no-interaction + composer update doctrine/instantiator --with-dependencies --ignore-platform-reqs --no-interaction - name: Install Subversion run: | From 12920604496d4db54717e169eee12855f6926b45 Mon Sep 17 00:00:00 2001 From: Alex Cicovic <23142906+acicovic@users.noreply.github.com> Date: Wed, 7 Jan 2026 12:12:11 +0200 Subject: [PATCH 3/4] Fix integration tests on PHP 8.2 - Attempt 3 --- .github/workflows/integration-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index c3e7ef9e17..d3597ffa00 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -68,9 +68,7 @@ jobs: - name: Install Composer dependencies for PHP >= 8.2 if: ${{ matrix.php >= 8.2 }} - run: | - composer install --no-interaction - composer update doctrine/instantiator --with-dependencies --ignore-platform-reqs --no-interaction + run: composer install --no-interaction - name: Install Subversion run: | From f382b4888ea533c90c2dbd13860f4ccf2ddc3a05 Mon Sep 17 00:00:00 2001 From: Alex Cicovic <23142906+acicovic@users.noreply.github.com> Date: Wed, 7 Jan 2026 12:16:49 +0200 Subject: [PATCH 4/4] Fix integration tests on PHP 8.2 - Simplify code --- .github/workflows/integration-tests.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index d3597ffa00..a41be748a6 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -63,13 +63,8 @@ jobs: run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install Composer dependencies - if: ${{ matrix.php < 8.2 }} uses: ramsey/composer-install@v3 - - name: Install Composer dependencies for PHP >= 8.2 - if: ${{ matrix.php >= 8.2 }} - run: composer install --no-interaction - - name: Install Subversion run: | sudo apt-get update