Merge branch 'master' into feature/path-coverage

Author: sebastianbergmann

composer.json

@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     }
 }

src/CodeCoverage.php

@@ -80,6 +80,11 @@ class PHP_CodeCoverage
      */
     private $ignoredLines = array();
 
+    /**
+     * @var bool
+     */
+    private $disableIgnoredLines = false;
+
     /**
      * Test data.
      *
@@ -384,6 +389,14 @@ public function merge(PHP_CodeCoverage $that)
         }
 
         $this->tests = array_merge($this->tests, $that->getTests());
+
+        $this->filter->setBlacklistedFiles(
+            array_merge($this->filter->getBlacklistedFiles(), $that->filter()->getBlacklistedFiles())
+        );
+
+        $this->filter->setWhitelistedFiles(
+            array_merge($this->filter->getWhitelistedFiles(), $that->filter()->getWhitelistedFiles())
+        );
     }
 
     /**
@@ -492,6 +505,22 @@ public function setProcessUncoveredFilesFromWhitelist($flag)
         $this->processUncoveredFilesFromWhitelist = $flag;
     }
 
+    /**
+     * @param  boolean                    $flag
+     * @throws PHP_CodeCoverage_Exception
+     */
+    public function setDisableIgnoredLines($flag)
+    {
+        if (!is_bool($flag)) {
+            throw PHP_CodeCoverage_Util_InvalidArgumentHelper::factory(
+                1,
+                'boolean'
+            );
+        }
+
+        $this->disableIgnoredLines = $flag;
+    }
+
     /**
      * Applies the @covers annotation filtering.
      *
@@ -692,6 +721,10 @@ private function getLinesToBeIgnored($filename)
             $lines                         = file($filename);
             $numLines                      = count($lines);
 
+            if ($this->disableIgnoredLines) {
+                return $this->ignoredLines[$filename];
+            }
+
             foreach ($lines as $index => $line) {
                 if (!trim($line)) {
                     $this->ignoredLines[$filename][] = $index + 1;
@@ -742,7 +775,7 @@ private function getLinesToBeIgnored($filename)
 
                             // A DOC_COMMENT token or a COMMENT token starting with "/*"
                             // does not contain the final \n character in its text
-                            if (0 === strpos($_token, '/*') && '*/' === substr(trim($lines[$i-1]), -2)) {
+                            if (isset($lines[$i-1]) && 0 === strpos($_token, '/*') && '*/' === substr(trim($lines[$i-1]), -2)) {
                                 $this->ignoredLines[$filename][] = $i;
                             }
                         }

src/CodeCoverage/Report/HTML/Renderer/File.php

@@ -43,6 +43,11 @@
  */
 class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
 {
+    /**
+     * @var integer
+     */
+    private $htmlspecialcharsFlags;
+
     /**
      * Constructor.
      *
@@ -61,6 +66,12 @@ public function __construct($templatePath, $generator, $date, $lowUpperBound, $h
             $lowUpperBound,
             $highLowerBound
         );
+
+        $this->htmlspecialcharsFlags = ENT_COMPAT;
+
+        if (defined('ENT_SUBSTITUTE')) {
+            $this->htmlspecialcharsFlags = $this->htmlspecialcharsFlags | ENT_HTML401 | ENT_SUBSTITUTE;
+        }
     }
 
     /**
@@ -439,7 +450,7 @@ protected function loadFile($file)
             $value = str_replace(
                 array("\t", ' '),
                 array('    ', ' '),
-                htmlspecialchars($value)
+                htmlspecialchars($value, $this->htmlspecialcharsFlags)
             );
 
             if ($value === "\n") {

src/CodeCoverage/Report/XML/Tests.php

@@ -35,7 +35,7 @@ public function __construct(DOMElement $context)
         $this->contextNode = $context;
     }
 
-    public function addTest($test, $result)
+    public function addTest($test, array $result)
     {
         $node = $this->contextNode->appendChild(
             $this->contextNode->ownerDocument->createElementNS(
@@ -44,8 +44,9 @@ public function addTest($test, $result)
             )
         );
         $node->setAttribute('name', $test);
-        $node->setAttribute('result', (int) $result);
-        $node->setAttribute('status', $this->codeMap[(int) $result]);
+        $node->setAttribute('size', $result['size']);
+        $node->setAttribute('result', (int) $result['status']);
+        $node->setAttribute('status', $this->codeMap[(int) $result['status']]);
 
     }
 }

tests/PHP/CodeCoverageTest.php

@@ -34,6 +34,9 @@
  */
 class PHP_CodeCoverageTest extends PHP_CodeCoverage_TestCase
 {
+    /**
+     * @var PHP_CodeCoverage
+     */
     private $coverage;
 
     protected function setUp()
@@ -472,4 +475,20 @@ private function getLinesToBeIgnored()
 
         return $getLinesToBeIgnored;
     }
+
+    /**
+     * @covers PHP_CodeCoverage::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnoredWhenIgnoreIsDisabled()
+    {
+        $this->coverage->setDisableIgnoredLines(true);
+
+        $this->assertEquals(
+            array(),
+            $this->getLinesToBeIgnored()->invoke(
+                $this->coverage,
+                TEST_FILES_PATH . 'source_with_ignore.php'
+            )
+        );
+    }
 }