Fixed bug #784 : ->trait is seen as a T_TRAIT token

squizlabs · Nov 24, 2015 · e9f730a · e9f730a · mikesherov · Dec 8, 2015
1 parent ded79f5
commit e9f730a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/CodeSniffer/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.inc b/CodeSniffer/Standards/Generic/Tests/Files/OneTraitPerFileUnitTest.inc
@@ -10,3 +10,8 @@ trait bar {
 trait baz {
 
 }
+
+$trait = 'foo';
+echo $this->trait;
+echo Something::$trait;
+echo $trait;
diff --git a/CodeSniffer/Tokenizers/PHP.php b/CodeSniffer/Tokenizers/PHP.php
@@ -617,6 +617,7 @@ public function tokenizeString($string, $eolChar='\n')
             if ($tokenIsArray === true
                 && $token[0] === T_STRING
                 && strtolower($token[1]) === 'trait'
+                && $tokens[($stackPtr - 1)][0] !== T_OBJECT_OPERATOR
             ) {
                 $finalTokens[$newStackPtr] = array(
                                               'content' => $token[1],

diff --git a/package.xml b/package.xml
@@ -26,6 +26,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </stability>
  <license uri="https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt">BSD 3-Clause License</license>
  <notes>
+  - Fixed bug #784 : $this->trait is seen as a T_TRAIT token
   - Fixed bug #786 : Switch indent issue with short array notation
  </notes>
  <contents>