Merge branch 'master' into report-refactoring

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -87,6 +87,11 @@ class PHP_CodeCoverage
      */
     protected $currentId;
 
+    /**
+     * @var array
+     */
+    protected $currentFilterGroups = array('DEFAULT');
+
     /**
      * Code coverage data.
      *
@@ -199,9 +204,10 @@ public function getReport()
      */
     public function clear()
     {
-        $this->currentId = NULL;
-        $this->data      = array();
-        $this->tests     = array();
+        $this->currentId           = NULL;
+        $this->currentFilterGroups = array('DEFAULT');
+        $this->data                = array();
+        $this->tests               = array();
     }
 
     /**
@@ -244,10 +250,11 @@ public function getTests()
      * Start collection of code coverage information.
      *
      * @param  mixed   $id
+     * @param  array   $filterGroups
      * @param  boolean $clear
      * @throws InvalidArgumentException
      */
-    public function start($id, $clear = FALSE)
+    public function start($id, array $filterGroups = array('DEFAULT'), $clear = FALSE)
     {
         if (!is_bool($clear)) {
             throw new InvalidArgumentException;
@@ -257,7 +264,8 @@ public function start($id, $clear = FALSE)
             $this->clear();
         }
 
-        $this->currentId = $id;
+        $this->currentId           = $id;
+        $this->currentFilterGroups = $filterGroups;
 
         $this->driver->start();
     }
@@ -293,7 +301,7 @@ public function stop($append = TRUE)
      * @param mixed $id
      * @param array $filterGroups
      */
-    public function append(array $data, $id = NULL, array $filterGroups = array('DEFAULT'))
+    public function append(array $data, $id = NULL, array $filterGroups = NULL)
     {
         if ($id === NULL) {
             $id = $this->currentId;
@@ -303,6 +311,10 @@ public function append(array $data, $id = NULL, array $filterGroups = array('DEF
             throw new InvalidArgumentException;
         }
 
+        if ($filterGroups === NULL) {
+            $filterGroups = $this->currentFilterGroups;
+        }
+
         $this->applySelfFilter($data);
         $this->applyListsFilter($data, $filterGroups);
         $this->initializeFilesThatAreSeenTheFirstTime($data);
@@ -343,18 +355,27 @@ public function merge(PHP_CodeCoverage $that)
     {
         foreach ($that->data as $file => $lines) {
             if (!isset($this->data[$file])) {
-                $this->data[$file] = $lines;
+                if (!$this->filter->isFiltered($file, $this->currentFilterGroups)) {
+                    $this->data[$file] = $lines;
+                }
+
                 continue;
             }
 
             foreach ($lines as $line => $data) {
                 if ($data !== NULL) {
-                    $this->data[$file][$line] = array_unique(
-                      array_merge($this->data[$file][$line], $data)
-                    );
+                    if (!isset($this->data[$file][$line])) {
+                        $this->data[$file][$line] = $data;
+                    } else {
+                        $this->data[$file][$line] = array_unique(
+                          array_merge($this->data[$file][$line], $data)
+                        );
+                    }
                 }
             }
         }
+
+        $this->tests = array_merge($this->tests, $that->getTests());
     }
 
     /**

Tests/PHP/CodeCoverageTest.php

@@ -121,7 +121,7 @@ public function testFactory()
     public function testStartThrowsExceptionForInvalidArgument()
     {
         $coverage = new PHP_CodeCoverage;
-        $coverage->start(NULL, NULL);
+        $coverage->start(NULL, array(), NULL);
     }
 
     /**

Tests/TestCase.php

@@ -126,7 +126,7 @@ protected function getCoverageForBankAccount()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceIsInitiallyZero'), TRUE
+          new BankAccountTest('testBalanceIsInitiallyZero'), array('DEFAULT'), TRUE
         );
         $coverage->stop();
 
@@ -163,7 +163,7 @@ protected function getCoverageForBankAccountForFirstTwoTests()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceIsInitiallyZero'), TRUE
+          new BankAccountTest('testBalanceIsInitiallyZero'), array('DEFAULT'), TRUE
         );
         $coverage->stop();
 
@@ -189,7 +189,7 @@ protected function getCoverageForBankAccountForLastTwoTests()
         $coverage = new PHP_CodeCoverage($stub, new PHP_CodeCoverage_Filter);
 
         $coverage->start(
-          new BankAccountTest('testBalanceCannotBecomeNegative2'), TRUE
+          new BankAccountTest('testBalanceCannotBecomeNegative2'), array('DEFAULT'), TRUE
         );
         $coverage->stop();
 
@@ -242,7 +242,7 @@ protected function getCoverageForFileWithIgnoredLines()
           new PHP_CodeCoverage_Filter
         );
 
-        $coverage->start('FileWithIgnoredLines', TRUE);
+        $coverage->start('FileWithIgnoredLines', array('DEFAULT'), TRUE);
         $coverage->stop();
 
         return $coverage;