ci: fix

zenstruck · Dec 1, 2022 · 60feed6 · 60feed6
1 parent 6837229
commit 60feed6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:
@@ -34,23 +34,4 @@ jobs:
       php: 8
 
   sca:
-    name: Static Code Analysis
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.1
-          coverage: none
-
-      - name: Install Dependencies
-        uses: ramsey/composer-install@v1
-
-      - name: Install PHPUnit
-        run: vendor/bin/simple-phpunit install
-
-      - name: Run PHPStan
-        run: vendor/bin/phpstan --error-format=github
+    uses: zenstruck/.github/.github/workflows/php-stan.yml@main
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -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)

diff --git a/src/Assert/AssertionFailed.php b/src/Assert/AssertionFailed.php
@@ -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)';
         }
 

diff --git a/tests/Assertion/ArraySubsetAssertionTest.php b/tests/Assertion/ArraySubsetAssertionTest.php
@@ -13,7 +13,6 @@ class ArraySubsetAssertionTest extends TestCase
 {
     /**
      * @dataProvider arraySubsetProvider
-     *
      * @test
      *
      * @param string|iterable $needle
@@ -73,7 +72,6 @@ public function arraySubsetProvider(): iterable
 
     /**
      * @dataProvider arrayNotSubsetProvider
-     *
      * @test
      */
     public function it_asserts_not_array_subset(array $needle, array $haystack): void