From 577805e94faeb700cbc7479942fac6af194f65e6 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Tue, 24 Feb 2026 10:41:20 -0600 Subject: [PATCH 1/4] INV-804 PHPUnit dependies fix --- .github/workflows/ci.yml | 11 ++++++++++- composer.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ef98d0..e4e3559 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,16 @@ jobs: - name: Install dependencies run: | composer remove --dev phpstan/phpstan - composer require --dev -W "phpunit/phpunit:^9" + # PHPUnit 9 for 8 + if [ "${{ matrix.php-version }}" == "8.0" ]; then composer require --dev -W "phpunit/phpunit:^9"; fi + # PHPUnit 10 for 8.1 + if [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^10"; fi + # PHPUnit 11 for 8.2 + if [ "${{ matrix.php-version }}" == "8.2" ]; then composer require --dev -W "phpunit/phpunit:^11"; fi + # PHPUnit 12 for 8.3 + if [ "${{ matrix.php-version }}" == "8.3" ]; then composer require --dev -W "phpunit/phpunit:^12"; fi + # PHPUnit 13 for 8.4 + if [ "${{ matrix.php-version }}" == "8.4" ]; then composer require --dev -W "phpunit/phpunit:^13"; fi composer install --prefer-dist --no-progress --no-interaction --no-scripts mkdir -p build/logs diff --git a/composer.json b/composer.json index fefe9f2..46b5c37 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "firebase/php-jwt": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.6|^10.0|^11.0|^12.0|^13.0", "yoast/phpunit-polyfills": "^1.0", "phpstan/phpstan": "^1.4" }, From 75c7e548c25da61e01fb6aff3c590773b0cfc63f Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Tue, 24 Feb 2026 10:50:15 -0600 Subject: [PATCH 2/4] fix --- .github/workflows/ci.yml | 8 ++++---- composer.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e4e3559..c9afe79 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,13 +46,13 @@ jobs: run: | composer remove --dev phpstan/phpstan # PHPUnit 9 for 8 - if [ "${{ matrix.php-version }}" == "8.0" ]; then composer require --dev -W "phpunit/phpunit:^9"; fi + if [ "${{ matrix.php-version }}" == "8.0" ]; then composer require --dev -W "phpunit/phpunit:^9.6.34"; fi # PHPUnit 10 for 8.1 - if [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^10"; fi + if [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^10.5.64"; fi # PHPUnit 11 for 8.2 - if [ "${{ matrix.php-version }}" == "8.2" ]; then composer require --dev -W "phpunit/phpunit:^11"; fi + if [ "${{ matrix.php-version }}" == "8.2" ]; then composer require --dev -W "phpunit/phpunit:^11.5.55"; fi # PHPUnit 12 for 8.3 - if [ "${{ matrix.php-version }}" == "8.3" ]; then composer require --dev -W "phpunit/phpunit:^12"; fi + if [ "${{ matrix.php-version }}" == "8.3" ]; then composer require --dev -W "phpunit/phpunit:^12.5.14"; fi # PHPUnit 13 for 8.4 if [ "${{ matrix.php-version }}" == "8.4" ]; then composer require --dev -W "phpunit/phpunit:^13"; fi composer install --prefer-dist --no-progress --no-interaction --no-scripts diff --git a/composer.json b/composer.json index 46b5c37..7ed27cc 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "firebase/php-jwt": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.6|^10.0|^11.0|^12.0|^13.0", + "phpunit/phpunit": "^9.6.34|^10.5.64|^11.5.55|^12.5.14|^13.0", "yoast/phpunit-polyfills": "^1.0", "phpstan/phpstan": "^1.4" }, From 7e9b622a7a80bfd63fd672689d4fe2e6c773265b Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Tue, 24 Feb 2026 10:55:09 -0600 Subject: [PATCH 3/4] fix --- .github/workflows/ci.yml | 4 ---- composer.json | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9afe79..3f40cb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,6 @@ jobs: - '8.1' - '8.2' - '8.3' - - '8.4' - - '8.5' steps: - uses: actions/checkout@v2 @@ -53,8 +51,6 @@ jobs: if [ "${{ matrix.php-version }}" == "8.2" ]; then composer require --dev -W "phpunit/phpunit:^11.5.55"; fi # PHPUnit 12 for 8.3 if [ "${{ matrix.php-version }}" == "8.3" ]; then composer require --dev -W "phpunit/phpunit:^12.5.14"; fi - # PHPUnit 13 for 8.4 - if [ "${{ matrix.php-version }}" == "8.4" ]; then composer require --dev -W "phpunit/phpunit:^13"; fi composer install --prefer-dist --no-progress --no-interaction --no-scripts mkdir -p build/logs diff --git a/composer.json b/composer.json index 7ed27cc..df5fe4f 100644 --- a/composer.json +++ b/composer.json @@ -32,8 +32,8 @@ "firebase/php-jwt": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.6.34|^10.5.64|^11.5.55|^12.5.14|^13.0", - "yoast/phpunit-polyfills": "^1.0", + "phpunit/phpunit": "^9.6.34|^10.5.64|^11.5.55|^12.5.14", + "yoast/phpunit-polyfills": "^4.0", "phpstan/phpstan": "^1.4" }, "autoload": { From d464744f6104a4c5f4a5b984971099b29b59a201 Mon Sep 17 00:00:00 2001 From: Andriy Kutsynyak Date: Tue, 24 Feb 2026 10:58:57 -0600 Subject: [PATCH 4/4] fix --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f40cb9..7a81e19 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,6 +16,8 @@ jobs: - '8.1' - '8.2' - '8.3' + - '8.4' + - '8.5' steps: - uses: actions/checkout@v2 @@ -43,14 +45,12 @@ jobs: - name: Install dependencies run: | composer remove --dev phpstan/phpstan - # PHPUnit 9 for 8 - if [ "${{ matrix.php-version }}" == "8.0" ]; then composer require --dev -W "phpunit/phpunit:^9.6.34"; fi - # PHPUnit 10 for 8.1 - if [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^10.5.64"; fi + # PHPUnit 9 for 8.0 and 8.1 + if [ "${{ matrix.php-version }}" == "8.0" ] || [ "${{ matrix.php-version }}" == "8.1" ]; then composer require --dev -W "phpunit/phpunit:^9.6.34"; fi # PHPUnit 11 for 8.2 if [ "${{ matrix.php-version }}" == "8.2" ]; then composer require --dev -W "phpunit/phpunit:^11.5.55"; fi - # PHPUnit 12 for 8.3 - if [ "${{ matrix.php-version }}" == "8.3" ]; then composer require --dev -W "phpunit/phpunit:^12.5.14"; fi + # PHPUnit 12 for 8.3 8.4 and 8.5 + if [ "${{ matrix.php-version }}" == "8.3" ] || [ "${{ matrix.php-version }}" == "8.4" ] || [ "${{ matrix.php-version }}" == "8.5" ]; then composer require --dev -W "phpunit/phpunit:^12.5.14"; fi composer install --prefer-dist --no-progress --no-interaction --no-scripts mkdir -p build/logs