Skip to content

Commit

Permalink
update pipeline and analysis tools (fixes #85, via #90)
Browse files Browse the repository at this point in the history
  • Loading branch information
remorhaz authored Jan 12, 2023
1 parent f8fe2a6 commit a08e009
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 9 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
php-version:
- "8.0"
- "8.1"
- "8.2"
os:
- ubuntu-latest
- windows-latest
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/Internal/TestLifecycle.php
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions test/report/Generate/RetriesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ public function testRerunsOfTestWithIndexedDataProvider(string $firstValue, stri
Allure::parameter('Run index', (string) $this->getRunIndex(__METHOD__), true);
$this->expectNotToPerformAssertions();
}

/**
* @return iterable<array{string, string}>
* @return iterable<int, array{string, string}>
*/
public function providerIndexedData(): iterable
{
Expand Down

0 comments on commit a08e009

Please sign in to comment.