Merge branch '1.2'

Author: sebastianbergmann

PHP/CodeCoverage/Util.php

@@ -122,7 +122,7 @@ public static function getLinesToBeIgnored($filename, $cacheTokens = TRUE)
 
                         // Workaround for the fact the DOC_COMMENT token does
                         // not include the final \n character in its text.
-                        if (trim($lines[$i-1]) == '*/') {
+                        if (substr(trim($lines[$i-1]), -2) == '*/') {
                             self::$ignoredLines[$filename][$i] = TRUE;
                         }
                     }

Tests/PHP/CodeCoverage/FilterTest.php

@@ -107,6 +107,7 @@ protected function setUp()
           TEST_FILES_PATH . 'NotExistingCoveredElementTest.php',
           TEST_FILES_PATH . 'source_with_ignore.php',
           TEST_FILES_PATH . 'source_with_namespace.php',
+          TEST_FILES_PATH . 'source_with_oneline_annotations.php',
           TEST_FILES_PATH . 'source_without_ignore.php',
           TEST_FILES_PATH . 'source_without_namespace.php'
         );

Tests/PHP/CodeCoverage/UtilTest.php

@@ -107,6 +107,9 @@ public function testGetLinesToBeIgnored()
              4 => TRUE,
              5 => TRUE,
              7 => TRUE,
+             8 => TRUE,
+             9 => TRUE,
+            10 => TRUE,
             11 => TRUE,
             12 => TRUE,
             13 => TRUE,
@@ -152,6 +155,31 @@ public function testGetLinesToBeIgnored2()
         );
     }
 
+    /**
+     * @covers PHP_CodeCoverage_Util::getLinesToBeIgnored
+     */
+    public function testGetLinesToBeIgnoredOneLineAnnotations()
+    {
+        $this->assertEquals(
+          array(
+            1 => TRUE,
+            2 => TRUE,
+            7 => TRUE,
+            3 => TRUE,
+            4 => TRUE,
+            5 => TRUE,
+            6 => TRUE,
+            8 => TRUE,
+            9 => TRUE,
+            13 => TRUE,
+          ),
+          PHP_CodeCoverage_Util::getLinesToBeIgnored(
+            TEST_FILES_PATH . 'source_with_oneline_annotations.php'
+          )
+        );
+    }
+
+
     /**
      * @covers PHP_CodeCoverage_Util::percent
      */

Tests/_files/source_with_oneline_annotations.php

@@ -0,0 +1,13 @@
+<?php
+
+/** Docblock */
+interface {
+    public function bar();
+}
+
+class Foo
+{
+    public function bar()
+    {
+    }
+}