Cleanup.

Author: sebastianbergmann

ChangeLog.markdown

@@ -6,5 +6,5 @@ This is the list of changes for the PHP_CodeCoverage 1.2 release series.
 PHP_CodeCoverage 1.2.0
 ----------------------
 
+* The new `@coversDefaultClass` annotation enables short `@covers` annotations when working with long class names or namespaces.
 * PHP_CodeCoverage 1.2 is only supported on PHP 5.3.3 (or later) and PHP 5.4.0 (or later) is highly recommended.
-* Introduce the `@coversDefaultClass` annotation. It enables short @covers annotations when working with long class names or namespaces.

PHP/CodeCoverage/Util.php

@@ -69,7 +69,12 @@ class PHP_CodeCoverage_Util
     /**
      * @var string
      */
-    const REGEX = '(@covers\s+(?P<coveredElement>.*?)\s*$)m';
+    const COVERS_REGEX = '(@covers\s+(?P<coveredElement>.*?)\s*$)m';
+
+    /**
+     * @var string
+     */
+    const COVERS_DEFAULT_CLASS_REGEX = '(@coversDefaultClass\s+(?P<coveredClass>.*?)\s*$)m';
 
     /**
      * @var array
@@ -167,25 +172,25 @@ public static function getLinesToBeCovered($className, $methodName)
         }
 
         $classShortcut = preg_match_all(
-          '(@coversDefaultClass\s+(?P<coveredClass>.*?)\s*$)m',
-          $class->getDocComment(),
-          $matches
+          self::COVERS_DEFAULT_CLASS_REGEX, $class->getDocComment(), $matches
         );
-        if($classShortcut) {
-            if($classShortcut > 1) {
+
+        if ($classShortcut) {
+            if ($classShortcut > 1) {
                 throw new PHP_CodeCoverage_Exception(
                   sprintf(
                     'More than one @coversClass annotation in class or interface "%s".',
                     $className
                   )
                 );
             }
+
             $classShortcut = $matches['coveredClass'][0];
-        } 
+        }
 
-        if (preg_match_all(self::REGEX, $docComment, $matches)) {
+        if (preg_match_all(self::COVERS_REGEX, $docComment, $matches)) {
             foreach ($matches['coveredElement'] as $coveredElement) {
-                if($classShortcut && strncmp($coveredElement, '::', 2) === 0) {
+                if ($classShortcut && strncmp($coveredElement, '::', 2) === 0) {
                     $coveredElement = $classShortcut . $coveredElement;
                 }