From d187e307c91518ce676ee91a81145dcc90b25d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Mon, 19 Apr 2021 01:47:12 -0300
Subject: [PATCH] Upgrade doctrine/coding-standard to 9.0.0
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 | 51 +++++++++++++++++-------------------------
 composer.json          |  4 ++--
 2 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/PhpMyAdmin/ruleset.xml b/PhpMyAdmin/ruleset.xml
index 364cc62..9187f15 100644
--- a/PhpMyAdmin/ruleset.xml
+++ b/PhpMyAdmin/ruleset.xml
@@ -2,13 +2,8 @@
 <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="phpMyAdmin coding standard" xsi:noNamespaceSchemaLocation="../vendor/squizlabs/php_codesniffer/phpcs.xsd">
     <description>The phpMyAdmin coding standard.</description>
 
+    <!-- Import Doctrine coding standard (base) -->
     <rule ref="Doctrine">
-        <!-- Do not add a space before the return type colon -->
-        <!-- See SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing -->
-        <properties>
-            <property name="spacesCountBeforeColon" value="0"/>
-        </properties>
-
         <!-- Do not require multiple assignment alignment -->
         <exclude name="Generic.Formatting.MultipleStatementAlignment"/>
 
@@ -21,32 +16,28 @@
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
         <exclude name="SlevomatCodingStandard.Classes.SuperfluousTraitNaming"/>
 
-        <!-- Exclude some new rules until we decide we adopt them -->
-        <exclude name="SlevomatCodingStandard.ControlStructures.BlockControlStructureSpacing.IncorrectLinesCountAfterControlStructure"/>
-        <exclude name="SlevomatCodingStandard.Namespaces.UseSpacing.IncorrectLinesCountBetweenDifferentTypeOfUse"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>
-        <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
-        <exclude name="Squiz.NamingConventions.ValidVariableName.NotCamelCaps"/>
-        <exclude name="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps"/>
-        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion.RequiredExplicitAssertion"/>
-        <exclude name="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses.IncorrectlyOrderedUses"/>
-        <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine"/>
-        <exclude name="PSR12.ControlStructures.ControlStructureSpacing.CloseParenthesisLine"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.JumpStatementsSpacing.IncorrectLinesCountAfterLastControlStructure"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.BlockControlStructureSpacing.IncorrectLinesCountAfterLastControlStructure"/>
-        <exclude name="PSR12.ControlStructures.ControlStructureSpacing.LineIndent"/>
-        <exclude name="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator.RequiredNullCoalesceEqualOperator"/>
-        <exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.MissingVariable"/>
-        <exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.NoAssignment"/>
+        <!-- Do not replace /* @var type $foo */ and similar simple inline annotations with assert() -->
+        <exclude name="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification">
-        <severity>4</severity>
+
+    <!-- Disable modern class name reference on objects (PHP 8.0+) -->
+    <rule ref="SlevomatCodingStandard.Classes.ModernClassNameReference">
+        <properties>
+            <property name="enableOnObjects" value="false"/>
+        </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification">
-        <severity>4</severity>
+
+    <!-- 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>
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification">
-        <severity>4</severity>
+
+    <!-- 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 17093a0..ea5b412 100644
--- a/composer.json
+++ b/composer.json
@@ -17,8 +17,8 @@
     },
     "require": {
         "php": "^7.1 || ^8.0",
-        "doctrine/coding-standard": "^8.2.0",
-        "squizlabs/php_codesniffer": "^3.5.5"
+        "doctrine/coding-standard": "^9.0.0",
+        "squizlabs/php_codesniffer": "^3.6.0"
     },
     "config": {
         "sort-packages": true