Merge branch '3.1.x' into 4.1.x

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>

Author: MauricioFauth

.github/workflows/tests.yml

@@ -4,35 +4,39 @@ on:
   push:
   pull_request:
     types: [opened, synchronize, reopened]
-    branches:
-      - master
+
+permissions:
+  contents: read
 
 jobs:
-    test-ruleset:
-        name: Test rules on PHP ${{ matrix.php-version }}
-        runs-on: ubuntu-latest
-        strategy:
-            matrix:
-                php-version: ["8.1", "8.2"]
-        steps:
-            - uses: actions/checkout@v3
-            - name: Install xmllint
-              run: |
-                sudo apt update
-                sudo apt install --no-install-recommends -y libxml2-utils
-                sudo apt clean
-            - name: Use php ${{ matrix.php-version }}
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: ${{ matrix.php-version }}
-            - name: Cache module
-              uses: actions/cache@v3
-              with:
-                  path: ~/.composer/cache/
-                  key: composer-cache
-            - name: Install dependencies
-              run: composer install
-            - name: Lint the ruleset
-              run: xmllint --noout --schema ./vendor/squizlabs/php_codesniffer/phpcs.xsd PhpMyAdmin/ruleset.xml
-            - name: Run php tests
-              run: ./vendor/bin/phpcs --standard=PhpMyAdmin -vv | grep -oF "Processing ruleset $(pwd)/PhpMyAdmin/ruleset.xml"
+  test-ruleset:
+    name: Test rules on PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - name: Install xmllint
+        run: |
+          sudo apt update
+          sudo apt install --no-install-recommends -y libxml2-utils
+          sudo apt clean
+
+      - name: Set up PHP ${{ matrix.php-version }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v4
+
+      - name: Lint the ruleset
+        run: xmllint --noout --schema ./vendor/squizlabs/php_codesniffer/phpcs.xsd PhpMyAdmin/ruleset.xml
+
+      - name: Run PHP tests
+        run: ./vendor/bin/phpcs --standard=PhpMyAdmin -vv | grep -oF "Processing ruleset $(pwd)/PhpMyAdmin/ruleset.xml"