From 6d9189f3f5daed168d03d0916508d355231db88c Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 15 Oct 2024 15:04:30 +0100 Subject: [PATCH] feat: php 8.4 support --- .github/workflows/tests.yml | 8 +------- composer.json | 4 ++-- phpstan.neon | 9 --------- src/Factories/TestCaseFactory.php | 2 +- src/KernelDump.php | 2 +- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 808251c2..c4902b42 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,12 +37,7 @@ jobs: - name: Install PHP dependencies shell: bash - run: | - if [[ "${{ matrix.php }}" == "8.4" ]]; then - composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}" --ignore-platform-req=php - else - composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}" - fi + run: composer update --${{ matrix.dependency_version }} --no-interaction --no-progress --ansi --with="symfony/console:^${{ matrix.symfony }}" - name: Unit Tests run: composer test:unit @@ -51,5 +46,4 @@ jobs: run: composer test:parallel - name: Integration Tests - if: ${{ matrix.php != '8.4' }} run: composer test:integration diff --git a/composer.json b/composer.json index 2462d799..501df943 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ ], "require": { "php": "^8.2.0", - "brianium/paratest": "^7.5.7", + "brianium/paratest": "^7.6.0", "nunomaduro/collision": "^8.4.0", "nunomaduro/termwind": "^2.1.0", "pestphp/pest-plugin": "^3.0.0", @@ -52,7 +52,7 @@ ] }, "require-dev": { - "pestphp/pest-dev-tools": "^3.2.0", + "pestphp/pest-dev-tools": "^3.3.0", "pestphp/pest-plugin-type-coverage": "^3.1.0", "symfony/process": "^7.1.5" }, diff --git a/phpstan.neon b/phpstan.neon index 1cd3a087..9ed48871 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,6 +1,5 @@ includes: - vendor/phpstan/phpstan-strict-rules/rules.neon - - vendor/ergebnis/phpstan-rules/rules.neon - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon parameters: @@ -12,12 +11,4 @@ parameters: reportUnmatchedIgnoredErrors: true ignoreErrors: - - "#has a nullable return type declaration.#" - - "#Language construct isset\\(\\) should not be used.#" - - "#is not allowed to extend#" - - "#is concrete, but does not have a Test suffix#" - - "#with a nullable type declaration#" - "#type mixed is not subtype of native#" - - "# with null as default value#" - - "#has parameter \\$closure with default value.#" - - "#has parameter \\$description with default value.#" diff --git a/src/Factories/TestCaseFactory.php b/src/Factories/TestCaseFactory.php index 19a3469a..0d2a0978 100644 --- a/src/Factories/TestCaseFactory.php +++ b/src/Factories/TestCaseFactory.php @@ -166,7 +166,7 @@ final class $className extends $baseClass implements $hasPrintableTestCaseClassF } PHP; - eval($classCode); // @phpstan-ignore-line + eval($classCode); } catch (ParseError $caught) { throw new RuntimeException(sprintf( "Unable to create test case for test file at %s. \n %s", diff --git a/src/KernelDump.php b/src/KernelDump.php index 150e44ae..e1c67da5 100644 --- a/src/KernelDump.php +++ b/src/KernelDump.php @@ -40,7 +40,7 @@ public function enable(): void */ public function disable(): void { - @ob_clean(); // @phpstan-ignore-line + @ob_clean(); if ($this->buffer !== '') { $this->flush();