refactor(MethodDeclaration): Use upstream sniff (#3556854)

Author: klausi

.github/workflows/testing.yml

@@ -97,4 +97,5 @@ jobs:
           sed -i '/<rule ref="Drupal.Functions.FunctionDeclaration"\/>/d' phpcs.xml.dist
           sed -i 's/DrupalPractice.CodeAnalysis.VariableAnalysis/VariableAnalysis.CodeAnalysis.VariableAnalysis/g' phpcs.xml.dist
           find .. -type f -name "*.php" -exec sed -i 's#// phpcs:ignore DrupalPractice.CodeAnalysis.VariableAnalysis#// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis#g' {} +
+          sed -i 's/Drupal.Methods.MethodDeclaration/PSR2.Methods.MethodDeclaration/g' phpcs.xml.dist
           ../../vendor/bin/phpcs -p -s --parallel=$(nproc) --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

coder_sniffer/Drupal/Sniffs/Methods/MethodDeclarationSniff.php

@@ -22,13 +22,6 @@
     <!-- Do not run this sniff on template files. -->
     <exclude-pattern>*.tpl.php</exclude-pattern>
   </rule>
-
-  <!-- Silence method name underscore warning which is covered already in
-       Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps. -->
-  <rule ref="Drupal.Methods.MethodDeclaration.Underscore">
-    <severity>0</severity>
-  </rule>
-
   <rule ref="Drupal.WhiteSpace.CloseBracketSpacing">
     <!-- Do not run this sniff on template files. -->
     <exclude-pattern>*.tpl.php</exclude-pattern>
@@ -119,6 +112,7 @@
      <!-- Already covered by Drupal.Classes.PropertyDeclaration.VarUsed. -->
     <exclude name="PSR2.Classes.PropertyDeclaration.VarUsed"/>
   </rule>
+  <rule ref="PSR2.Methods.MethodDeclaration"/>
   <rule ref="PSR2.Namespaces.NamespaceDeclaration"/>
   <rule ref="PSR2.Namespaces.UseDeclaration"/>
 

coder_sniffer/Drupal/ruleset.xml

@@ -446,6 +446,8 @@ protected function getWarningList(string $testFile): array
                 363 => 1,
                 366 => 1,
                 382 => 1,
+                407 => 1,
+                411 => 1,
                 433 => 1,
                 434 => 1,
                 436 => 1,