bugfix #6

cloak-php · Sep 15, 2014 · f969476 · f969476
1 parent 4481bf9
commit f969476
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/spec/reporter/LcovReporterSpec.php b/spec/reporter/LcovReporterSpec.php
@@ -64,6 +64,7 @@
 
             $output .= "SF:" . $this->source2 . PHP_EOL;
             $output .= "DA:10,1" . PHP_EOL;
+            $output .= "DA:15,0" . PHP_EOL;
             $output .= "end_of_record" . PHP_EOL;
 
             $this->output = $output;

diff --git a/src/reporter/LcovReporter.php b/src/reporter/LcovReporter.php
@@ -80,10 +80,10 @@ private function writeFileResult(File $file)
     {
         $this->writeFileHeader($file);
 
-        $executedLines = $this->getExecutedLinesFromFile($file);
+        $targetLines = $this->getTargetLinesFromFile($file);
 
-        foreach ($executedLines as $executedLine) {
-            $this->writeLineResult($executedLine);
+        foreach ($targetLines as $targetLine) {
+            $this->writeLineResult($targetLine);
         }
 
         $this->writeFileFooter();
@@ -113,25 +113,27 @@ private function writeFileFooter()
      */
     private function writeLineResult(Line $line)
     {
-        $parts = [
+
+        $executedCount = $line->isExecuted() ? 1 : 0;
+        $recordParts = [
             $line->getLineNumber(),
-            1
+            $executedCount
         ];
 
-        $record = 'DA:' . implode(',', $parts);
+        $record = 'DA:' . implode(',', $recordParts);
         $this->reportWriter->writeLine($record);
     }
 
     /**
      * @param File $file
      * @return array
      */
-    private function getExecutedLinesFromFile(File $file)
+    private function getTargetLinesFromFile(File $file)
     {
         $lineResults = $file->getLineResults();
 
         $results = $lineResults->selectLines(function(Line $line) {
-            return $line->isExecuted();
+            return $line->isExecuted() || $line->isUnused();
         })->all();
 
         return $results;