From a08e0092cdddfc8ead1953cf5bddf80b48595109 Mon Sep 17 00:00:00 2001 From: Edward Surov Date: Thu, 12 Jan 2023 16:27:20 +0200 Subject: [PATCH] update pipeline and analysis tools (fixes #85, via #90) --- .github/workflows/build.yml | 9 +++++---- composer.json | 6 +++--- src/Internal/TestLifecycle.php | 1 + test/report/Generate/RetriesTest.php | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7916a1c..a4c540c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,7 @@ jobs: php-version: - "8.0" - "8.1" + - "8.2" os: - ubuntu-latest - windows-latest @@ -48,19 +49,19 @@ jobs: ${{ matrix.composer-options }} - name: Run tests - if: ${{ matrix.os != 'windows-latest' && matrix.php-version != '8.1' }} + if: ${{ matrix.os != 'windows-latest' && matrix.php-version != '8.2' }} run: composer test - name: Run tests (windows) - if: ${{ matrix.os == 'windows-latest' && matrix.php-version != '8.1' }} + if: ${{ matrix.os == 'windows-latest' && matrix.php-version != '8.2' }} run: composer test-windows - name: Run tests (experimental) - if: ${{ matrix.os != 'windows-latest' && matrix.php-version == '8.1' }} + if: ${{ matrix.os != 'windows-latest' && matrix.php-version == '8.2' }} continue-on-error: true run: composer test - name: Run tests (windows, experimental) - if: ${{ matrix.os == 'windows-latest' && matrix.php-version == '8.1' }} + if: ${{ matrix.os == 'windows-latest' && matrix.php-version == '8.2' }} continue-on-error: true run: composer test-windows diff --git a/composer.json b/composer.json index d96cc0e..61bd148 100644 --- a/composer.json +++ b/composer.json @@ -34,10 +34,10 @@ "phpunit/phpunit": "^9" }, "require-dev": { - "brianium/paratest": "^6.4.1", + "brianium/paratest": "^6.8", "psalm/plugin-phpunit": "^0.18.4", - "squizlabs/php_codesniffer": "^3.6.2", - "vimeo/psalm": "^4.16.1" + "squizlabs/php_codesniffer": "^3.7.1", + "vimeo/psalm": "^5.4" }, "conflict": { "amphp/byte-stream": "<1.5.1" diff --git a/src/Internal/TestLifecycle.php b/src/Internal/TestLifecycle.php index 9dc060f..e4dcdca 100644 --- a/src/Internal/TestLifecycle.php +++ b/src/Internal/TestLifecycle.php @@ -180,6 +180,7 @@ private function buildTestInfo(string $test, ?string $host = null, ?string $thre $dataLabel = null; } + /** @psalm-suppress PossiblyUndefinedArrayOffset */ [$class, $method] = isset($classAndMethod) ? array_pad(explode('::', $classAndMethod, 2), 2, null) : [null, null]; diff --git a/test/report/Generate/RetriesTest.php b/test/report/Generate/RetriesTest.php index 2a39b84..dfb686c 100644 --- a/test/report/Generate/RetriesTest.php +++ b/test/report/Generate/RetriesTest.php @@ -71,9 +71,9 @@ public function testRerunsOfTestWithIndexedDataProvider(string $firstValue, stri Allure::parameter('Run index', (string) $this->getRunIndex(__METHOD__), true); $this->expectNotToPerformAssertions(); } - + /** - * @return iterable + * @return iterable */ public function providerIndexedData(): iterable {