Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix #20

Merged
merged 1 commit into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
php: [7.2, 7.4, 8.0, 8.1]
php: [7.2, 7.4, 8.0, 8.1, 8.2]
steps:
- uses: zenstruck/.github@php-test-symfony
with:
Expand Down
9 changes: 9 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@

// temporary fix for union types (ref: https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/5495)
'binary_operator_spaces' => ['operators' => ['|' => null]],
'phpdoc_separation' => ['groups' => [
['test', 'dataProvider'],
['template', 'implements', 'extends'],
['phpstan-type', 'phpstan-import-type'],
['deprecated', 'link', 'see', 'since'],
['author', 'copyright', 'license', 'source'],
['category', 'package', 'subpackage'],
['property', 'property-read', 'property-write'],
]],
])
->setRiskyAllowed(true)
->setFinder($finder)
Expand Down
2 changes: 1 addition & 1 deletion src/Assert/AssertionFailed.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private static function normalizeContextValue($value): string
return '(array:empty)';
}

if (\is_array($value)) { // @phpstan-ignore-line
if (\is_array($value)) {
return array_is_list($value) ? '(array:list)' : '(array:assoc)';
}

Expand Down
2 changes: 0 additions & 2 deletions tests/Assertion/ArraySubsetAssertionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class ArraySubsetAssertionTest extends TestCase
{
/**
* @dataProvider arraySubsetProvider
*
* @test
*
* @param string|iterable $needle
Expand Down Expand Up @@ -73,7 +72,6 @@ public function arraySubsetProvider(): iterable

/**
* @dataProvider arrayNotSubsetProvider
*
* @test
*/
public function it_asserts_not_array_subset(array $needle, array $haystack): void
Expand Down