refactor(ElseIf): Replace sniff with upstream PSR2 version (#3559491)

Author: klausi

.github/workflows/testing.yml

@@ -101,4 +101,5 @@ jobs:
           sed -i '/<rule ref="Drupal.WhiteSpace.Namespace"\/>/d' phpcs.xml.dist
           sed -i 's/Drupal.Classes.InterfaceName/Generic.NamingConventions.InterfaceNameSuffix/g' phpcs.xml.dist
           sed -i '/<rule ref="Drupal.Commenting.DataTypeNamespace"\/>/d' phpcs.xml.dist
+          sed -i 's/Drupal.ControlStructures.ElseIf/PSR2.ControlStructures.ElseIfDeclaration/g' phpcs.xml.dist
           ../../vendor/bin/phpcs -p -s --parallel=$(nproc) --exclude=Drupal.ControlStructures.ControlSignature --ignore=lib/Drupal/Core/Command/GenerateTheme.php,modules/mysql/tests/src/Kernel/mysql/Console/DbDumpCommandTest.php,modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php,tests/fixtures/plugins/CustomPlugin.php,modules/package_manager/tests/modules/package_manager_test_api/src/ApiController.php,modules/views/tests/src/Kernel/Plugin/StyleGridTest.php

coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php

@@ -114,6 +114,7 @@
      <!-- Already covered by Drupal.Classes.PropertyDeclaration.VarUsed. -->
     <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed"/>
   </rule>
+  <rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
   <rule ref="PSR2.ControlStructures.SwitchDeclaration">
     <!-- Disable some error messages that we do not want. -->
     <exclude name="PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineCASE"/>

coder_sniffer/Drupal/ruleset.xml

@@ -194,7 +194,7 @@ protected function getErrorList(string $testFile): array
                 216 => 2,
                 218 => 1,
                 222 => 2,
-                225 => 2,
+                225 => 1,
                 230 => 1,
                 233 => 1,
                 237 => 1,
@@ -397,6 +397,11 @@ protected function getErrorList(string $testFile): array
                 21 => 1,
                 31 => 1,
             ];
+        case 'ElseIfUnitTest.inc':
+            return [
+                1 => 1,
+                9 => 1,
+            ];
         case 'FinallySpacingUnitTest.inc':
             return [
                 1 => 1,
@@ -473,6 +478,7 @@ protected function getWarningList(string $testFile): array
                 156 => 1,
                 193 => 1,
                 202 => 1,
+                225 => 1,
                 360 => 1,
                 363 => 1,
                 366 => 1,
@@ -494,6 +500,11 @@ protected function getWarningList(string $testFile): array
                 824 => 1,
                 836 => 1,
             ];
+        case 'ElseIfUnitTest.inc':
+            return [
+                6 => 1,
+                9 => 1,
+            ];
         }//end switch
 
         return [];