Use PHP_Token_INTERFACE::getPackage().

Author: sebastianbergmann

PHP/CodeCoverage/Report/Clover.php

@@ -197,39 +197,35 @@ public function process(PHP_CodeCoverage $coverage, $target = NULL, $name = NULL
                         );
                     }
 
-                    $package = PHP_CodeCoverage_Util::getPackageInformation(
-                      $className, $_class['docblock']
-                    );
-
-                    if (!empty($package['namespace'])) {
-                        $namespace = $package['namespace'];
+                    if (!empty($_class['package']['namespace'])) {
+                        $namespace = $_class['package']['namespace'];
                     }
 
                     $class = $document->createElement('class');
                     $class->setAttribute('name', $className);
                     $class->setAttribute('namespace', $namespace);
 
-                    if (!empty($package['fullPackage'])) {
+                    if (!empty($_class['package']['fullPackage'])) {
                         $class->setAttribute(
-                          'fullPackage', $package['fullPackage']
+                          'fullPackage', $_class['package']['fullPackage']
                         );
                     }
 
-                    if (!empty($package['category'])) {
+                    if (!empty($_class['package']['category'])) {
                         $class->setAttribute(
-                          'category', $package['category']
+                          'category', $_class['package']['category']
                         );
                     }
 
-                    if (!empty($package['package'])) {
+                    if (!empty($_class['package']['package'])) {
                         $class->setAttribute(
-                          'package', $package['package']
+                          'package', $_class['package']['package']
                         );
                     }
 
-                    if (!empty($package['subpackage'])) {
+                    if (!empty($_class['package']['subpackage'])) {
                         $class->setAttribute(
-                          'subpackage', $package['subpackage']
+                          'subpackage', $_class['package']['subpackage']
                         );
                     }
 

PHP/CodeCoverage/Util.php

@@ -328,52 +328,6 @@ public static function getLinesToBeIgnored($filename)
         return self::$ignoredLines[$filename];
     }
 
-    /**
-     * Returns the package information of a user-defined class.
-     *
-     * @param  string $className
-     * @param  string $docComment
-     * @return array
-     */
-    public static function getPackageInformation($className, $docComment)
-    {
-        $result = array(
-          'namespace'   => '',
-          'fullPackage' => '',
-          'category'    => '',
-          'package'     => '',
-          'subpackage'  => ''
-        );
-
-        if (strpos($className, '\\') !== FALSE) {
-            $result['namespace'] = self::arrayToName(
-              explode('\\', $className)
-            );
-        }
-
-        if (preg_match('/@category[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['category'] = $matches[1];
-        }
-
-        if (preg_match('/@package[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['package']     = $matches[1];
-            $result['fullPackage'] = $matches[1];
-        }
-
-        if (preg_match('/@subpackage[\s]+([\.\w]+)/', $docComment, $matches)) {
-            $result['subpackage']   = $matches[1];
-            $result['fullPackage'] .= '.' . $matches[1];
-        }
-
-        if (empty($result['fullPackage'])) {
-            $result['fullPackage'] = self::arrayToName(
-              explode('_', str_replace('\\', '_', $className)), '.'
-            );
-        }
-
-        return $result;
-    }
-
     /**
      * Returns a filesystem safe version of the passed filename.
      * This function does not operate on full paths, just filenames.
@@ -515,26 +469,6 @@ public static function reducePaths(&$files)
         return $commonPath;
     }
 
-    /**
-     * Returns the package information of a user-defined class.
-     *
-     * @param  array  $parts
-     * @param  string $join
-     * @return string
-     */
-    protected static function arrayToName(array $parts, $join = '\\')
-    {
-        $result = '';
-
-        if (count($parts) > 1) {
-            array_pop($parts);
-
-            $result = join($join, $parts);
-        }
-
-        return $result;
-    }
-
     /**
      * @param  string $coveredElement
      * @return array

Tests/PHP/CodeCoverage/UtilTest.php

@@ -253,75 +253,6 @@ public function testGetLinesToBeIgnored2()
         );
     }
 
-    /**
-     * @covers PHP_CodeCoverage_Util::getPackageInformation
-     */
-    public function testGetPackageInformation()
-    {
-        $this->assertEquals(
-          array(
-            'category' => 'Foo',
-            'fullPackage' => 'Bar.Baz',
-            'namespace' => '',
-            'package' => 'Bar',
-            'subpackage' => 'Baz'
-          ),
-          PHP_CodeCoverage_Util::getPackageInformation(
-            'Foo',
-            '/**
- * @category Foo
- * @package Bar
- * @subpackage Baz
- */'
-          )
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage_Util::getPackageInformation
-     * @covers PHP_CodeCoverage_Util::arrayToName
-     */
-    public function testGetPackageInformation2()
-    {
-        $this->assertEquals(
-          array(
-            'category' => 'Foo',
-            'fullPackage' => 'Bar.Baz',
-            'namespace' => 'Foo',
-            'package' => 'Bar',
-            'subpackage' => 'Baz'
-          ),
-          PHP_CodeCoverage_Util::getPackageInformation(
-            'Foo\\Bar',
-            '/**
- * @category Foo
- * @package Bar
- * @subpackage Baz
- */'
-          )
-        );
-    }
-
-    /**
-     * @covers PHP_CodeCoverage_Util::getPackageInformation
-     */
-    public function testGetPackageInformation3()
-    {
-        $this->assertEquals(
-          array(
-            'category' => '',
-            'fullPackage' => '',
-            'namespace' => '',
-            'package' => '',
-            'subpackage' => ''
-          ),
-          PHP_CodeCoverage_Util::getPackageInformation(
-            'Foo',
-            ''
-          )
-        );
-    }
-
     /**
      * @covers PHP_CodeCoverage_Util::reducePaths
      */