Merge pull request #565 from magento-extensibility/MAGETWO-41996-merchant-beta

[Extensibility] MAGETWO-41996: [GitHub] DI compilation fails on class keyword #1722, MAGETWO-41792: Multiple stores at different paths rendering wrong store base_url

Author: He, Joan(johe)

app/code/Magento/Directory/Test/Unit/Block/CurrencyTest.php

@@ -26,8 +26,8 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->urlBuilder = $this->getMock(
-            '\Magento\Framework\UrlInterface\Proxy',
-            ['getUrl'],
+            '\Magento\Framework\UrlInterface',
+            [],
             [],
             '',
             false

app/code/Magento/Store/etc/di.xml

@@ -92,7 +92,7 @@
         <arguments>
             <argument name="session" xsi:type="object" shared="false">Magento\Framework\Session\Generic\Proxy</argument>
             <argument name="isCustomEntryPoint" xsi:type="init_parameter">Magento\Store\Model\Store::CUSTOM_ENTRY_POINT_PARAM</argument>
-            <argument name="url" xsi:type="object" shared="false">Magento\Framework\UrlInterface\Proxy</argument>
+            <argument name="url" xsi:type="object" shared="false">Magento\Framework\UrlInterface</argument>
         </arguments>
     </type>
     <type name="Magento\Store\Model\StoreManager">
@@ -249,7 +249,7 @@
     </type>
     <type name="Magento\Framework\App\Helper\Context">
         <arguments>
-            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
+            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface</argument>
             <argument name="httpRequest" xsi:type="object">Magento\Framework\App\Request\Http\Proxy</argument>
         </arguments>
     </type>

app/code/Magento/Wishlist/Test/Unit/Helper/DataTest.php

@@ -9,7 +9,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\Data\Helper\PostHelper;
 use Magento\Framework\Registry;
-use Magento\Framework\UrlInterface\Proxy as UrlInterface;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
@@ -69,9 +69,8 @@ public function setUp()
             ->method('getStore')
             ->willReturn($this->store);
 
-        $this->urlBuilder = $this->getMockBuilder('Magento\Framework\UrlInterface\Proxy')
+        $this->urlBuilder = $this->getMockBuilder('Magento\Framework\UrlInterface')
             ->disableOriginalConstructor()
-            ->setMethods(['getUrl'])
             ->getMock();
 
         $this->context = $this->getMockBuilder('Magento\Framework\App\Helper\Context')

app/etc/di.xml

@@ -1128,7 +1128,7 @@
     </type>
     <type name="Magento\Framework\Url\Decoder">
         <arguments>
-            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
+            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface</argument>
         </arguments>
     </type>
 </config>

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

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

lib/internal/Magento/Framework/UrlInterface/Proxy.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));
             }

setup/src/Magento/Setup/Module/Di/Code/Scanner/PhpScanner.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()

setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner/PhpScannerTest.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()
+    {
+    }
+}