Merge 'validate-code-static' and 'run-tests' jobs into single matrix

Author: Jeckerson

.github/workflows/main.yml

@@ -29,68 +29,8 @@ jobs:
       - name: Validate PSR-12 Code Style
         run: ~/.composer/vendor/bin/phpcs
 
-  validate-code-static:
-    name: Static Code with PHP ${{ matrix.php-versions }}
-    runs-on: ubuntu-latest
-    env:
-      extensions: mbstring, intl, json, phalcon, mongodb
-      key: cache-v0.0.2
-    needs: validate-code-style
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['8.1', '8.2', '8.3', '8.4']
-
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v5
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          coverage: none
-          php-version: ${{ matrix.php-versions }}
-          extensions: ${{ env.extensions }}
-          tools: pecl
-
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - run: composer require --prefer-dist
-
-      - name: Run Psalm
-        if: always()
-        run: vendor/bin/psalm
-
-      - name: Run PHPStan
-        if: always()
-        run: vendor/bin/phpstan analyse src
-
-  run-tests:
-    name: Tests with PHP ${{ matrix.php-versions }}
+  validate-and-test:
+    name: Static Analysis & Tests with PHP ${{ matrix.php-versions }}
     runs-on: ubuntu-latest
     env:
       extensions: mbstring, intl, json, phalcon, redis, mongodb, xdebug
@@ -145,6 +85,14 @@ jobs:
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-suggest
 
+      - name: Run Psalm
+        if: always()
+        run: vendor/bin/psalm
+
+      - name: Run PHPStan
+        if: always()
+        run: vendor/bin/phpstan analyse src
+
       - name: Run test suites
         if: success()
         run: vendor/bin/phpunit --coverage-clover=coverage-${{ matrix.php-versions }}.xml