Fix path coverage

Author: Maks3w

src/CodeCoverage.php

@@ -331,9 +331,9 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
                 continue;
             }
 
-            foreach ($fileData['lines'] as $line => $flag) {
-                if ($flag === PHP_CodeCoverage_Driver::LINE_EXECUTED) {
-                    $lineData = &$this->data[$file]['lines'][$line];
+            foreach ($fileData['lines'] as $function => $functionCoverage) {
+                if ($functionCoverage === PHP_CodeCoverage_Driver::LINE_EXECUTED) {
+                    $lineData = &$this->data[$file]['lines'][$function];
                     if ($lineData === null) {
                         $lineData = [
                             'pathCovered' => false,
@@ -344,6 +344,22 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
                     }
                 }
             }
+
+            foreach ($fileData['functions'] as $function => $functionCoverage) {
+                foreach ($functionCoverage['branches'] as $branch => $branchCoverage) {
+                    if ($branchCoverage['hit'] === 1){
+                        $this->data[$file]['branches'][$function][$branch]['hit'] = 1;
+                        if (!in_array($id, $this->data[$file]['branches'][$function][$branch]['tests'])) {
+                            $this->data[$file]['branches'][$function][$branch]['tests'][] = $id;
+                        }
+                    }
+                }
+                foreach ($functionCoverage['paths'] as $path => $pathCoverage) {
+                    if ($pathCoverage['hit'] === 1 && $this->data[$file]['paths'][$function][$path]['hit'] === 0){
+                        $this->data[$file]['paths'][$function][$path]['hit'] = 1;
+                    }
+                }
+            }
         }
     }
 
@@ -603,8 +619,8 @@ private function initializeFilesThatAreSeenTheFirstTime(array $data)
                         $this->data[$file]['branches'][$functionName] = [];
                         $this->data[$file]['paths'][$functionName]    = [];
 
-                        foreach ($functionData['branches'] as $branch) {
-                            $this->data[$file]['branches'][$functionName][] = [
+                        foreach ($functionData['branches'] as $index => $branch) {
+                            $this->data[$file]['branches'][$functionName][$index] = [
                                 'hit'        => $branch['hit'],
                                 'line_start' => $branch['line_start'],
                                 'line_end'   => $branch['line_end'],

tests/PHP/CodeCoverageTest.php

@@ -284,8 +284,14 @@ public function testMerge()
         $coverage = $this->getCoverageForBankAccountForFirstTwoTests();
         $coverage->merge($this->getCoverageForBankAccountForLastTwoTests());
 
+        $expectedData = $this->getExpectedDataArrayForBankAccount();
+        $expectedData[TEST_FILES_PATH . 'BankAccount.php']['branches']['BankAccount->getBalance'][0]['tests'] = [
+            'BankAccountTest::testBalanceIsInitiallyZero',
+            'BankAccountTest::testBalanceCannotBecomeNegative',
+        ];
+
         $this->assertEquals(
-            $this->getExpectedDataArrayForBankAccount(),
+            $expectedData,
             $coverage->getData()
         );
     }

tests/TestCase.php

@@ -461,7 +461,12 @@ protected function getExpectedDataArrayForBankAccount()
                         0 => [
                             'line_start' => 6,
                             'line_end'   => 9,
-                            'tests'      => [],
+                            'tests'      => [
+                                'BankAccountTest::testBalanceIsInitiallyZero',
+                                'BankAccountTest::testBalanceCannotBecomeNegative',
+                                'BankAccountTest::testBalanceCannotBecomeNegative2',
+                                'BankAccountTest::testDepositWithdrawMoney',
+                            ],
                             'hit'        => 1,
                         ],
                     ],
@@ -480,19 +485,19 @@ protected function getExpectedDataArrayForBankAccount()
                             'tests'      => [],
                             'hit'        => 0,
                         ],
-                        1 => [
+                        5 => [
                             'line_start' => 14,
                             'line_end'   => 15,
                             'tests'      => [],
                             'hit'        => 0,
                         ],
-                        2 => [
+                        9 => [
                             'line_start' => 16,
                             'line_end'   => 16,
                             'tests'      => [],
                             'hit'        => 0,
                         ],
-                        3 => [
+                        16 => [
                             'line_start' => 18,
                             'line_end'   => 18,
                             'tests'      => [],