Merge branch '1.2'

Author: sebastianbergmann

PHP/CodeCoverage.php

@@ -432,6 +432,11 @@ protected function applyCoversAnnotationFilter(&$data, $id)
               $testClassName, $id->getName()
             );
 
+            if ($linesToBeCovered === FALSE) {
+                $data = array();
+                return;
+            }
+
             if ($this->mapTestClassNameToCoveredClassName &&
                 empty($linesToBeCovered)) {
                 $testedClass = substr($testClassName, 0, -4);
@@ -597,7 +602,7 @@ protected function getLinesToBeCovered($className, $methodName)
         }
 
         if (strpos($docComment, '@coversNothing') !== FALSE) {
-            return $result;
+            return FALSE;
         }
 
         $classShortcut = preg_match_all(

PHP/CodeCoverage/Report/HTML.php

@@ -208,7 +208,7 @@ protected function getDirectory($directory)
             return $directory;
         }
 
-        if (mkdir($directory, 0777, TRUE)) {
+        if (@mkdir($directory, 0777, TRUE)) {
             return $directory;
         }
 

Tests/PHP/CodeCoverageTest.php

@@ -309,10 +309,14 @@ public function testGetLinesToBeCovered($test, $lines)
             );
         }
 
-        else if ($test === 'CoverageNoneTest' || $test === 'CoverageNothingTest') {
+        else if ($test === 'CoverageNoneTest') {
             $expected = array();
         }
 
+        else if ($test === 'CoverageNothingTest') {
+            $expected = false;
+        }
+
         else if ($test === 'CoverageFunctionTest') {
             $expected = array(
               TEST_FILES_PATH . 'CoveredFunction.php' => $lines
@@ -492,7 +496,7 @@ public function getLinesToBeCoveredProvider()
           ),
           array(
             'CoverageNothingTest',
-            array()
+            false
           )
         );
     }