Merge pull request #259 from magento-extensibility/MAGETWO-46445-correct-erroneous-negative-recommendation

Melnikov, Igor(imelnikov) · Melnikov, Igor(imelnikov) · commit 44f284d44548 · 2015-12-22T19:32:59.000-06:00
[Extensibility] Bug fixes
diff --git a/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php b/app/code/Magento/Config/Model/Config/Structure/Element/Group/Proxy.php
@@ -5,7 +5,8 @@
  */
 namespace Magento\Config\Model\Config\Structure\Element\Group;
 
-class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group
+class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group implements
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object manager
diff --git a/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php b/app/code/Magento/Config/Model/Config/Structure/Search/Proxy.php
@@ -5,7 +5,9 @@
  */
 namespace Magento\Config\Model\Config\Structure\Search;
 
-class Proxy implements \Magento\Config\Model\Config\Structure\SearchInterface
+class Proxy implements
+    \Magento\Config\Model\Config\Structure\SearchInterface,
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object manager
diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php
@@ -161,7 +161,7 @@ protected function compile(
                 DirectoryList::DI,
             ]
         );
-        $cmd = $this->functionCallPath . 'setup:di:compile-multi-tenant';
+        $cmd = $this->functionCallPath . 'setup:di:compile';
 
         /**
          * exec command is necessary for now to isolate the autoloaders in the compiler from the memory state
diff --git a/app/code/Magento/PageCache/Model/System/Config/Source/Application.php b/app/code/Magento/PageCache/Model/System/Config/Source/Application.php
@@ -9,11 +9,13 @@
  */
 namespace Magento\PageCache\Model\System\Config\Source;
 
+use Magento\Framework\Option\ArrayInterface;
+use Magento\PageCache\Model\Config;
+
 /**
  * Class Application
- *
  */
-class Application implements \Magento\Framework\Option\ArrayInterface
+class Application implements ArrayInterface
 {
     /**
      * Options getter
@@ -24,12 +26,12 @@ public function toOptionArray()
     {
         return [
             [
-                'value' => \Magento\PageCache\Model\Config::BUILT_IN,
-                'label' => __('Built-in Application (Not Recommended for Production Use)')
+                'value' => Config::BUILT_IN,
+                'label' => __('Built-in Cache')
             ],
             [
-                'value' => \Magento\PageCache\Model\Config::VARNISH,
-                'label' => __('Varnish Caching')
+                'value' => Config::VARNISH,
+                'label' => __('Varnish Cache (Recommended)')
             ]
         ];
     }
@@ -42,9 +44,8 @@ public function toOptionArray()
     public function toArray()
     {
         return [
-            \Magento\PageCache\Model\Config::BUILT_IN =>
-                __('Built-in Application (Not Recommended for Production Use)'),
-            \Magento\PageCache\Model\Config::VARNISH => __('Varnish Caching')
+            Config::BUILT_IN => __('Built-in Cache'),
+            Config::VARNISH => __('Varnish Cache (Recommended)')
         ];
     }
 }
diff --git a/app/code/Magento/PageCache/i18n/en_US.csv b/app/code/Magento/PageCache/i18n/en_US.csv
@@ -1,7 +1,7 @@
 "Export VCL","Export VCL"
 "Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero.","Ttl value ""%1"" is not valid. Please use only numbers equal or greater than zero."
-"Built-in Application (Not Recommended for Production Use)","Built-in Application (Not Recommended for Production Use)"
-"Varnish Caching","Varnish Caching"
+"Built-in Cache","Built-in Cache"
+"Varnish Cache (Recommended)","Varnish Cache (Recommended)"
 "Full Page Cache","Full Page Cache"
 "Caching Application","Caching Application"
 "Varnish Configuration","Varnish Configuration"
diff --git a/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php b/dev/tests/functional/tests/app/Magento/Swagger/Test/Page/SwaggerUiPage.php
@@ -60,7 +60,7 @@ public function __construct(BrowserInterface $browser)
      */
     public function open()
     {
-        $this->browser->open($this->url);
+        $this->openSwaggerUrl();
         $this->waitForPageToLoad();
     }
 
@@ -209,4 +209,29 @@ function () use ($browser, $selector, $strategy) {
             }
         );
     }
