From 03af244f0d68f10d864b8e1c8ca25c393f09cbd1 Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sat, 13 Dec 2025 12:22:26 +0300 Subject: [PATCH 1/6] Added php8.4 and php8.5 in test workflows --- .github/workflows/test.yml | 2 +- .github/workflows/test_macos.yml | 2 +- .github/workflows/test_win.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c363a00..a28125c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - php: [8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.4] name: ${{ matrix.os }} - PHP${{ matrix.php }} diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml index 873a526..2af1502 100644 --- a/.github/workflows/test_macos.yml +++ b/.github/workflows/test_macos.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.4] name: macos-latest - PHP${{ matrix.php }} diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index 8bd4700..e4df30a 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.5, 8.4, 8.3, 8.2, 8.1, 8.0, 7.4] name: windows-latest - PHP${{ matrix.php }} From 8aa279fd2eaa5c71ae21833b521fb3642fcc62c3 Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sun, 14 Dec 2025 10:05:32 +0300 Subject: [PATCH 2/6] Tried updating composer instead of installing in tests --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a28125c..a1da06f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,8 +32,8 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, bcmath, intl coverage: xdebug - - name: Install composer - run: composer install --no-interaction --prefer-dist + - name: Update composer + run: composer update --prefer-stable --no-interaction --prefer-dist - name: Execute tests on Linux with cover if: ${{ matrix.os == 'ubuntu-latest' && matrix.php == '8.3' }} From fec9b7484e9ab02c7f80f1360d0d9f2ce6a89881 Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sun, 14 Dec 2025 10:27:18 +0300 Subject: [PATCH 3/6] Locked phpUnit to 9.6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f384b25..efbaa91 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "php": ">=7.4" }, "require-dev": { - "phpunit/phpunit": ">=9.6", + "phpunit/phpunit": "9.6", "phpstan/phpstan": ">=1.10", "vimeo/psalm": ">=5", "squizlabs/php_codesniffer": "*" From 393a8856679018648f8b1c7c291c797ed13432ec Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sun, 14 Dec 2025 10:48:57 +0300 Subject: [PATCH 4/6] Locked phpUnit to 9.6.* --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index efbaa91..74bf01f 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "php": ">=7.4" }, "require-dev": { - "phpunit/phpunit": "9.6", + "phpunit/phpunit": "9.6.*", "phpstan/phpstan": ">=1.10", "vimeo/psalm": ">=5", "squizlabs/php_codesniffer": "*" From d1c8e813eb4310aae02aea9204426ac20e54107f Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sun, 14 Dec 2025 11:27:18 +0300 Subject: [PATCH 5/6] Made the explicit nullable type argument --- src/DiffCodeMultiRunner.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DiffCodeMultiRunner.php b/src/DiffCodeMultiRunner.php index ee41b63..a4597e6 100644 --- a/src/DiffCodeMultiRunner.php +++ b/src/DiffCodeMultiRunner.php @@ -32,7 +32,7 @@ final class DiffCodeMultiRunner extends MultiRunner public function __construct( int $maxNumberParallelProcesses, ?string $baseFolder = null, - OsCommandsWrapper $osCommandsWrapper = null + ?OsCommandsWrapper $osCommandsWrapper = null ) { parent::__construct($maxNumberParallelProcesses, $osCommandsWrapper); From 01366829e37967a27abff650c21bd5727abab402 Mon Sep 17 00:00:00 2001 From: Mikhail Trusov Date: Sun, 14 Dec 2025 11:38:57 +0300 Subject: [PATCH 6/6] Edited test workflows --- .github/workflows/test.yml | 2 +- .github/workflows/test_macos.yml | 4 ++-- .github/workflows/test_ubuntu.yml | 4 ++-- .github/workflows/test_win.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1da06f..23d2b2c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -2,7 +2,7 @@ name: Tests Execution on: workflow_dispatch: pull_request: - types: [opened, reopened] + types: [opened, reopened, synchronize] paths-ignore: - '**.md' - 'docs/**' diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml index 2af1502..40a304f 100644 --- a/.github/workflows/test_macos.yml +++ b/.github/workflows/test_macos.yml @@ -26,8 +26,8 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, bcmath, intl coverage: none - - name: Install composer - run: composer install --no-interaction --prefer-dist + - name: Update composer + run: composer update --prefer-stable --no-interaction --prefer-dist - name: Execute tests on MacOs run: sudo vendor/bin/phpunit --exclude MacOsFailures --testdox diff --git a/.github/workflows/test_ubuntu.yml b/.github/workflows/test_ubuntu.yml index 244902f..850462a 100644 --- a/.github/workflows/test_ubuntu.yml +++ b/.github/workflows/test_ubuntu.yml @@ -26,8 +26,8 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, bcmath, intl coverage: none - - name: Install composer - run: composer install --no-interaction --prefer-dist + - name: Update composer + run: composer update --prefer-stable --no-interaction --prefer-dist - name: Execute tests on Linux run: sudo vendor/bin/phpunit --testdox diff --git a/.github/workflows/test_win.yml b/.github/workflows/test_win.yml index e4df30a..db93179 100644 --- a/.github/workflows/test_win.yml +++ b/.github/workflows/test_win.yml @@ -26,7 +26,7 @@ jobs: extensions: dom, curl, libxml, mbstring, zip, bcmath, intl coverage: none - - name: Install composer + - name: Update composer run: composer install --no-interaction --prefer-dist - name: Execute tests on Windows