MAGETWO-35196: Remove Test\Unit from cached DI configuration, as it brings performance degradation

dkvashninbay · dkvashninbay · commit 90bbfe5fa302 · 2015-03-18T16:05:15.000+02:00
- refactored classes scanner decorators to match new interface
diff --git a/dev/tools/Magento/Tools/Di/App/Task/Operation/Area.php b/dev/tools/Magento/Tools/Di/App/Task/Operation/Area.php
@@ -18,7 +18,7 @@ class Area implements OperationInterface
     private $areaList;
 
     /**
-     * @var \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area
+     * @var \Magento\Tools\Di\Code\Reader\Decorator\Area
      */
     private $areaInstancesNamesList;
 
@@ -44,15 +44,15 @@ class Area implements OperationInterface
 
     /**
      * @param App\AreaList $areaList
-     * @param \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area $areaInstancesNamesList
+     * @param \Magento\Tools\Di\Code\Reader\Decorator\Area $areaInstancesNamesList
      * @param Config\Reader $configReader
      * @param Config\WriterInterface $configWriter
      * @param \Magento\Tools\Di\Compiler\Config\ModificationChain $modificationChain
      * @param array $data
      */
     public function __construct(
         App\AreaList $areaList,
-        \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area $areaInstancesNamesList,
+        \Magento\Tools\Di\Code\Reader\Decorator\Area $areaInstancesNamesList,
         Config\Reader $configReader,
         Config\WriterInterface $configWriter,
         Config\ModificationChain $modificationChain,
diff --git a/dev/tools/Magento/Tools/Di/App/Task/Operation/InterceptionCache.php b/dev/tools/Magento/Tools/Di/App/Task/Operation/InterceptionCache.php
@@ -20,18 +20,18 @@ class InterceptionCache implements OperationInterface
     private $configInterface;
 
     /**
-     * @var \Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions
+     * @var \Magento\Tools\Di\Code\Reader\Decorator\Interceptions
      */
     private $interceptionsInstancesNamesList;
 
     /**
      * @param \Magento\Framework\Interception\Config\Config $configInterface
-     * @param \Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions $interceptionsInstancesNamesList
+     * @param \Magento\Tools\Di\Code\Reader\Decorator\Interceptions $interceptionsInstancesNamesList
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\Interception\Config\Config $configInterface,
-        \Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions $interceptionsInstancesNamesList,
+        \Magento\Tools\Di\Code\Reader\Decorator\Interceptions $interceptionsInstancesNamesList,
         array $data = []
     ) {
         $this->configInterface = $configInterface;
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScanner.php
@@ -8,7 +8,7 @@
 use Magento\Framework\Filesystem\FilesystemException;
 use Zend\Code\Scanner\FileScanner;
 
-class ClassesScanner
+class ClassesScanner implements ClassesScannerInterface
 {
     /**
      * @var array
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScannerInterface.php b/dev/tools/Magento/Tools/Di/Code/Reader/ClassesScannerInterface.php
@@ -6,11 +6,11 @@
 namespace Magento\Tools\Di\Code\Reader;
 
 /**
- * Interface InstancesNamesList
+ * Interface ClassesScannerInterface
  *
  * @package Magento\Tools\Di\Code\Reader
  */
-interface InstancesNamesListInterface
+interface ClassesScannerInterface
 {
 
     /**
@@ -21,4 +21,12 @@ interface InstancesNamesListInterface
      * @return array
      */
     public function getList($path);
+
+    /**
+     * Adds exclude patterns
+     *
+     * @param array $excludePatterns
+     * @return void
+     */
+    public function addExcludePatterns(array $excludePatterns);
 }
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Area.php b/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Area.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tools\Di\Code\Reader\InstancesNamesList;
+namespace Magento\Tools\Di\Code\Reader\Decorator;
 
 use Magento\Tools\Di\Code\Reader\ClassesScanner;
 use Magento\Tools\Di\Code\Reader\ClassReaderDecorator;
@@ -12,9 +12,9 @@
 /**
  * Class Area
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
-class Area implements \Magento\Tools\Di\Code\Reader\InstancesNamesListInterface
+class Area implements \Magento\Tools\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var ClassReaderDecorator
@@ -38,6 +38,16 @@ public function __construct(
         $this->classesScanner = $classesScanner;
     }
 
+    /**
+     * Adds exclude patterns
+     *
+     * @param array $excludePatterns
+     * @return void
+     */
+    public function addExcludePatterns(array $excludePatterns)
+    {
+    }
+
     /**
      * Retrieves list of classes for given path
      *
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Directory.php b/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Directory.php
@@ -3,16 +3,16 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tools\Di\Code\Reader\InstancesNamesList;
+namespace Magento\Tools\Di\Code\Reader\Decorator;
 
 use Magento\Tools\Di\Compiler\Log\Log;
 
 /**
  * Class Directory
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
-class Directory implements \Magento\Tools\Di\Code\Reader\InstancesNamesListInterface
+class Directory implements \Magento\Tools\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var string
@@ -80,6 +80,16 @@ public function errorHandler($errorNumber, $msg)
         $this->log->add(Log::COMPILATION_ERROR, $this->current, '#' . $errorNumber . ' ' . $msg);
     }
 
+    /**
+     * Adds exclude patterns
+     *
+     * @param array $excludePatterns
+     * @return void
+     */
+    public function addExcludePatterns(array $excludePatterns)
+    {
+    }
+
     /**
      * Retrieves list of classes for given path
      *
diff --git a/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Interceptions.php b/dev/tools/Magento/Tools/Di/Code/Reader/Decorator/Interceptions.php
@@ -3,16 +3,16 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tools\Di\Code\Reader\InstancesNamesList;
+namespace Magento\Tools\Di\Code\Reader\Decorator;
 
 use Magento\Tools\Di\Compiler\Log\Log;
 
 /**
  * Class Interceptions
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
-class Interceptions implements \Magento\Tools\Di\Code\Reader\InstancesNamesListInterface
+class Interceptions implements \Magento\Tools\Di\Code\Reader\ClassesScannerInterface
 {
     /**
      * @var \Magento\Tools\Di\Code\Reader\ClassReaderDecorator
@@ -59,6 +59,16 @@ public function __construct(
         $this->validator->add($contextAggregationValidator);
     }
 
+    /**
+     * Adds exclude patterns
+     *
+     * @param array $excludePatterns
+     * @return void
+     */
+    public function addExcludePatterns(array $excludePatterns)
+    {
+    }
+
     /**
      * Retrieves list of classes for given path
      *
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/AreaTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/AreaTest.php
@@ -19,7 +19,7 @@ class AreaTest extends \PHPUnit_Framework_TestCase
     private $areaListMock;
 
     /**
-     * @var \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Tools\Di\Code\Reader\Decorator\Area | \PHPUnit_Framework_MockObject_MockObject
      */
     private $areaInstancesNamesList;
 
@@ -43,7 +43,7 @@ protected function setUp()
         $this->areaListMock = $this->getMockBuilder('Magento\Framework\App\AreaList')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->areaInstancesNamesList = $this->getMockBuilder('\Magento\Tools\Di\Code\Reader\InstancesNamesList\Area')
+        $this->areaInstancesNamesList = $this->getMockBuilder('\Magento\Tools\Di\Code\Reader\Decorator\Area')
             ->disableOriginalConstructor()
             ->getMock();
         $this->configReaderMock = $this->getMockBuilder('Magento\Tools\Di\Compiler\Config\Reader')
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/App/Task/InterceptionCacheTest.php
@@ -15,7 +15,7 @@ class InterceptionCacheTest extends \PHPUnit_Framework_TestCase
     private $configMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Tools\Di\Code\Reader\Decorator\Interceptions
      */
     private $interceptionsListMock;
 
@@ -26,7 +26,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->interceptionsListMock = $this->getMockBuilder(
-            'Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions'
+            'Magento\Tools\Di\Code\Reader\Decorator\Interceptions'
         )
             ->setMethods([])
             ->disableOriginalConstructor()
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/AreaTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/AreaTest.php
@@ -5,12 +5,12 @@
  */
 namespace Magento\Tools\Di\Test\Unit\Code\Reader\InstancesNamesList;
 
-use \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area;
+use \Magento\Tools\Di\Code\Reader\Decorator\Area;
 
 /**
  * Class AreaTest
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
 class AreaTest extends \PHPUnit_Framework_TestCase
 {
@@ -41,7 +41,7 @@ protected function setUp()
             ->setMethods(['getConstructor'])
             ->getMock();
 
-        $this->model = new \Magento\Tools\Di\Code\Reader\InstancesNamesList\Area(
+        $this->model = new \Magento\Tools\Di\Code\Reader\Decorator\Area(
             $this->classesScannerMock,
             $this->classReaderDecoratorMock
         );
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/DirectoryTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/DirectoryTest.php
@@ -10,7 +10,7 @@
 /**
  * Class DirectoryTest
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
 class DirectoryTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +25,7 @@ class DirectoryTest extends \PHPUnit_Framework_TestCase
     private $classReaderMock;
 
     /**
-     * @var \Magento\Tools\Di\Code\Reader\InstancesNamesList\Directory
+     * @var \Magento\Tools\Di\Code\Reader\Decorator\Directory
      */
     private $model;
 
@@ -61,7 +61,7 @@ protected function setUp()
             ->setMethods(['validate'])
             ->getMock();
 
-        $this->model = new \Magento\Tools\Di\Code\Reader\InstancesNamesList\Directory(
+        $this->model = new \Magento\Tools\Di\Code\Reader\Decorator\Directory(
             $this->logMock,
             $this->classReaderMock,
             $this->classesScanner,
diff --git a/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/InterceptionsTest.php b/dev/tools/Magento/Tools/Di/Test/Unit/Code/Reader/InstancesNamesList/InterceptionsTest.php
@@ -10,7 +10,7 @@
 /**
  * Class InterceptionsTest
  *
- * @package Magento\Tools\Di\Code\Reader\InstancesNamesList
+ * @package Magento\Tools\Di\Code\Reader\Decorator
  */
 class InterceptionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,7 +25,7 @@ class InterceptionsTest extends \PHPUnit_Framework_TestCase
     private $classReaderMock;
 
     /**
-     * @var \Magento\Tools\Di\Code\Reader\InstancesNamesList\Directory
+     * @var \Magento\Tools\Di\Code\Reader\Decorator\Directory
      */
     private $model;
 
@@ -61,7 +61,7 @@ protected function setUp()
             ->setMethods(['validate', 'add'])
             ->getMock();
 
-        $this->model = new \Magento\Tools\Di\Code\Reader\InstancesNamesList\Interceptions(
+        $this->model = new \Magento\Tools\Di\Code\Reader\Decorator\Interceptions(
             $this->classesScanner,
             $this->classReaderMock,
             $this->validatorMock,
diff --git a/dev/tools/Magento/Tools/Di/compiler.php b/dev/tools/Magento/Tools/Di/compiler.php
@@ -164,7 +164,7 @@
     $classesScanner = new \Magento\Tools\Di\Code\Reader\ClassesScanner();
     $classesScanner->addExcludePatterns($fileExcludePatterns);
 
-    $directoryInstancesNamesList = new \Magento\Tools\Di\Code\Reader\InstancesNamesList\Directory(
+    $directoryInstancesNamesList = new \Magento\Tools\Di\Code\Reader\Decorator\Directory(
         $log,
         new \Magento\Framework\Code\Reader\ClassReader(),
         $classesScanner,

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`use Magento\Framework\Filesystem\FilesystemException;`
`9`	`9`	`use Zend\Code\Scanner\FileScanner;`
`10`	`10`
`11`		`-class ClassesScanner`
	`11`	`+class ClassesScanner implements ClassesScannerInterface`
`12`	`12`	`{`
`13`	`13`	`/**`
`14`	`14`	`* @var array`