Use PHP_TokenStream.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Clover.php

@@ -44,6 +44,7 @@
  */
 
 require_once 'PHP/CodeCoverage.php';
+require_once 'PHP/Token/Stream.php';
 
 /**
  * Generates a Clover XML logfile from an PHP_CodeCoverage object.
@@ -116,9 +117,9 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 $file = $document->createElement('file');
                 $file->setAttribute('name', $filename);
 
-                $classesInFile = PHP_CodeCoverage_Util::getClassesInFile(
-                  $filename
-                );
+                $tokens        = new PHP_Token_Stream($filename);
+                $classesInFile = $tokens->getClasses();
+                $linesOfCode   = $tokens->getLinesOfCode();
 
                 $ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
                   $filename
@@ -201,7 +202,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                     }
 
                     $package = PHP_CodeCoverage_Util::getPackageInformation(
-                      $className, $_class['docComment']
+                      $className, $_class['docblock']
                     );
 
                     if (!empty($package['namespace'])) {
@@ -337,11 +338,10 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                     $file->appendChild($line);
                 }
 
-                $count   = PHP_CodeCoverage_Util::countLines($filename);
                 $metrics = $document->createElement('metrics');
 
-                $metrics->setAttribute('loc', $count['loc']);
-                $metrics->setAttribute('ncloc', $count['ncloc']);
+                $metrics->setAttribute('loc', $linesOfCode['loc']);
+                $metrics->setAttribute('ncloc', $linesOfCode['ncloc']);
                 $metrics->setAttribute('classes', $fileStatistics['classes']);
                 $metrics->setAttribute('methods', $fileStatistics['methods']);
 
@@ -396,8 +396,8 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                     $packages[$namespace]->appendChild($file);
                 }
 
-                $projectStatistics['loc']                 += $count['loc'];
-                $projectStatistics['ncloc']               += $count['ncloc'];
+                $projectStatistics['loc']                 += $linesOfCode['loc'];
+                $projectStatistics['ncloc']               += $linesOfCode['ncloc'];
                 $projectStatistics['classes']             += $fileStatistics['classes'];
                 $projectStatistics['methods']             += $fileStatistics['methods'];
                 $projectStatistics['coveredMethods']      += $fileStatistics['coveredMethods'];

PHP/CodeCoverage/Report/HTML/Node/File.php

@@ -47,6 +47,8 @@
     define('T_NAMESPACE', 377);
 }
 
+require_once 'PHP/Token/Stream.php';
+
 /**
  * Represents a file in the code coverage information tree.
  *
@@ -812,7 +814,8 @@ protected function loadFile($file)
 
     protected function processClasses()
     {
-        $classes = PHP_CodeCoverage_Util::getClassesInFile($this->getPath());
+        $tokens  = new PHP_Token_Stream($this->getPath());
+        $classes = $tokens->getClasses();
         $file    = $this->getId() . '.html#';
 
         foreach ($classes as $className => $class) {
@@ -854,7 +857,8 @@ protected function processClasses()
 
     protected function processFunctions()
     {
-        $functions = PHP_CodeCoverage_Util::getFunctionsInFile($this->getPath());
+        $tokens    = new PHP_Token_Stream($this->getPath());
+        $functions = $tokens->getFunctions();
 
         if (count($functions) > 0 && !isset($this->classes['*'])) {
             $this->classes['*'] = array(