From f0323491157e197faf5e3499670e216ddb066438 Mon Sep 17 00:00:00 2001
From: Vytautas Stankus <svycka@users.noreply.github.com>
Date: Fri, 6 Mar 2015 13:16:01 +0200
Subject: [PATCH] Merging .cov files ignores their filter settings

fixes https://github.com/sebastianbergmann/phpcov/issues/18
---
 src/CodeCoverage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CodeCoverage.php b/src/CodeCoverage.php
index 5725917be..54f0f6ac9 100644
--- a/src/CodeCoverage.php
+++ b/src/CodeCoverage.php
@@ -335,9 +335,9 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
      */
     public function merge(PHP_CodeCoverage $that)
     {
-        foreach ($that->data as $file => $lines) {
+        foreach ($that->getData() as $file => $lines) {
             if (!isset($this->data[$file])) {
-                if (!$this->filter->isFiltered($file)) {
+                if (!$that->filter()->isFiltered($file)) {
                     $this->data[$file] = $lines;
                 }