Calculate statistics for functions correctly.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Node/File.php

@@ -420,14 +420,24 @@ protected function calculateStatistics()
         for ($lineNumber = 1; $lineNumber <= $this->linesOfCode['loc']; $lineNumber++) {
             if (isset($this->startLines[$lineNumber])) {
                 // Start line of a class.
-                if (isset($this->startLines[$lineNumber]['methods'])) {
+                if (isset($this->startLines[$lineNumber]['className'])) {
                     $currentClass = &$this->startLines[$lineNumber];
                 }
 
+                // Start line of a trait.
+                else if (isset($this->startLines[$lineNumber]['traitName'])) {
+                    $currentTrait = &$this->startLines[$lineNumber];
+                }
+
                 // Start line of a method.
-                else {
+                else if (isset($this->startLines[$lineNumber]['methodName'])) {
                     $currentMethod = &$this->startLines[$lineNumber];
                 }
+
+                // Start line of a function.
+                else if (isset($this->startLines[$lineNumber]['functionName'])) {
+                    $currentFunction = &$this->startLines[$lineNumber];
+                }
             }
 
             if (!isset($this->ignoredLines[$lineNumber]) &&
@@ -437,10 +447,18 @@ protected function calculateStatistics()
                     $currentClass['executableLines']++;
                 }
 
+                if (isset($currentTrait)) {
+                    $currentTrait['executableLines']++;
+                }
+
                 if (isset($currentMethod)) {
                     $currentMethod['executableLines']++;
                 }
 
+                if (isset($currentFunction)) {
+                    $currentFunction['executableLines']++;
+                }
+
                 $this->numExecutableLines++;
 
                 if (count($this->coverageData[$lineNumber]) > 0 ||
@@ -449,24 +467,42 @@ protected function calculateStatistics()
                         $currentClass['executedLines']++;
                     }
 
+                    if (isset($currentTrait)) {
+                        $currentTrait['executedLines']++;
+                    }
+
                     if (isset($currentMethod)) {
                         $currentMethod['executedLines']++;
                     }
 
+                    if (isset($currentFunction)) {
+                        $currentFunction['executedLines']++;
+                    }
+
                     $this->numExecutedLines++;
                 }
             }
 
             if (isset($this->endLines[$lineNumber])) {
                 // End line of a class.
-                if (isset($this->endLines[$lineNumber]['methods'])) {
+                if (isset($this->endLines[$lineNumber]['className'])) {
                     unset($currentClass);
                 }
 
+                // End line of a trait.
+                else if (isset($this->endLines[$lineNumber]['traitName'])) {
+                    unset($currentTrait);
+                }
+
                 // End line of a method.
-                else {
+                else if (isset($this->endLines[$lineNumber]['methodName'])) {
                     unset($currentMethod);
                 }
+
+                // End line of a function.
+                else if (isset($this->endLines[$lineNumber]['functionName'])) {
+                    unset($currentFunction);
+                }
             }
         }
 
@@ -547,6 +583,7 @@ protected function processClasses(PHP_Token_Stream $tokens)
 
         foreach ($classes as $className => $class) {
             $this->classes[$className] = array(
+              'className'       => $className,
               'methods'         => array(),
               'startLine'       => $class['startLine'],
               'executableLines' => 0,
@@ -563,6 +600,7 @@ protected function processClasses(PHP_Token_Stream $tokens)
 
             foreach ($class['methods'] as $methodName => $method) {
                 $this->classes[$className]['methods'][$methodName] = array(
+                  'methodName'      => $methodName,
                   'signature'       => $method['signature'],
                   'startLine'       => $method['startLine'],
                   'endLine'         => $method['endLine'],
@@ -592,6 +630,7 @@ protected function processTraits(PHP_Token_Stream $tokens)
 
         foreach ($traits as $traitName => $trait) {
             $this->traits[$traitName] = array(
+              'traitName'       => $traitName,
               'methods'         => array(),
               'startLine'       => $trait['startLine'],
               'executableLines' => 0,
@@ -608,6 +647,7 @@ protected function processTraits(PHP_Token_Stream $tokens)
 
             foreach ($trait['methods'] as $methodName => $method) {
                 $this->traits[$traitName]['methods'][$methodName] = array(
+                  'methodName'      => $methodName,
                   'signature'       => $method['signature'],
                   'startLine'       => $method['startLine'],
                   'executableLines' => 0,
@@ -636,11 +676,14 @@ protected function processFunctions(PHP_Token_Stream $tokens)
 
         foreach ($functions as $functionName => $function) {
             $this->functions[$functionName] = array(
+              'functionName'    => $functionName,
               'signature'       => $function['signature'],
               'startLine'       => $function['startLine'],
               'executableLines' => 0,
               'executedLines'   => 0,
               'ccn'             => $function['ccn'],
+              'coverage'        => 0,
+              'crap'            => 0,
               'link'            => $link . $function['startLine']
             );
 

Tests/PHP/CodeCoverage/Report/FactoryTest.php

@@ -111,7 +111,8 @@ public function testSomething()
                   'ccn' => 1,
                   'coverage' => 100,
                   'crap' => '1',
-                  'link' => 'BankAccount.php.html#6'
+                  'link' => 'BankAccount.php.html#6',
+                  'methodName' => 'getBalance'
                 ),
                 'setBalance' => array(
                   'signature' => 'setBalance($balance)',
@@ -122,7 +123,8 @@ public function testSomething()
                   'ccn' => 2,
                   'coverage' => 0,
                   'crap' => 6,
-                  'link' => 'BankAccount.php.html#11'
+                  'link' => 'BankAccount.php.html#11',
+                  'methodName' => 'setBalance'
                 ),
                 'depositMoney' => array(
                   'signature' => 'depositMoney($balance)',
@@ -133,7 +135,8 @@ public function testSomething()
                   'ccn' => 1,
                   'coverage' => 100,
                   'crap' => '1',
-                  'link' => 'BankAccount.php.html#20'
+                  'link' => 'BankAccount.php.html#20',
+                  'methodName' => 'depositMoney'
                 ),
                 'withdrawMoney' => array(
                   'signature' => 'withdrawMoney($balance)',
@@ -144,7 +147,8 @@ public function testSomething()
                   'ccn' => 1,
                   'coverage' => 100,
                   'crap' => '1',
-                  'link' => 'BankAccount.php.html#27'
+                  'link' => 'BankAccount.php.html#27',
+                  'methodName' => 'withdrawMoney'
                 ),
               ),
               'startLine' => 2,
@@ -160,7 +164,8 @@ public function testSomething()
                 'package' => '',
                 'subpackage' => ''
               ),
-              'link' => 'BankAccount.php.html#2'
+              'link' => 'BankAccount.php.html#2',
+              'className' => 'BankAccount'
             )
           ),
           $root->getClasses()