Fixed codecoverage to not ignore executable lines

Author: tarunlalwani

src/CodeCoverage.php

@@ -115,6 +115,12 @@ class PHP_CodeCoverage
      */
     private $ignoredLines = array();
 
+    /** 
+     * To track lines which have open brackets/close brackets + code
+     * @var array
+     */
+    private $doNotIgnoreLines = array();
+
     /**
      * Test data.
      *
@@ -671,6 +677,10 @@ private function getLinesToBeIgnored($filename)
 
         if (!isset($this->ignoredLines[$filename])) {
             $this->ignoredLines[$filename] = array();
+            //[TARLABS] Added below 2 lines for
+            $this->doNotIgnoreLines[$filename] = array();
+            $lastLineIgnoredForStartOrEndPhpTag = 0;
+
             $ignore                        = false;
             $stop                          = false;
             $lines                         = file($filename);
@@ -790,11 +800,26 @@ private function getLinesToBeIgnored($filename)
                         $this->ignoredLines[$filename][] = $token->getEndLine();
 
                     // Intentional fallthrough
+                    case 'PHP_Token_NAMESPACE':
+                        $this->ignoredLines[$filename][] = $token->getEndLine();
+                    // Intentional fallthrough
+                    case 'PHP_Token_USE':
+                        $this->ignoredLines[$filename][] = $token->getLine();
+                        break;
                     case 'PHP_Token_OPEN_TAG':
                     case 'PHP_Token_CLOSE_TAG':
-                    case 'PHP_Token_USE':
+                        $lastLineIgnoredForStartOrEndPhpTag = $token->getLine();
                         $this->ignoredLines[$filename][] = $token->getLine();
                         break;
+                    case 'PHP_Token_WHITESPACE':
+                        break;
+                    default:
+                        if ($lastLineIgnoredForStartOrEndPhpTag == $token->getLine())
+                        {
+                            //This line possibly has some code and cannot be ignored
+                            $this->doNotIgnoreLines[$filename][] = $token->getLine();
+                        }
+                        break;
                 }
 
                 if ($ignore) {
@@ -807,12 +832,13 @@ private function getLinesToBeIgnored($filename)
                 }
             }
 
+
             $this->ignoredLines[$filename][] = $numLines + 1;
+            $this->doNotIgnoreLines[$filename] = array_unique($this->doNotIgnoreLines[$filename]);
 
             $this->ignoredLines[$filename] = array_unique(
-                $this->ignoredLines[$filename]
+                array_diff($this->ignoredLines[$filename], $this->doNotIgnoreLines[$filename])
             );
-
             sort($this->ignoredLines[$filename]);
         }
 
@@ -896,4 +922,4 @@ private function getAllowedLines(array $linesToBeCovered, array $linesToBeUsed)
 
         return $allowedLines;
     }
-}
+}