Merge remote-tracking branch 'origin/8.3.x' into fix-function-phpcs-ignore

Author: klausi

coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php

@@ -65,6 +65,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        // Skip names in PHP attributes, no standards defined yet.
+        if (isset($tokens[$stackPtr]['attribute_closer']) === true) {
+            return $tokens[$stackPtr]['attribute_closer'];
+        }
+
         // Check if this is a use statement and ignore those.
         $before = $phpcsFile->findPrevious([T_STRING, T_NS_SEPARATOR, T_WHITESPACE, T_COMMA, T_AS], $stackPtr, null, true);
         if ($tokens[$before]['code'] === T_USE || $tokens[$before]['code'] === T_NAMESPACE) {

coder_sniffer/Drupal/Sniffs/NamingConventions/ValidClassNameSniff.php

@@ -74,9 +74,9 @@ public function process(File $phpcsFile, $stackPtr)
 
         // Ensure the name is not all uppercase.
         // @todo We could make this more strict to check if there are more than
-        // 2 upper case characters in a row, but not decided yet.
+        // 2 upper case characters in a row anywhere, but not decided yet.
         // See https://www.drupal.org/project/coder/issues/3497433
-        if (strtoupper($name) === $name) {
+        if (preg_match('|^[A-Z]{3}[^a-z]*$|', $name) === 1) {
             $error = '%s name must use UpperCamel naming and not contain multiple upper case letters in a row';
             $phpcsFile->addError($error, $stackPtr, 'NoUpperAcronyms', $errorData);
         }

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.4.inc

@@ -8,7 +8,7 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Session\AccountInterface;
 
 /**
- * Test action which is always usable.
+ * Fully qualified names are allowed, there is no standard yet.
  */
 #[\Drupal\action_link\Attribute\StateAction(
   id: 'test_always',

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.4.inc.fixed

@@ -2,17 +2,18 @@
 
 namespace Drupal\action_link_test_plugins\Plugin\StateAction;
 
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\action_link\Attribute\StateAction;
+use Drupal\action_link\Entity\ActionLinkInterface;
 use Drupal\action_link\Plugin\StateAction\StateActionBase;
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Session\AccountInterface;
 
 /**
- * Test action which is always usable.
+ * Fully qualified names are allowed, there is no standard yet.
  */
-#[StateAction(
+#[\Drupal\action_link\Attribute\StateAction(
   id: 'test_always',
-  label: new TranslatableMarkup('Test Always'),
-  description: new TranslatableMarkup('Test Always'),
+  label: new \Drupal\Core\StringTranslation\TranslatableMarkup('Test Always'),
+  description: new \Drupal\Core\StringTranslation\TranslatableMarkup('Test Always'),
   directions: [
     'change' => 'change',
   ]

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.php

@@ -38,11 +38,7 @@ protected function getErrorList(string $testFile): array
         case 'FullyQualifiedNamespaceUnitTest.3.inc':
             return [10 => 2];
         case 'FullyQualifiedNamespaceUnitTest.4.inc':
-            return [
-                13 => 1,
-                15 => 1,
-                16 => 1,
-            ];
+            return [];
         }//end switch
 
         return [];

tests/Drupal/Commenting/ClassCommentUnitTest.inc.fixed

@@ -5,8 +5,6 @@
  * Testing class/trait comments.
  */
 
-use Some\Attribute;
-
 /**
  *
  */
@@ -62,7 +60,7 @@ class WrongSpacing {
 /**
  * This is correct.
  */
-#[Attribute(foo: 'bar')]
+#[Some\Attribute(foo: 'bar')]
 #[Other\Attribute(baz: 'qux')]
 class DoubleAttribute {
 

tests/Drupal/Commenting/FunctionCommentUnitTest.inc.fixed

@@ -5,8 +5,6 @@
  * Some function comment tests.
  */
 
-use Some\Attribute;
-
 /**
  * Test.
  *
@@ -581,7 +579,7 @@ class Test41 {
   /**
    * Method docblock.
    */
-  #[Attribute(foo: 'bar')]
+  #[Some\Attribute(foo: 'bar')]
   #[Other\Attribute(baz: 'qux')]
   public function method() {
   }

tests/Drupal/NamingConventions/ValidEnumCaseUnitTest.inc

@@ -10,4 +10,19 @@ enum Test: int {
   // Upper case parts are allowed for now.
   case FourJSONCase = 4;
   case FiveAndAHorseCorrect = 5;
+  case UIExample = 6;
+}
+
+// Those are all ok.
+enum FiscalQuarter {
+  case Q1;
+  case Q2;
+  case Q3;
+  case Q4;
+}
+
+enum Plan {
+  case A;
+  case B;
+  case C;
 }

tests/Drupal/good/good.php

@@ -1915,6 +1915,38 @@ enum PUROSELY_WRONG_BUT_OK: int {
   case Two = 2;
 }
 
+/**
+ * Fully qualified class name is allowed in PHP attributes for now.
+ */
+#[\Drupal\action_link\Attribute\StateAction(
+  id: 'test_always',
+  label: new \Drupal\Core\StringTranslation\TranslatableMarkup('Test Always'),
+  description: new \Drupal\Core\StringTranslation\TranslatableMarkup('Test Always'),
+  directions: [
+    'change' => 'change',
+  ]
+)]
+class TestAlways extends StateActionBase {
+
+  /**
+   * Partial names are ok in attributes for now.
+   */
+  #[Assert\NotBlank]
+  private bool $bar;
+
+  /**
+   * Partially qualified names are ok in attributes for now.
+   */
+  #[CLI\Command(
+    name: 'example',
+    aliases: ['example-foo']
+  )]
+  #[CLI\Option(name: 'pretty_format', description: 'Display the count in pretty format.')]
+  public function test(array $options = ['pretty-format' => TRUE]): void {
+  }
+
+}
+
 /**
  * Doc block is here and an ignore directive is ok.
  */