test combine phpcs & phpstan

.github/workflows/code_quality.yml → .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: 'Code Quality'
+name: 'CI'
 
 on:
   pull_request:
@@ -9,7 +9,8 @@ env:
   PHPUNIT_FLAGS: "-v"
 
 jobs:
-  setup:
+  code-quality:
+    name: "Code Quality"
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout code"
@@ -21,6 +22,14 @@ jobs:
           php-version: ${{ env.PHP_VERSION }}
           coverage: none
 
+      - name: "Restore cache results"
+        uses: actions/cache/restore@v4
+        with:
+          path: .cache
+          key: "ci-result-cache-${{ github.run_id }}"
+          restore-keys: |
+            ci-result-cache-
+
       - name: "Restore Composer Cache"
         uses: actions/cache/restore@v4
         id: restore-composer
@@ -34,71 +43,63 @@ jobs:
         if: steps.restore-composer.outputs.cache-hit != 'true'
         run: composer install --no-progress
 
-      - name: "Save vendor directory"
-        if: steps.restore-composer.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v4
-        with:
-          path: vendor
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock','**/composer.json') }}
-
-
-  php-cs-fixer:
-    name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
-    needs: setup
-    steps:
-      - name: "Create .cache dir"
-        run: |
-          mkdir .cache
-
-      - name: "Restore PHP-cs-fixer cache results"
-        uses: actions/cache/restore@v4
-        with:
-          path: .cache
-          key: 'phpcs-result-cache-${{ github.run_id }}'
-          restore-keys: |
-            phpcs-result-cache-
+      - name: "Run PHPStan"
+        run: vendor/bin/phpstan analyse --error-format=github -vvv
 
       - name: "Run php-cs-fixer"
         run: >-
           vendor/bin/php-cs-fixer fix --diff --dry-run
           --config=.php-cs-fixer.dist.php
 
-      - name: "Save PHP-cs-fixer cache results"
+      - name: "Save cache results"
         uses: actions/cache/save@v4
         if: always()
         with:
           path: .cache
-          key: 'phpcs-result-cache-${{ github.run_id }}'
+          key: "ci-result-cache-${{ github.run_id }}"
 
-  phpstan:
-    name: PHPStan
+      - name: "Save vendor directory"
+        if: steps.restore-composer.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock','**/composer.json') }}
+
+  tests:
+    name: Tests
     runs-on: ubuntu-latest
-    needs: setup
+    needs: code-quality
     steps:
-      - name: "Restore PHPStan cache results"
+      - name: "Checkout code"
+        uses: actions/checkout@v4
+
+      - name: "Install PHP with extensions"
+        uses: shivammathur/setup-php@v2
+        with:
+          coverage: "none"
+          php-version: ${{ env.PHP_VERSION }}
+          tools: composer:v2
+
+      - name: "Restore Composer Cache"
         uses: actions/cache/restore@v4
+        id: restore-composer
         with:
-          path: .cache
-          key: "phpstan-result-cache-${{ github.run_id }}"
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock','**/composer.json') }}
           restore-keys: |
-            phpstan-result-cache-
+            ${{ runner.os }}-composer-
 
-      - name: "Run PHPStan"
-        run: vendor/bin/phpstan analyse --error-format=github -vvv
+      - name: "Install Composer dependencies"
+        if: steps.restore-composer.outputs.cache-hit != 'true'
+        run: composer install --no-progress
 
-      - name: "Save PHPStan cache results"
+      - name: "Save vendor directory"
+        if: steps.restore-composer.outputs.cache-hit != 'true'
         uses: actions/cache/save@v4
-        if: always()
         with:
-          path: .cache
-          key: "phpstan-result-cache-${{ github.run_id }}"
+          path: vendor
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock','**/composer.json') }}
 
-  phpunit:
-    name: PHPUnit
-    runs-on: ubuntu-latest
-    needs: setup
-    steps:
       - name: "PHPUnit version"
         run: vendor/bin/phpunit --version
 

.github/workflows/commit_quality.yml

@@ -2,7 +2,7 @@ name: Commit Quality
 
 on:
   pull_request_target:
-    types: [opened, ready_for_review]
+    types: [ready_for_review]
 
 permissions:
   pull-requests: read