github workflow -> use quick checks first (revert)

+ fix more code style stuff
phpDocumentor · Sep 1, 2020 · 1608708 · 1608708
1 parent a94627b
commit 1608708
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 51 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -26,55 +26,6 @@ jobs:
         with:
           args: check --config-file ./composer-require-config.json composer.json
 
-  codestyle:
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Restore/cache vendor folder
-        uses: actions/cache@v2
-        with:
-          path: vendor
-          key: all-build-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            all-build-${{ hashFiles('**/composer.lock') }}
-            all-build-
-      - name: Code style check
-        uses: phpDocumentor/coding-standard@latest
-        with:
-          args: -s
-
-  phpstan:
-    runs-on: ubuntu-latest
-    needs: [setup, phpunit]
-    steps:
-      - uses: actions/checkout@v2
-      - name: composer
-        uses: docker://composer
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: install --no-interaction --prefer-dist --optimize-autoloader
-
-      - name: PHPStan
-        uses: phpDocumentor/phpstan-ga@0.12.9
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          args: analyse src --configuration phpstan.neon
-
-  psalm:
-    name: Psalm
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system:
-          - ubuntu-latest
-        php-versions: ['7.2']
-    env:
-      extensions: mbstring
-      key: cache-v1 # can be any string, change to clear the extension cache.
-
   phpunit-with-coverage:
     runs-on: ubuntu-latest
     name: Unit tests
@@ -169,6 +120,55 @@ jobs:
         continue-on-error: true
         run: php tools/phpunit
 
+  codestyle:
+    runs-on: ubuntu-latest
+    needs: [setup, phpunit]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Code style check
+        uses: phpDocumentor/coding-standard@latest
+        with:
+          args: -s
+
+  phpstan:
+    runs-on: ubuntu-latest
+    needs: [setup, phpunit]
+    steps:
+      - uses: actions/checkout@v2
+      - name: composer
+        uses: docker://composer
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: install --no-interaction --prefer-dist --optimize-autoloader
+
+      - name: PHPStan
+        uses: phpDocumentor/phpstan-ga@0.12.9
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: analyse src --configuration phpstan.neon
+
+  psalm:
+    name: Psalm
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system:
+          - ubuntu-latest
+        php-versions: ['7.2']
+    env:
+      extensions: mbstring
+      key: cache-v1 # can be any string, change to clear the extension cache.
+
     needs:
       - setup
       - phpunit

diff --git a/src/DocBlock/Tags/TagWithVariableType.php b/src/DocBlock/Tags/TagWithVariableType.php
@@ -38,7 +38,8 @@ abstract class TagWithVariableType extends TagWithType
 
     /**
      * @return mixed[]
-     * @psalm-return array{
+     *
+     * @phpstan-return array{
      *     type: null|\phpDocumentor\Reflection\Type,
      *     variableName: string,
      *     isVariadic: bool,
@@ -97,7 +98,7 @@ protected static function extractVariableDataFromBody(
             'variableName' => $variableName,
             'isVariadic' => $isVariadic,
             'isReference' => $isReference,
-            'description' => $description
+            'description' => $description,
         ];
     }