Merge branch 'master' into feature/path-coverage

Author: sebastianbergmann

src/CodeCoverage.php

@@ -335,7 +335,9 @@ public function append(array $data, $id = null, $append = true, $linesToBeCovere
 
             foreach ($fileData['lines'] as $k => $v) {
                 if ($v == 1) {
-                    $this->data[$file]['lines'][$k][] = $id;
+                    if (empty($this->data[$file]['lines'][$k]) || !in_array($id, $this->data[$file]['lines'][$k])) {
+                        $this->data[$file]['lines'][$k][] = $id;
+                    }
                 }
             }
         }

src/CodeCoverage/Filter.php

@@ -203,7 +203,6 @@ public function isFile($filename)
      * When the whitelist is not empty, whitelisting is used.
      *
      * @param  string                     $filename
-     * @param  boolean                    $ignoreWhitelist
      * @return boolean
      * @throws PHP_CodeCoverage_Exception
      */

src/CodeCoverage/Report/HTML/Renderer.php

@@ -262,9 +262,9 @@ protected function getCoverageBar($percent)
      */
     protected function getColorLevel($percent)
     {
-        if ($percent < $this->lowUpperBound) {
+        if ($percent <= $this->lowUpperBound) {
             return 'danger';
-        } elseif ($percent >= $this->lowUpperBound &&
+        } elseif ($percent > $this->lowUpperBound &&
             $percent <  $this->highLowerBound) {
             return 'warning';
         } else {

src/CodeCoverage/Report/Node.php

@@ -100,7 +100,7 @@ public function getId()
     public function getPath()
     {
         if ($this->path === null) {
-            if ($this->parent === null || $this->parent->getPath() === null) {
+            if ($this->parent === null || $this->parent->getPath() === null || $this->parent->getPath() === false) {
                 $this->path = $this->name;
             } else {
                 $this->path = $this->parent->getPath() . '/' . $this->name;

src/CodeCoverage/Report/Node/File.php

@@ -647,7 +647,7 @@ protected function processFunctions(PHP_Token_Stream $tokens)
     protected function crap($ccn, $coverage)
     {
         if ($coverage == 0) {
-            return (string) pow($ccn, 2) + $ccn;
+            return (string) (pow($ccn, 2) + $ccn);
         }
 
         if ($coverage >= 95) {

src/CodeCoverage/Report/Text.php

@@ -220,7 +220,7 @@ protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElem
             $totalNumberOfElements
         );
 
-        if ($coverage > $this->highLowerBound) {
+        if ($coverage >= $this->highLowerBound) {
             return $this->colors['green'];
         } elseif ($coverage > $this->lowUpperBound) {
             return $this->colors['yellow'];