From 7204b49ecebdc355634e2746c46eb9f381df7d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Sun, 19 Feb 2023 17:34:22 -0300
Subject: [PATCH 1/3] Upgrade to PHP 8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Forbids the 'global' keyword.
- Bumps Doctrine coding standard to 11.1.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 .github/workflows/tests.yml |  2 +-
 PhpMyAdmin/ruleset.xml      | 24 ------------------------
 composer.json               |  6 +++---
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 723a953..c2a07ee 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ["7.1", "7.2", "7.3", "7.4", "8.0", "8.1"]
+                php-version: ["8.1", "8.2"]
         steps:
             - uses: actions/checkout@v3
             - name: Install xmllint
diff --git a/PhpMyAdmin/ruleset.xml b/PhpMyAdmin/ruleset.xml
index 9187f15..73b9366 100644
--- a/PhpMyAdmin/ruleset.xml
+++ b/PhpMyAdmin/ruleset.xml
@@ -7,9 +7,6 @@
         <!-- Do not require multiple assignment alignment -->
         <exclude name="Generic.Formatting.MultipleStatementAlignment"/>
 
-        <!-- Allow the 'global' keyword -->
-        <exclude name="Squiz.PHP.GlobalKeyword"/>
-
         <!-- Disable the superfluous class naming rules -->
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousExceptionNaming"/>
@@ -19,25 +16,4 @@
         <!-- Do not replace /* @var type $foo */ and similar simple inline annotations with assert() -->
         <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
     </rule>
-
-    <!-- Disable modern class name reference on objects (PHP 8.0+) -->
-    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference">
-        <properties>
-            <property name="enableOnObjects" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Do not require usage of null coalesce operator equal operator (PHP 7.4+) -->
-    <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator">
-        <properties>
-            <property name="enable" value="false"/>
-        </properties>
-    </rule>
-
-    <!-- Disable native type hints for properties (PHP 7.4+) -->
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
-        <properties>
-            <property name="enableNativeTypeHint" value="false"/>
-        </properties>
-    </rule>
 </ruleset>
diff --git a/composer.json b/composer.json
index 53cc555..3c0fd43 100644
--- a/composer.json
+++ b/composer.json
@@ -16,9 +16,9 @@
         "issues": "https://github.com/phpmyadmin/coding-standard/issues"
     },
     "require": {
-        "php": "^7.1 || ^8.0",
-        "doctrine/coding-standard": "^9.0.0",
-        "squizlabs/php_codesniffer": "^3.6.0"
+        "php": "^8.1",
+        "doctrine/coding-standard": "^11.1",
+        "squizlabs/php_codesniffer": "^3.7"
     },
     "config": {
         "sort-packages": true,

From 805595b55f8e53fed66efe4cc9981b18bbfdba18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 9 Jun 2023 17:39:01 -0300
Subject: [PATCH 2/3] Disable standalone null, true and false type hints
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 PhpMyAdmin/ruleset.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/PhpMyAdmin/ruleset.xml b/PhpMyAdmin/ruleset.xml
index 73b9366..c17343e 100644
--- a/PhpMyAdmin/ruleset.xml
+++ b/PhpMyAdmin/ruleset.xml
@@ -16,4 +16,20 @@
         <!-- Do not replace /* @var type $foo */ and similar simple inline annotations with assert() -->
         <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
     </rule>
+
+    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
+        <properties>
+            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+        </properties>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
+        <properties>
+            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+        </properties>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
+        <properties>
+            <property name="enableStandaloneNullTrueFalseTypeHints" value="false"/>
+        </properties>
+    </rule>
 </ruleset>

From 8124d055d5ecae7956ee102de2160e3b6f4b7d2d Mon Sep 17 00:00:00 2001
From: Kamil Tekiela <tekiela246@gmail.com>
Date: Sun, 27 Apr 2025 23:59:28 +0100
Subject: [PATCH 3/3] Upgrade doctrine/coding-standard

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3c0fd43..94e3ea3 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
     },
     "require": {
         "php": "^8.1",
-        "doctrine/coding-standard": "^11.1",
+        "doctrine/coding-standard": "^13",
         "squizlabs/php_codesniffer": "^3.7"
     },
     "config": {