MAGETWO-41996: [GitHub] DI compilation fails on class keyword #1722

magento · Aug 28, 2015 · 623e201 · 623e201
1 parent 18b6326
commit 623e201
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 6 deletions.
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/namespace.txt
@@ -98,3 +98,4 @@ setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/M
 setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Helper/Test.php
 setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Element.php
 setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/ElementFactory.php
+setup/src/Magento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Model/DoubleColon.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/reference.txt
@@ -70,4 +70,5 @@ Model3
 \Magento\Mtf\Client\Element
 \Magento\Mtf\TestSuite\AppState
 \Magento\Framework\A
-\Magento\Framework\B
+\Magento\Framework\B
+DoubleColon
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.php
@@ -227,17 +227,17 @@ protected function _fetchClasses($namespace, $tokenIterator, $count, $tokens)
     protected function _getDeclaredClasses($file)
     {
         $classes = [];
-        $namespace = "";
+        $namespace = '';
         $tokens = token_get_all(file_get_contents($file));
         $count = count($tokens);
 
         for ($tokenIterator = 0; $tokenIterator < $count; $tokenIterator++) {
-            if ($tokens[$tokenIterator][0] === T_NAMESPACE) {
+            if ($tokens[$tokenIterator][0] == T_NAMESPACE) {
                 $namespace .= $this->_fetchNamespace($tokenIterator, $count, $tokens);
             }
 
-            if ($tokens[$tokenIterator][0] === T_CLASS
-                || $tokens[$tokenIterator][0] === T_INTERFACE
+            if (($tokens[$tokenIterator][0] == T_CLASS || $tokens[$tokenIterator][0] == T_INTERFACE)
+                && $tokens[$tokenIterator - 1][0] != T_DOUBLE_COLON
             ) {
                 $classes = array_merge($classes, $this->_fetchClasses($namespace, $tokenIterator, $count, $tokens));
             }

diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.php
@@ -7,6 +7,8 @@
 
 require_once __DIR__ . '/../../_files/app/code/Magento/SomeModule/Helper/Test.php';
 require_once __DIR__ . '/../../_files/app/code/Magento/SomeModule/ElementFactory.php';
+require_once __DIR__ . '/../../_files/app/code/Magento/SomeModule/Model/DoubleColon.php';
+
 class PhpScannerTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -35,7 +37,10 @@ protected function setUp()
             $this->_logMock = $this->getMock('\Magento\Setup\Module\Di\Compiler\Log\Log', [], [], '', false)
         );
         $this->_testDir = str_replace('\\', '/', realpath(__DIR__ . '/../../') . '/_files');
-        $this->_testFiles = [$this->_testDir . '/app/code/Magento/SomeModule/Helper/Test.php'];
+        $this->_testFiles = [
+            $this->_testDir . '/app/code/Magento/SomeModule/Helper/Test.php',
+            $this->_testDir . '/app/code/Magento/SomeModule/Model/DoubleColon.php'
+        ];
     }
 
     public function testCollectEntities()

diff --git a/...agento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Model/DoubleColon.php b/...agento/Setup/Test/Unit/Module/Di/_files/app/code/Magento/SomeModule/Model/DoubleColon.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\SomeModule\Model;
+
+class DoubleColon
+{
+    public function __construct()
+    {
+        DoubleColon::class;
+    }
+
+    public function method()
+    {
+    }
+}