Merge 'validate-code-style' into 'validate-and-test' job

Author: Jeckerson

.github/workflows/main.yml

@@ -3,51 +3,27 @@ name: "CI"
 on: [push]
 
 jobs:
-  validate-code-style:
-    name: PSR-12 Code style
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-
-      - 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-
-
-      - name: Install PHP_CodeSniffer composer package
-        run: composer global require "squizlabs/php_codesniffer=*"
-
-      - name: Validate PSR-12 Code Style
-        run: ~/.composer/vendor/bin/phpcs
-
   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
-      key: cache-v0.0.2
+      key: cache-v0.0.3
     services:
       mongodb:
         image: mongo:3.6
         ports:
           - 27017:27017
-    needs: validate-code-style
     strategy:
       fail-fast: false
       matrix:
         php-versions: ['8.1', '8.2', '8.3', '8.4']
     steps:
       - uses: actions/checkout@v5
 
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
       - name: Setup cache environment
         id: cache-env
         uses: shivammathur/cache-extensions@v1
@@ -71,20 +47,13 @@ jobs:
           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-
-
       - name: Install Composer dependencies
         run: composer install --prefer-dist --no-suggest
 
+      - name: Validate Code Style
+        if: always()
+        run: vendor/bin/phpcs
+
       - name: Run Psalm
         if: always()
         run: vendor/bin/psalm

composer.json

@@ -33,7 +33,7 @@
         "ext-mongodb": "*",
         "phalcon/ide-stubs": "^5.0",
         "vimeo/psalm": "^6.13",
-        "squizlabs/php_codesniffer": "^3.7",
+        "squizlabs/php_codesniffer": "^4.0",
         "phpunit/phpunit": "^10.0",
         "mongodb/mongodb": "^2.1",
         "phpstan/phpstan": "^1.10"

composer.lock

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="Phalcon PSR-12">
+    <description>Phalcon Coding Standards</description>
+    <arg value="-colors"/>
+    <arg value="s"/>
+    <arg value="p"/>
+    <rule ref="PSR12"/>
+
+    <file>src/</file>
+    <file>tests/</file>
+</ruleset>