Sniff added for grouped namespace

pjayramkumar · Nov 17, 2019 · 975977d · 975977d
1 parent 80bfe89
commit 975977d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php b/Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php
@@ -7,6 +7,7 @@
 
 use PHP_CodeSniffer\Sniffs\Sniff;
 use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Util\Tokens;
 
 /**
  * Detects static test namespace.
@@ -43,9 +44,27 @@ public function register()
     public function process(File $phpcsFile, $stackPtr)
     {
         $next = $phpcsFile->findNext([T_COMMA, T_SEMICOLON, T_OPEN_USE_GROUP, T_CLOSE_TAG], ($stackPtr + 1));
+        $tokens = $phpcsFile->getTokens();
         $getTokenAsContent = $phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr));
         if (strpos($getTokenAsContent, $this->prohibitNamespace) !== false) {
             $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
         }
+        if ($next !== false
+            && $tokens[$next]['code'] !== T_SEMICOLON
+            && $tokens[$next]['code'] !== T_CLOSE_TAG
+        ) {
+            $baseUse           = rtrim($phpcsFile->getTokensAsString($stackPtr, ($next - $stackPtr)));
+            $baseUse = str_replace('use \\', '', $baseUse);
+            $closingCurly = $phpcsFile->findNext(T_CLOSE_USE_GROUP, ($next + 1));
+            do {
+                $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($next + 1), $closingCurly, true);
+                $groupedAsContent = $baseUse. $tokens[$next]['content'];
+                $next = $phpcsFile->findNext(T_COMMA, ($next + 1), $closingCurly);
+                if (strpos($groupedAsContent, $this->prohibitNamespace) !== false) {
+                    $phpcsFile->addWarning($this->warningMessage, $stackPtr, $this->warningCode);
+                    return;
+                }
+            } while ($next != false);
+        }
     }
 }
diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc
@@ -1,4 +1,6 @@
 <?php
 use Magento\Tests;
 use Magento\Foo\Tests as FakeTest;
-use Magento\Real\Classes;
+use Magento\Real\Classes;
+use \Magento\{Tests\String, Tests\Int};
+use \Magento\{Foo\string, Bar\float};
diff --git a/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php b/Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.php
@@ -25,6 +25,9 @@ public function getErrorList()
      */
     public function getWarningList()
     {
-        return [2 => 1];
+        return [
+            2 => 1,
+            5 => 1
+        ];
     }
 }
diff --git a/Magento2/ruleset.xml b/Magento2/ruleset.xml
@@ -189,7 +189,7 @@
         <exclude-pattern>*Test.php</exclude-pattern>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="Magento2.Namespaces.ImportsFromTestNamespaceSniff">
+    <rule ref="Magento2.Namespaces.ImportsFromTestNamespace">
         <severity>8</severity>
         <type>warning</type>
     </rule>