Merge branch '1.2'

Conflicts:
	ChangeLog.markdown

Author: edorian

PHP/CodeCoverage.php

@@ -594,7 +594,7 @@ protected function getLinesToBeCovered($className, $methodName)
             return array();
         }
 
-        $docComment = $class->getDocComment() . $method->getDocComment();
+        $docComment = substr($class->getDocComment(), 3, -2) . PHP_EOL . substr($method->getDocComment(), 3, -2);
 
         $templateMethods = array(
           'setUp', 'assertPreConditions', 'assertPostConditions', 'tearDown'
@@ -603,7 +603,7 @@ protected function getLinesToBeCovered($className, $methodName)
         foreach ($templateMethods as $templateMethod) {
             if ($class->hasMethod($templateMethod)) {
                 $reflector   = $class->getMethod($templateMethod);
-                $docComment .= $reflector->getDocComment();
+                $docComment .= PHP_EOL . substr($reflector->getDocComment(), 3, -2);
                 unset($reflector);
             }
         }

PHP/CodeCoverage/Report/HTML/Renderer.php

@@ -242,7 +242,7 @@ protected function getCoverageBar($percent)
           $this->templatePath . 'coverage_bar.html'
         );
 
-        $template->setVar(array('level' => $level, 'percent' => $percent));
+        $template->setVar(array('level' => $level, 'percent' => sprintf("%.2F", $percent)));
 
         return $template->render();
     }

PHP/CodeCoverage/Report/Text.php

@@ -245,7 +245,7 @@ public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
             }
         }
 
-        $this->outputStream->write($output);
+        $this->outputStream->write($output . PHP_EOL);
     }
 
     protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)

Tests/PHP/CodeCoverage/FilterTest.php

@@ -79,6 +79,7 @@ protected function setUp()
           TEST_FILES_PATH . 'CoverageClassExtendedTest.php',
           TEST_FILES_PATH . 'CoverageClassTest.php',
           TEST_FILES_PATH . 'CoverageFunctionTest.php',
+          TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php',
           TEST_FILES_PATH . 'CoverageMethodTest.php',
           TEST_FILES_PATH . 'CoverageNoneTest.php',
           TEST_FILES_PATH . 'CoverageNotPrivateTest.php',

Tests/PHP/CodeCoverage/UtilTest.php

@@ -56,6 +56,7 @@
 require_once TEST_FILES_PATH . 'CoverageClassTest.php';
 require_once TEST_FILES_PATH . 'CoverageFunctionTest.php';
 require_once TEST_FILES_PATH . 'CoverageMethodTest.php';
+require_once TEST_FILES_PATH . 'CoverageMethodOneLineAnnotationTest.php';
 require_once TEST_FILES_PATH . 'CoverageNoneTest.php';
 require_once TEST_FILES_PATH . 'CoverageNotPrivateTest.php';
 require_once TEST_FILES_PATH . 'CoverageNotProtectedTest.php';

Tests/PHP/CodeCoverageTest.php

@@ -414,6 +414,10 @@ public function getLinesToBeCoveredProvider()
             'CoverageMethodTest',
             range(31, 35)
           ),
+          array(
+            'CoverageMethodOneLineAnnotationTest',
+            range(31, 35)
+          ),
           array(
             'CoverageNotPrivateTest',
             array_merge(range(25, 29), range(31, 35))

Tests/_files/CoverageMethodOneLineAnnotationTest.php

@@ -0,0 +1,12 @@
+<?php
+
+class CoverageMethodOneLineAnnotationTest extends PHPUnit_Framework_TestCase
+{
+    /** @covers CoveredClass::publicMethod */
+    public function testSomething()
+    {
+        $o = new CoveredClass;
+        $o->publicMethod();
+    }
+}
+