Fixed bug #2665 : PSR12.Files.ImportStatement should not apply to traits

squizlabs · Oct 24, 2019 · cc1069d · cc1069d
1 parent 35256b6
commit cc1069d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/package.xml b/package.xml
@@ -39,6 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #2663 : Generic.NamingConventions.ConstructorName complains about old constructor in interfaces
   - Fixed bug #2664 : PSR12.Files.OpenTag incorrectly identifies PHP file with only an opening tag
+  - Fixed bug #2665 : PSR12.Files.ImportStatement should not apply to traits
  </notes>
  <contents>
   <dir name="/">

diff --git a/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php b/src/Standards/PSR12/Sniffs/Files/ImportStatementSniff.php
@@ -48,6 +48,11 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
+        if ($phpcsFile->hasCondition($stackPtr, Tokens::$ooScopeTokens) === true) {
+            // This rule inly applies to import statements.
+            return;
+        }
+
         if ($tokens[$next]['code'] === T_STRING
             && (strtolower($tokens[$next]['content']) === 'function'
             || strtolower($tokens[$next]['content']) === 'const')

diff --git a/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php b/src/Standards/PSR12/Tests/Files/ImportStatementUnitTest.php
@@ -29,7 +29,6 @@ public function getErrorList()
             2  => 1,
             4  => 1,
             7  => 1,
-            14 => 1,
         ];
 
     }//end getErrorList()