Merge pull request #26 from magento-commerce/imported-magento-magento-coding-standard-220

[Imported] Fix ImportsFromTestNamespace from lock on group use with trailing comma

Author: sivaschenko

Magento2/Sniffs/Namespaces/ImportsFromTestNamespaceSniff.php

@@ -57,11 +57,13 @@ public function process(File $phpcsFile, $stackPtr)
             $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;
+                if ($next !== false) {
+                    $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);
         }

Magento2/Tests/Namespaces/ImportsFromTestNamespaceUnitTest.inc

@@ -3,4 +3,5 @@ use Magento\Tests;
 use Magento\Foo\Tests as FakeTest;
 use Magento\Real\Classes;
 use \Magento\{Tests\String, Tests\Int};
-use \Magento\{Foo\string, Bar\float};
+use \Magento\{Foo\string, Bar\float};
+use \Foo\{Trailing, Space,};