Close sebastianbergmann#2.

Author: sebastianbergmann

PHP/CodeCoverage/Report/Clover.php

@@ -117,9 +117,14 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 $file->setAttribute('name', $filename);
 
                 $classesInFile = PHP_CodeCoverage_Util::getClassesInFile(
-                                   $filename
-                                 );
-                $lines         = array();
+                  $filename
+                );
+
+                $ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
+                  $filename
+                );
+
+                $lines = array();
 
                 foreach ($classesInFile as $className => $_class) {
                     $classStatistics = array(
@@ -141,6 +146,10 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                         for ($i  = $method['startLine'];
                              $i <= $method['endLine'];
                              $i++) {
+                            if (isset($ignoredLines[$i])) {
+                                continue;
+                            }
+
                             $add   = TRUE;
                             $count = 0;
 
@@ -283,7 +292,7 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 }
 
                 foreach ($data as $_line => $_data) {
-                    if (isset($lines[$_line])) {
+                    if (isset($lines[$_line]) || isset($ignoredLines[$_line])) {
                         continue;
                     }
 
@@ -307,6 +316,10 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                 ksort($lines);
 
                 foreach ($lines as $_line => $_data) {
+                    if (isset($ignoredLines[$_line])) {
+                        continue;
+                    }
+
                     $line = $document->createElement('line');
                     $line->setAttribute('num', $_line);
                     $line->setAttribute('type', $_data['type']);

Tests/PHP/CodeCoverage/Report/CloverTest.php

@@ -82,4 +82,17 @@ public function testCloverForBankAccountTest()
           $clover->process($this->getCoverageForBankAccount(), NULL, 'BankAccount')
         );
     }
+
+    /**
+     * @covers PHP_CodeCoverage_Report_Clover
+     */
+    public function testCloverForFileWithIgnoredLines()
+    {
+        $clover = new PHP_CodeCoverage_Report_Clover;
+
+        $this->assertStringMatchesFormatFile(
+          TEST_FILES_PATH . 'ignored-lines-clover.xml',
+          $clover->process($this->getCoverageForFileWithIgnoredLines())
+        );
+    }
 }

Tests/TestCase.php

@@ -144,4 +144,36 @@ protected function setUpXdebugStubForBankAccount()
 
         return $stub;
     }
+
+    protected function getCoverageForFileWithIgnoredLines()
+    {
+        $coverage = new PHP_CodeCoverage(
+          $this->setUpXdebugStubForFileWithIgnoredLines(),
+          new PHP_CodeCoverage_Filter
+        );
+
+        $coverage->start('FileWithIgnoredLines', TRUE);
+        $coverage->stop();
+
+        return $coverage;
+    }
+
+    protected function setUpXdebugStubForFileWithIgnoredLines()
+    {
+        $stub = $this->getMock('PHP_CodeCoverage_Driver_Xdebug');
+        $stub->expects($this->any())
+             ->method('stop')
+             ->will($this->returnValue(
+               array(
+                 TEST_FILES_PATH . 'source_with_ignore.php' => array(
+                   2 => 1,
+                   4 => -1,
+                   6 => -1,
+                   7 => 1
+                 )
+               )
+            ));
+
+        return $stub;
+    }
 }

Tests/_files/ignored-lines-clover.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<coverage generated="%i">
+  <project timestamp="%i">
+    <file name="%s/source_with_ignore.php">
+      <line num="2" type="stmt" count="1"/>
+      <line num="6" type="stmt" count="0"/>
+      <line num="7" type="stmt" count="1"/>
+      <metrics loc="6" ncloc="2" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="3" coveredstatements="2" elements="3" coveredelements="2"/>
+    </file>
+    <metrics files="1" loc="6" ncloc="2" classes="0" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="3" coveredstatements="2" elements="3" coveredelements="2"/>
+  </project>
+</coverage>