From 4dd7955d2960a63336810251111db6f763bf7cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@mfauth.com.br>
Date: Thu, 13 Aug 2026 14:15:27 -0300
Subject: [PATCH] Bump phpmyadmin/coding-standard to version 5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renames phpcs.xml.dist to phpcs.xml.

Signed-off-by: Maurício Meneghini Fauth <mauricio@mfauth.com.br>
---
 .gitattributes              |  2 +-
 .gitignore                  |  1 -
 composer.json               |  2 +-
 phpcs.xml.dist => phpcs.xml | 13 +++++--------
 4 files changed, 7 insertions(+), 11 deletions(-)
 rename phpcs.xml.dist => phpcs.xml (73%)

diff --git a/.gitattributes b/.gitattributes
index 71c67f909..3e83867b9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -11,7 +11,7 @@
 .scrutinizer.yml export-ignore
 infection.json.dist export-ignore
 phpbench.json export-ignore
-phpcs.xml.dist export-ignore
+phpcs.xml export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 psalm.xml export-ignore
diff --git a/.gitignore b/.gitignore
index 9bc6509bf..1686331ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ coverage.xml
 .php_cs.cache
 *sw[op]
 phpunit.xml
-phpcs.xml
 .phpunit.result.cache
 phpstan.neon
 # Infection
diff --git a/composer.json b/composer.json
index df2604e22..a6cf6d5b0 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     },
     "require-dev": {
         "phpbench/phpbench": "^1.6",
-        "phpmyadmin/coding-standard": "^4.1",
+        "phpmyadmin/coding-standard": "^5.0",
         "phpmyadmin/motranslator": "^5.4",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan": "^2.1.46",
diff --git a/phpcs.xml.dist b/phpcs.xml
similarity index 73%
rename from phpcs.xml.dist
rename to phpcs.xml
index 2faed13f3..79f44109b 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml
@@ -22,16 +22,13 @@
         <exclude-pattern>src/Contexts/*</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.ControlStructures.RequireSingleLineCondition"/>
-    <rule ref="SlevomatCodingStandard.Functions.RequireSingleLineCall"/>
-    <rule ref="SlevomatCodingStandard.Whitespaces.DuplicateSpaces">
-        <properties>
-            <property name="ignoreSpacesInComment" value="true"/>
-        </properties>
-    </rule>
-
     <rule ref="Squiz.Arrays.ArrayDeclaration.IndexNoNewline">
         <exclude-pattern>src/Contexts/*</exclude-pattern>
         <exclude-pattern>tests/Tools/templates/*</exclude-pattern>
     </rule>
+
+    <!-- Rules that should be followed, but are not required -->
+    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion">
+        <severity>4</severity>
+    </rule>
 </ruleset>