Merge fd9c2d9 into 2eab92c

spiral · Mar 12, 2019 · ee994a8 · ee994a8
2 parents 2eab92c + fd9c2d9
commit ee994a8
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/source/Spiral/Tokenizer/Reflections/ReflectionFile.php b/source/Spiral/Tokenizer/Reflections/ReflectionFile.php
@@ -265,6 +265,7 @@ protected function importSchema(array $cache): bool
     {
         if (count($cache) === 4) {
             list($this->hasIncludes, $this->declarations, $this->functions, $this->namespaces) = $cache;
+
             return true;
         }
 
@@ -297,13 +298,9 @@ protected function locateDeclarations()
                 case T_CLASS:
                 case T_TRAIT:
                 case T_INTERFACE:
-                    if (
-                        $this->tokens[$tokenID][self::TOKEN_TYPE] == T_CLASS
-                        && isset($this->tokens[$tokenID - 1])
-                        && $this->tokens[$tokenID - 1][self::TOKEN_TYPE] == T_PAAMAYIM_NEKUDOTAYIM
-                    ) {
+                    if ($this->isClassNameConst($tokenID)) {
                         //PHP5.5 ClassName::class constant
-                        continue;
+                        continue 2;
                     }
 
                     $this->registerDeclaration($tokenID, $token[self::TOKEN_TYPE]);
@@ -458,6 +455,20 @@ private function registerDeclaration(int $tokenID, int $tokenType)
         ];
     }
 
+    /**
+     * Check if token ID represents `ClassName::class` constant statement.
+     * 
+     * @param int $tokenID
+     *
+     * @return bool
+     */
+    private function isClassNameConst(int $tokenID): bool
+    {
+        return $this->tokens[$tokenID][self::TOKEN_TYPE] == T_CLASS
+            && isset($this->tokens[$tokenID - 1])
+            && $this->tokens[$tokenID - 1][self::TOKEN_TYPE] == T_PAAMAYIM_NEKUDOTAYIM;
+    }
+
     /**
      * Locate every function or static method call (including $this calls).
      *