+
+    /**
+     * Wait to open swagger url
+     *
+     * This is to work around an issue with selenium web driver randomly returns browser url as "about:blank"
+     * when open swagger page
+     *
+     * @return bool|null
+     */
+    private function openSwaggerUrl()
+    {
+        $browser = $this->browser;
+        $pattern = self::MCA;
+        return $browser->waitUntil(
+            function () use ($browser, $pattern) {
+                try {
+                    $url = $_ENV['app_frontend_url'] . $pattern;
+                    $browser->open($url);
+                    return true;
+                } catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
+                    return false;
+                }
+            }
+        );
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample b/dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample
@@ -7,7 +7,7 @@ namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace;
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace
+class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace implements \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/App/AreaList/Proxy.php b/lib/internal/Magento/Framework/App/AreaList/Proxy.php
@@ -7,7 +7,8 @@
  */
 namespace Magento\Framework\App\AreaList;
 
-class Proxy extends \Magento\Framework\App\AreaList
+class Proxy extends \Magento\Framework\App\AreaList implements
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/App/Cache/Proxy.php b/lib/internal/Magento/Framework/App/Cache/Proxy.php
@@ -3,15 +3,17 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\App\Cache;
+
+use \Magento\Framework\App\CacheInterface;
+use \Magento\Framework\ObjectManager\NoninterceptableInterface;
 
 /**
  * System cache proxy model
  */
-namespace Magento\Framework\App\Cache;
-
-use Magento\Framework\App\CacheInterface;
-
-class Proxy implements CacheInterface
+class Proxy implements
+    CacheInterface,
+    NoninterceptableInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
diff --git a/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php b/lib/internal/Magento/Framework/App/Route/ConfigInterface/Proxy.php
@@ -10,7 +10,9 @@
 /**
  * Proxy class for \Magento\Framework\App\ResourceConnection
  */
-class Proxy implements \Magento\Framework\App\Route\ConfigInterface
+class Proxy implements
+    \Magento\Framework\App\Route\ConfigInterface,
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php b/lib/internal/Magento/Framework/DataObject/Copy/Config/Data/Proxy.php
@@ -8,7 +8,8 @@
 /**
  * Proxy class for @see \Magento\Framework\DataObject\Copy\Config\Data
  */
-class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data
+class Proxy extends \Magento\Framework\DataObject\Copy\Config\Data implements
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php b/lib/internal/Magento/Framework/Interception/ObjectManager/Config/Developer.php
@@ -8,9 +8,31 @@
 namespace Magento\Framework\Interception\ObjectManager\Config;
 
 use Magento\Framework\Interception\ObjectManager\ConfigInterface;
