Merge branch 'fixUseDeclaration' of https://github.com/VincentLanglet/PHP_CodeSniffer

Author: gsherwood

src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php

@@ -88,10 +88,12 @@ public function process(File $phpcsFile, $stackPtr)
                         }
 
                         $lastValidContent = $i;
+
+                        continue;
                     }
 
                     break;
-                }
+                }//end for
 
                 if ($tokens[$lastValidContent]['line'] !== ($tokens[$opener]['line'] + 1)) {
                     $error = 'The first trait import statement must be declared on the first non-comment line after the %s opening brace';

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.inc

@@ -170,3 +170,40 @@ class MyExample
     use Trait3;
 
 }
+
+class Foo implements Bar
+{
+    /*
+     * Comment here;
+     */
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    // Comment here;
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    /**
+     * Comment here;
+     */
+    /**
+     * Another Comment here;
+     */
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    /**
+     * Comment here;
+     */
+    public $foo;
+    /**
+     * Comment here;
+     */
+    use Baz;
+}

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.inc.fixed

@@ -164,3 +164,40 @@ class MyExample
     // comment here
     use Trait3;
 }
+
+class Foo implements Bar
+{
+    /*
+     * Comment here;
+     */
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    // Comment here;
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    /**
+     * Comment here;
+     */
+    /**
+     * Another Comment here;
+     */
+    use Baz;
+}
+
+class Foo implements Bar
+{
+    /**
+     * Comment here;
+     */
+    public $foo;
+    /**
+     * Comment here;
+     */
+    use Baz;
+}

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php

@@ -46,6 +46,7 @@ public function getErrorList()
             157 => 1,
             165 => 1,
             170 => 1,
+            208 => 1,
         ];
 
     }//end getErrorList()