Merge pull request #14 from MauricioFauth/phpcs-upgrade

Bump doctrine/coding-standard to version 14

Author: MauricioFauth

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
+        php-version: ['8.2', '8.3', '8.4', '8.5']
     steps:
       - name: Checkout code
         uses: actions/checkout@v7
@@ -38,5 +38,5 @@ jobs:
       - 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"
+      - name: Check installed coding standards
+        run: vendor/bin/phpcs -i | grep -F "PhpMyAdmin, Doctrine and SlevomatCodingStandard"

PhpMyAdmin/ruleset.xml

@@ -12,24 +12,28 @@
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming"/>
-
-        <!-- Do not replace /* @var type $foo */ and similar simple inline annotations with assert() -->
-        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
+    <!-- Enforces conditions to be on a single line when it fit on the line. -->
+    <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition">
         <properties>
-            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+            <property name="alwaysForSimpleConditions" value="false"/>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+
+    <!-- Enforces function call to be on a single line when it fits on the line. -->
+    <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
+
+    <!-- Checks duplicate spaces. -->
+    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
         <properties>
-            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+            <property name="ignoreSpacesInComment" value="true"/>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
+
+    <rule ref="SlevomatCodingStandard.TypeHints.ClassConstantTypeHint">
         <properties>
-            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+            <property name="enableNativeTypeHint" value="false"/><!-- PHP 8.3+ -->
         </properties>
     </rule>
 </ruleset>

composer.json

@@ -16,9 +16,9 @@
         "issues": "https://github.com/phpmyadmin/coding-standard/issues"
     },
     "require": {
-        "php": "^8.1",
-        "doctrine/coding-standard": "^13",
-        "squizlabs/php_codesniffer": "^3.7"
+        "php": "^8.2",
+        "doctrine/coding-standard": "^14",
+        "squizlabs/php_codesniffer": "^4"
     },
     "config": {
         "sort-packages": true,