Merge pull request #287 from pdepend/GH285-unexpected-token-t_trait_c

Closes #285: Parse the magic constant __TRAIT__
pdepend · Jan 6, 2017 · d644a7b · d644a7b
2 parents e805725 + b76e2b0
commit d644a7b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/src/main/php/PDepend/Source/Language/PHP/AbstractPHPParser.php b/src/main/php/PDepend/Source/Language/PHP/AbstractPHPParser.php
@@ -4424,11 +4424,14 @@ protected function parseConstant()
             case Tokens::T_FUNC_C:
             case Tokens::T_CLASS_C:
             case Tokens::T_METHOD_C:
+            case Tokens::T_TRAIT_C:
                 $token = $this->consumeToken($type);
-                $const = $this->builder->buildAstConstant($token->image);
+
+                return $this->setNodePositionsAndReturn(
+                    $this->builder->buildAstConstant($token->image)
+                );
                 break;
         }
-        return $this->setNodePositionsAndReturn($const);
     }
 
     /**

diff --git a/src/main/php/PDepend/Source/Language/PHP/PHPParserVersion54.php b/src/main/php/PDepend/Source/Language/PHP/PHPParserVersion54.php
@@ -262,4 +262,17 @@ protected function parsePostfixIdentifier()
         }
         return $this->parseOptionalIndexExpression($node);
     }
+
+    /**
+     * @return \PDepend\Source\AST\ASTNode
+     */
+    protected function parseOptionalExpressionForVersion()
+    {
+        switch ($this->tokenizer->peek()) {
+            case Tokens::T_TRAIT_C:
+                return $this->parseConstant();
+            default:
+                return parent::parseOptionalExpressionForVersion();
+        }
+    }
 }
diff --git a/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php b/src/test/php/PDepend/Source/Language/PHP/PHPParserVersion54Test.php
@@ -382,6 +382,14 @@ public function testListKeywordAsFunctionNameThrowsException()
         $this->parseCodeResourceForTest();
     }
 
+    /**
+     * @return void
+     */
+    public function testMagicTraitConstantInString()
+    {
+        $this->assertNotNull($this->parseCodeResourceForTest());
+    }
+
     /**
      * @param \PDepend\Source\Tokenizer\Tokenizer $tokenizer
      * @param \PDepend\Source\Builder\Builder $builder

diff --git a/...resources/files/Source/Language/PHP/PHPParserVersion54/testMagicTraitConstantInString.php b/...resources/files/Source/Language/PHP/PHPParserVersion54/testMagicTraitConstantInString.php
@@ -0,0 +1,6 @@
+<?php
+class UnexpectedTokenTrait {
+    public function foo() {
+        throw new \LogicException('Not implemented ' . __TRAIT__);
+    }
+}