Merge branch 'hotfix/zendframework/zendframework#6946-ignore-php-5-5-…

…scalar-class-name-resolution' Close zendframework/zendframework#6946 Close zendframework/zendframework#6814
zendframework · Nov 29, 2014 · 480db95 · 480db95
commit 480db95
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 0 deletions.
diff --git a/src/ClassFileLocator.php b/src/ClassFileLocator.php
@@ -116,6 +116,10 @@ public function accept()
                     break;
                 case $t_trait:
                 case T_CLASS:
+                    // ignore T_CLASS after T_DOUBLE_COLON to allow PHP >=5.5 FQCN scalar resolution
+                    if ($i > 0 && is_array($tokens[$i-1]) && $tokens[$i-1][0] === T_DOUBLE_COLON) {
+                        break;
+                    }
                 case T_INTERFACE:
                     // Abstract class, class, interface or trait found
 

diff --git a/test/ClassFileLocatorTest.php b/test/ClassFileLocatorTest.php
@@ -132,4 +132,22 @@ public function testIterationShouldFindMultipleClassesInMultipleNamespacesInSing
         $this->assertTrue($foundThird);
         $this->assertTrue($foundFourth);
     }
+
+    /**
+     * @group 6946
+     * @group 6814
+     */
+    public function testIterationShouldNotCountFQCNScalarResolutionConstantAsClass()
+    {
+        if (PHP_VERSION_ID < 50500) {
+            $this->markTestSkipped('Only applies to PHP >=5.5');
+        }
+
+        foreach (new ClassFileLocator(__DIR__ .'/TestAsset') as $file) {
+            if (! preg_match('/ClassNameResolutionCompatibility\.php$/', $file->getFilename())) {
+                continue;
+            }
+            $this->assertCount(1, $file->getClasses());
+        }
+    }
 }
diff --git a/test/TestAsset/ClassNameResolutionCompatibility.php b/test/TestAsset/ClassNameResolutionCompatibility.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\File\TestAsset;
+
+use stdClass;
+
+class ClassNameResolutionCompatibility
+{
+    protected $someClassNames = [
+        stdClass::class,
+        stdClass::class,
+    ];
+}