WIP simplified Tokenizer to really required features

Author: staabm

src/CodeCoverage/Report/Node/File.php

@@ -352,22 +352,12 @@ public function getNumTestedFunctions()
     protected function calculateStatistics()
     {
         $tokenizer = new Tokenizer($this->getPath());
-        $classes = $traits = $functions = array();
-        foreach($tokenizer as $tokenName => $token) {
-            switch ($tokenName) {
-                case "class":
-                    $classes[] = $token;
-                    break;
-                case "trait":
-                    $traits[] = $token;
-                    break;
-                case "function":
-                    $functions[] = $token;
-                    break;
-            }
-        }
+        $tokenizer->tokenize();
+
+        $classes = $tokenizer->getClasses();
+        $traits = $tokenizer->getTraits();
+        $functions = $tokenizer->getFunctions();
         $this->linesOfCode = $tokenizer->getLinesOfCode();
-        unset($tokenizer);
 
         for ($lineNumber = 1; $lineNumber <= $this->linesOfCode['loc']; $lineNumber++) {
             if (isset($this->startLines[$lineNumber])) {

src/CodeCoverage/Util/Tokenizer.php

@@ -2,6 +2,9 @@
 
 class Tokenizer {
     private $filename;
+    private $functions = [];
+    private $classes = [];
+    private $traits = [];
     private $linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
 
     /**
@@ -42,13 +45,14 @@ public function __construct($filename) {
         $this->filename = $filename;
     }
 
-    public function next() {
+    public function tokenize() {
         $sourceCode     = file_get_contents($this->filename);
         $tokens = token_get_all($sourceCode);
         $numTokens = count($tokens);
 
         for ($i = 0; $i < $numTokens; ++$i) {
             $token = $tokens[$i];
+
             if (is_array($token)) {
                 $name = substr(token_name($token[0]), 2);
                 $text = $token[1];
@@ -69,42 +73,26 @@ public function next() {
                 case 'PHP_Token_HALT_COMPILER':
                     break;
 
-                case 'PHP_Token_INTERFACE':
-                    $interface        = $token->getName();
-                    $interfaceEndLine = $token->getEndLine();
-
-                    $this->interfaces[$interface] = array(
+                case 'PHP_Token_CLASS':
+                case 'PHP_Token_TRAIT':
+                    $tmp = array(
                         'methods'   => array(),
                         'parent'    => $token->getParent(),
+                        'interfaces'=> $token->getInterfaces(),
                         'keywords'  => $token->getKeywords(),
                         'docblock'  => $token->getDocblock(),
                         'startLine' => $token->getLine(),
-                        'endLine'   => $interfaceEndLine,
+                        'endLine'   => $token->getEndLine(),
                         'package'   => $token->getPackage(),
                         'file'      => $this->filename
                     );
-                    break;
-
-                case 'PHP_Token_CLASS':
-                case 'PHP_Token_TRAIT':
-                    $tmp = array(
-                    'methods'   => array(),
-                    'parent'    => $token->getParent(),
-                    'interfaces'=> $token->getInterfaces(),
-                    'keywords'  => $token->getKeywords(),
-                    'docblock'  => $token->getDocblock(),
-                    'startLine' => $token->getLine(),
-                    'endLine'   => $token->getEndLine(),
-                    'package'   => $token->getPackage(),
-                    'file'      => $this->filename
-                    );
 
                     if ($token instanceof PHP_Token_CLASS) {
-                        $class                 = $token->getName();
+                        $class                 = (string)$tokens[$i + 2];
                         $classEndLine          = $token->getEndLine();
                         $this->classes[$class] = $tmp;
                     } else {
-                        $trait                = $token->getName();
+                        $trait                = (string)$tokens[$i + 2];
                         $traitEndLine         = $token->getEndLine();
                         $this->traits[$trait] = $tmp;
                     }
@@ -179,14 +167,6 @@ public function next() {
             } elseif ($name != 'WHITESPACE') {
                 $lastNonWhitespaceTokenWasDoubleColon = false;
             }
-
-            if (false) {
-                yield "class" => [];
-            } else if (false) {
-                yield "trait" => [];
-            } else if (false) {
-                yield "function" => [];
-            }
         }
 
         $this->linesOfCode['loc']   = substr_count($sourceCode, "\n");
@@ -197,4 +177,16 @@ public function next() {
     public function getLinesOfCode() {
         return $this->linesOfCode;
     }
+
+    public function getClasses() {
+        return $this->classes;
+    }
+
+    public function getTraits() {
+        return $this->traits;
+    }
+
+    public function getFunctions() {
+        return $this->functions;
+    }
 }