From d049c0db99003772cec1d6f39613b8e2c7c52d7c Mon Sep 17 00:00:00 2001 From: Alexej Leinweber Date: Tue, 13 Jan 2026 10:14:46 +0100 Subject: [PATCH 1/3] fix: Allow symfony console 8.0, require php 8.3 --- .github/workflows/build.yml | 1 - .github/workflows/code_coverage.yaml | 6 +++--- composer.json | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b861357..684e4bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,6 @@ jobs: matrix: dependencies: ["lowest", "highest"] php-version: - - "8.2" - "8.3" steps: diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml index 47e0790..c5571de 100644 --- a/.github/workflows/code_coverage.yaml +++ b/.github/workflows/code_coverage.yaml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: shivammathur/setup-php@master with: - php-version: 8.2 + php-version: 8.3 coverage: xdebug - name: Load dependencies from cache id: composer-cache @@ -23,9 +23,9 @@ jobs: - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-php8.2-composer-${{ hashFiles('**/composer.json') }} + key: ${{ runner.os }}-php8.3-composer-${{ hashFiles('**/composer.json') }} restore-keys: | - ${{ runner.os }}-php8.2-composer- + ${{ runner.os }}-php8.3-composer- - run: composer install --prefer-dist --no-progress --no-suggest - run: php vendor/bin/phpunit --coverage-clover build/logs/clover.xml diff --git a/composer.json b/composer.json index 758e6e2..23a6093 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,8 @@ } }, "require": { - "php": "^8.2", - "symfony/console": "^6.0|^7.0", + "php": "^8.3", + "symfony/console": "^7.4|^8.0", "doctrine/dbal": "^3.1|^4.0" }, "require-dev": { From 7b1500b66dc7ef6d87cfea06cbc76a577e7d7901 Mon Sep 17 00:00:00 2001 From: Alexej Leinweber Date: Tue, 13 Jan 2026 10:24:42 +0100 Subject: [PATCH 2/3] fix: Fix phpstan issues --- tests/Command/WaitForDatabaseCommandTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Command/WaitForDatabaseCommandTest.php b/tests/Command/WaitForDatabaseCommandTest.php index 5305538..b76fedb 100644 --- a/tests/Command/WaitForDatabaseCommandTest.php +++ b/tests/Command/WaitForDatabaseCommandTest.php @@ -69,7 +69,7 @@ public function testDatabaseAvailableAfterRetry(): void $this->assertSame(0, $result); preg_match_all('/Connection failed/', $tester->getDisplay(), $match); - $this->assertCount(1, $match[0] ?? []); + $this->assertCount(1, $match[0]); } public function testDatabaseFailAfterRetry(): void @@ -97,6 +97,6 @@ public function testDatabaseFailAfterRetry(): void $this->assertSame(200, $result); preg_match_all('/Connection failed/', $tester->getDisplay(), $match); - $this->assertCount(4, $match[0] ?? []); + $this->assertCount(4, $match[0]); } } From 56cd2771e4a9159c50f082e62980b474adb30e07 Mon Sep 17 00:00:00 2001 From: Alexej Leinweber Date: Tue, 13 Jan 2026 13:42:48 +0100 Subject: [PATCH 3/3] chore: Bump dev deps, test for php 8.4 and 8.5 --- .github/workflows/build.yml | 2 ++ .github/workflows/code_coverage.yaml | 6 +++--- composer.json | 8 ++++---- tests/Command/WaitForDatabaseCommandTest.php | 1 + 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 684e4bf..ac9818d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,8 @@ jobs: dependencies: ["lowest", "highest"] php-version: - "8.3" + - "8.4" + - "8.5" steps: - name: "Checkout" diff --git a/.github/workflows/code_coverage.yaml b/.github/workflows/code_coverage.yaml index c5571de..4316232 100644 --- a/.github/workflows/code_coverage.yaml +++ b/.github/workflows/code_coverage.yaml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v4 - uses: shivammathur/setup-php@master with: - php-version: 8.3 + php-version: 8.4 coverage: xdebug - name: Load dependencies from cache id: composer-cache @@ -23,9 +23,9 @@ jobs: - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-php8.3-composer-${{ hashFiles('**/composer.json') }} + key: ${{ runner.os }}-php8.4-composer-${{ hashFiles('**/composer.json') }} restore-keys: | - ${{ runner.os }}-php8.3-composer- + ${{ runner.os }}-php8.4-composer- - run: composer install --prefer-dist --no-progress --no-suggest - run: php vendor/bin/phpunit --coverage-clover build/logs/clover.xml diff --git a/composer.json b/composer.json index 23a6093..534108d 100644 --- a/composer.json +++ b/composer.json @@ -20,10 +20,10 @@ }, "require-dev": { "brainbits/phpcs-standard": "^7.0", - "brainbits/phpstan-rules": "^3.0", - "jangregor/phpstan-prophecy": "^1.0", - "phpstan/phpstan": "^1.0", - "phpstan/phpstan-phpunit": "^1.3", + "brainbits/phpstan-rules": "^4.0", + "jangregor/phpstan-prophecy": "^2.2", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", "phpunit/phpunit": "^10.2" }, "config": { diff --git a/tests/Command/WaitForDatabaseCommandTest.php b/tests/Command/WaitForDatabaseCommandTest.php index b76fedb..c1d7991 100644 --- a/tests/Command/WaitForDatabaseCommandTest.php +++ b/tests/Command/WaitForDatabaseCommandTest.php @@ -23,6 +23,7 @@ public function testConstruction(): void $connection = $this->createMock(Connection::class); $command = new WaitForDatabaseCommand($connection); + /** @phpstan-ignore method.alreadyNarrowedType */ $this->assertInstanceOf(Command::class, $command); }