fix(FullyQualifiedNamespace): Fix fixer for new use statement group (…

…#3214374)

coder_sniffer/Drupal/Sniffs/Classes/FullyQualifiedNamespaceSniff.php

@@ -187,14 +187,20 @@ public function process(File $phpcsFile, $stackPtr)
                 if ($useStatement !== false && empty($tokens[$useStatement]['conditions']) === true) {
                     $phpcsFile->fixer->addContentBefore($useStatement, "$use\n");
                 } else {
-                    // Check if there is an @file comment.
-                    $beginning   = 0;
-                    $fileComment = $phpcsFile->findNext(T_WHITESPACE, ($beginning + 1), null, true);
-                    if ($tokens[$fileComment]['code'] === T_DOC_COMMENT_OPEN_TAG) {
-                        $beginning = $tokens[$fileComment]['comment_closer'];
+                    // Check if there is a namespace declaration and add it there.
+                    $namespace = $phpcsFile->findNext(T_NAMESPACE, 0);
+                    if ($namespace !== false) {
+                        $beginning = $phpcsFile->findEndOfStatement($namespace);
                         $phpcsFile->fixer->addContent($beginning, "\n\n$use\n");
                     } else {
-                        $phpcsFile->fixer->addContent($beginning, "$use\n");
+                        // Check if there is an @file comment.
+                        $fileComment = $phpcsFile->findNext(T_WHITESPACE, 1, null, true);
+                        if ($tokens[$fileComment]['code'] === T_DOC_COMMENT_OPEN_TAG) {
+                            $beginning = $tokens[$fileComment]['comment_closer'];
+                            $phpcsFile->fixer->addContent($beginning, "\n\n$use\n");
+                        } else {
+                            $phpcsFile->fixer->addContent(0, "\n\n$use\n");
+                        }
                     }
                 }
             }//end if

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.2.inc

@@ -0,0 +1,9 @@
+<?php
+
+namespace Namespace2;
+
+/**
+ * Class C's description.
+ */
+class C extends \Namespace1\D {
+}

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

@@ -0,0 +1,11 @@
+<?php
+
+namespace Namespace2;
+
+use Namespace1\D;
+
+/**
+ * Class C's description.
+ */
+class C extends D {
+}

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.3.inc

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Namespace2;
+
+/**
+ * Class C's description.
+ */
+class C extends \Namespace1\D implements \Namespace1\I {
+}

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

@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Namespace2;
+
+use Namespace1\I;
+use Namespace1\D;
+
+/**
+ * Class C's description.
+ */
+class C extends D implements I {
+}

tests/Drupal/Classes/FullyQualifiedNamespaceUnitTest.php

@@ -33,6 +33,10 @@ protected function getErrorList(string $testFile): array
             ];
         case 'FullyQualifiedNamespaceUnitTest.1.inc':
             return [16 => 1];
+        case 'FullyQualifiedNamespaceUnitTest.2.inc':
+            return [8 => 1];
+        case 'FullyQualifiedNamespaceUnitTest.3.inc':
+            return [10 => 2];
         }
 
         return [];
@@ -69,6 +73,8 @@ protected function getTestFiles($testFileBase): array
         return [
             __DIR__.'/FullyQualifiedNamespaceUnitTest.inc',
             __DIR__.'/FullyQualifiedNamespaceUnitTest.1.inc',
+            __DIR__.'/FullyQualifiedNamespaceUnitTest.2.inc',
+            __DIR__.'/FullyQualifiedNamespaceUnitTest.3.inc',
             __DIR__.'/FullyQualifiedNamespaceUnitTest.api.php',
         ];