+use Magento\Framework\ObjectManager\DefinitionInterface;
+use Magento\Framework\ObjectManager\RelationsInterface;
+use Magento\Framework\ObjectManager\InterceptableValidator;
 
 class Developer extends \Magento\Framework\ObjectManager\Config\Config implements ConfigInterface
 {
+    /**
+     * @var InterceptableValidator
+     */
+    private $interceptableValidator;
+
+    /**
+     * @param RelationsInterface $relations
+     * @param DefinitionInterface $definitions
+     * @param InterceptableValidator $interceptableValidator
+     */
+    public function __construct(
+        RelationsInterface $relations = null,
+        DefinitionInterface $definitions = null,
+        InterceptableValidator $interceptableValidator = null
+    ) {
+        $this->interceptableValidator = $interceptableValidator ?: new InterceptableValidator();
+        parent::__construct($relations, $definitions);
+    }
+
     /**
      * @var \Magento\Framework\Interception\ConfigInterface
      */
@@ -36,7 +58,9 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
     public function getInstanceType($instanceName)
     {
         $type = parent::getInstanceType($instanceName);
-        if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)) {
+        if ($this->interceptionConfig && $this->interceptionConfig->hasPlugins($instanceName)
+            && $this->interceptableValidator->validate($instanceName)
+        ) {
             return $type . '\\Interceptor';
         }
         return $type;
diff --git a/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php b/lib/internal/Magento/Framework/Mview/Config/Data/Proxy.php
@@ -8,7 +8,8 @@
 /**
  * Proxy class for \Magento\Framework\Mview\Config\Data
  */
-class Proxy extends \Magento\Framework\Mview\Config\Data
+class Proxy extends \Magento\Framework\Mview\Config\Data implements
+    \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Code/Generator/Proxy.php
@@ -14,6 +14,11 @@ class Proxy extends \Magento\Framework\Code\Generator\EntityAbstract
      */
     const ENTITY_TYPE = 'proxy';
 
+    /**
+     * Marker interface
+     */
+    const NON_INTERCEPTABLE_INTERFACE = '\Magento\Framework\ObjectManager\NoninterceptableInterface';
+
     /**
      * @param string $modelClassName
      * @return string
@@ -131,9 +136,10 @@ protected function _generateCode()
         $reflection = new \ReflectionClass($typeName);
 
         if ($reflection->isInterface()) {
-            $this->_classGenerator->setImplementedInterfaces([$typeName]);
+            $this->_classGenerator->setImplementedInterfaces([$typeName, self::NON_INTERCEPTABLE_INTERFACE]);
         } else {
             $this->_classGenerator->setExtendedClass($typeName);
+            $this->_classGenerator->setImplementedInterfaces([self::NON_INTERCEPTABLE_INTERFACE]);
         }
         return parent::_generateCode();
     }
diff --git a/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php b/lib/internal/Magento/Framework/ObjectManager/InterceptableValidator.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager;
+
+class InterceptableValidator
+{
+    /**
+     * @param string $className
+     * @return bool
+     */
+    public function validate($className)
+    {
+        return !$this->isInterceptor($className) && $this->isInterceptable($className);
+    }
+
+    /**
+     *
+     * Check if instance type is interceptor
+     *
+     * @param string $instanceName
+     * @return bool
+     */
+    private function isInterceptor($instanceName)
+    {
+        return $this->endsWith($instanceName, '\Interceptor');
+    }
+
+    /**
+     *
+     * Check if instance type is interceptable
+     *
+     * @param string $instanceName
+     * @return bool
+     */
+    private function isInterceptable($instanceName)
+    {
+        return !is_subclass_of(
+            $instanceName,
+            \Magento\Framework\ObjectManager\Code\Generator\Proxy::NON_INTERCEPTABLE_INTERFACE
+        );
+    }
+
+    /**
+     * Check if a string ends with a substring
+     *
+     * @param string $haystack
+     * @param string $needle
+     * @return bool
+     */
+    private function endsWith($haystack, $needle)
+    {
+        // Search forward starting from end minus needle length characters
+        $temp = strlen($haystack) - strlen($needle);
+        return $needle === '' || ($temp >= 0 && strpos($haystack, $needle, $temp) !== false);
+    }
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php b/lib/internal/Magento/Framework/ObjectManager/NoninterceptableInterface.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager;
+
+/**
+ * Marker interface, used to identify proxies for which we don't need to generate interceptors
+ */
+interface NoninterceptableInterface
+{
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Code/Generator/_files/SampleProxy.txt
@@ -3,7 +3,7 @@ namespace Magento\Framework\ObjectManager\Code\Generator;
 /**
  * Proxy class for @see \Magento\Framework\ObjectManager\Code\Generator\Sample
  */
-class Sample_Proxy extends \Magento\Framework\ObjectManager\Code\Generator\Sample
+class Sample_Proxy extends \Magento\Framework\ObjectManager\Code\Generator\Sample implements \Magento\Framework\ObjectManager\NoninterceptableInterface
 {
     /**
      * Object Manager instance
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/InterceptableValidatorTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/InterceptableValidatorTest.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\ObjectManager\Test\Unit;
+
+require __DIR__ . '/_files/Proxy.php';
+
+class InterceptableValidatorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testValidate()
+    {
+        $interceptableValidator = new \Magento\Framework\ObjectManager\InterceptableValidator();
+        $this->assertFalse(
+            $interceptableValidator->validate(
+                'Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper\Interceptor'
+            )
+        );
+        $this->assertFalse(
+            $interceptableValidator->validate(
+                'Magento\Test\Di\Proxy'
+            )
+        );
+    }
+}
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Proxy.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/_files/Proxy.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Test\Di;
+
+class Proxy implements \Magento\Framework\ObjectManager\NoninterceptableInterface
+{
+}
diff --git a/lib/internal/Magento/Framework/Translate/Inline/Proxy.php b/lib/internal/Magento/Framework/Translate/Inline/Proxy.php
diff --git a/lib/internal/Magento/Framework/View/Layout/Proxy.php b/lib/internal/Magento/Framework/View/Layout/Proxy.php
diff --git a/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php b/setup/src/Magento/Setup/Console/Command/DiCompileMultiTenantCommand.php
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php b/setup/src/Magento/Setup/Module/Di/Code/Generator/InterceptionConfigurationBuilder.php
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/InheritanceInterceptorScanner.php
diff --git a/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php b/setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Generator/InterceptionConfigurationBuilderTest.php

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`*/`
`6`	`6`	`namespace Magento\Config\Model\Config\Structure\Element\Group;`
`7`	`7`
`8`		`-class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group`
	`8`	`+class Proxy extends \Magento\Config\Model\Config\Structure\Element\Group implements`
	`9`	`+ \Magento\Framework\ObjectManager\NoninterceptableInterface`
`9`	`10`	`{`
`10`	`11`	`/**`
`11`	`12`	`* Object manager`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ protected function compile(`
`161`	`161`	`DirectoryList::DI,`
`162`	`162`	`]`
`163`	`163`	`);`
`164`		`- $cmd = $this->functionCallPath . 'setup:di:compile-multi-tenant';`
	`164`	`+ $cmd = $this->functionCallPath . 'setup:di:compile';`
`165`	`165`
`166`	`166`	`/**`
`167`	`167`	`* exec command is necessary for now to isolate the autoloaders in the compiler from the memory state`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,13 @@`
`9`	`9`	`*/`
`10`	`10`	`namespace Magento\PageCache\Model\System\Config\Source;`
`11`	`11`
	`12`	`+use Magento\Framework\Option\ArrayInterface;`
	`13`	`+use Magento\PageCache\Model\Config;`
	`14`	`+`
`12`	`15`	`/**`
`13`	`16`	`* Class Application`
`14`		`- *`
`15`	`17`	`*/`
`16`		`-class Application implements \Magento\Framework\Option\ArrayInterface`
	`18`	`+class Application implements ArrayInterface`
`17`	`19`	`{`
`18`	`20`	`/**`
`19`	`21`	`* Options getter`
`@@ -24,12 +26,12 @@ public function toOptionArray()`
`24`	`26`	`{`
`25`	`27`	`return [`
`26`	`28`	`[`
`27`		`- 'value' => \Magento\PageCache\Model\Config::BUILT_IN,`
`28`		`- 'label' => __('Built-in Application (Not Recommended for Production Use)')`
	`29`	`+ 'value' => Config::BUILT_IN,`
	`30`	`+ 'label' => __('Built-in Cache')`
`29`	`31`	`],`
`30`	`32`	`[`
`31`		`- 'value' => \Magento\PageCache\Model\Config::VARNISH,`
`32`		`- 'label' => __('Varnish Caching')`
	`33`	`+ 'value' => Config::VARNISH,`
	`34`	`+ 'label' => __('Varnish Cache (Recommended)')`
`33`	`35`	`]`
`34`	`36`	`];`
`35`	`37`	`}`
`@@ -42,9 +44,8 @@ public function toOptionArray()`
`42`	`44`	`public function toArray()`
`43`	`45`	`{`
`44`	`46`	`return [`
`45`		`- \Magento\PageCache\Model\Config::BUILT_IN =>`
`46`		`- __('Built-in Application (Not Recommended for Production Use)'),`
`47`		`- \Magento\PageCache\Model\Config::VARNISH => __('Varnish Caching')`
	`47`	`+ Config::BUILT_IN => __('Built-in Cache'),`
	`48`	`+ Config::VARNISH => __('Varnish Cache (Recommended)')`
`48`	`49`	`];`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace;`
`7`	`7`	`* Copyright © 2015 Magento. All rights reserved.`
`8`	`8`	`* See COPYING.txt for license details.`
`9`	`9`	`*/`
`10`		`-class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace`
	`10`	`+class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespace implements \Magento\Framework\ObjectManager\NoninterceptableInterface`
`11`	`11`	`{`
`12`	`12`	`/**`
`13`	`13`	`* Object Manager instance`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,8 @@`
`7`	`7`	`*/`
`8`	`8`	`namespace Magento\Framework\App\AreaList;`
`9`	`9`
`10`		`-class Proxy extends \Magento\Framework\App\AreaList`
	`10`	`+class Proxy extends \Magento\Framework\App\AreaList implements`
	`11`	`+ \Magento\Framework\ObjectManager\NoninterceptableInterface`
`11`	`12`	`{`
`12`	`13`	`/**`
`13`	`14`	`* Object Manager instance`