bug #15376 [ClassMapGenerator] Skip ::class constant (WouterJ)

This PR was merged into the 2.3 branch. Discussion ---------- [ClassMapGenerator] Skip ::class constant | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15351 | License | MIT | Doc PR | - Commits ------- a336f0e Skip ::class constant
symfony · Aug 1, 2015 · 3b6d2a3 · 3b6d2a3
2 parents 9293c43 + a336f0e
commit 3b6d2a3
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/Symfony/Component/ClassLoader/ClassMapGenerator.php b/src/Symfony/Component/ClassLoader/ClassMapGenerator.php
@@ -118,6 +118,25 @@ private static function findClasses($path)
                 case T_CLASS:
                 case T_INTERFACE:
                 case SYMFONY_TRAIT:
+                    // Skip usage of ::class constant
+                    $isClassConstant = false;
+                    for ($j = $i - 1; $j > 0; --$j) {
+                        if (is_string($tokens[$j])) {
+                            break;
+                        }
+
+                        if (T_DOUBLE_COLON === $tokens[$j][0]) {
+                            $isClassConstant = true;
+                            break;
+                        } elseif (!in_array($tokens[$j][0], array(T_WHITESPACE, T_DOC_COMMENT, T_COMMENT))) {
+                            break;
+                        }
+                    }
+
+                    if ($isClassConstant) {
+                        continue;
+                    }
+
                     // Find the classname
                     while (($t = $tokens[++$i]) && is_array($t)) {
                         if (T_STRING === $t[0]) {

diff --git a/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php b/src/Symfony/Component/ClassLoader/Tests/ClassMapGeneratorTest.php
@@ -47,7 +47,7 @@ private function clean($file)
     /**
      * @dataProvider getTestCreateMapTests
      */
-    public function testDump($directory, $expected)
+    public function testDump($directory)
     {
         $this->prepare_workspace();
 
@@ -115,6 +115,12 @@ public function getTestCreateMapTests()
             ));
         }
 
+        if (PHP_VERSION_ID >= 50500) {
+            $data[] = array(__DIR__.'/Fixtures/php5.5', array(
+                'ClassCons\\Foo' => __DIR__.'/Fixtures/php5.5/class_cons.php',
+            ));
+        }
+
         return $data;
     }
 

diff --git a/src/Symfony/Component/ClassLoader/Tests/Fixtures/php5.5/class_cons.php b/src/Symfony/Component/ClassLoader/Tests/Fixtures/php5.5/class_cons.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace ClassCons;
+
+class Foo
+{
+    public function __construct()
+    {
+        \Foo\TBar/* foo */::class;
+    }
+}