MAGETWO-33080: Preferences, Shared Instance creation and Compiled Factory optimization

- fixed codestyles
- shared instances array is passed by a reference

Author: dkvashninbay

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/ObjectManagerTest.php

@@ -56,31 +56,32 @@ function ($className) {
             )
         );
 
+        $sharedInstances = [
+            'Magento\Framework\App\Cache\Type\Config' => $cache,
+            'Magento\Framework\App\ObjectManager\ConfigLoader' => $configLoader,
+            'Magento\Framework\App\ObjectManager\ConfigCache' => $configCache,
+            'Magento\Framework\Config\ReaderInterface' => $this->getMock(
+                'Magento\Framework\Config\ReaderInterface'
+            ),
+            'Magento\Framework\Config\ScopeInterface' => $this->getMock('Magento\Framework\Config\ScopeInterface'),
+            'Magento\Framework\Config\CacheInterface' => $this->getMock('Magento\Framework\Config\CacheInterface'),
+            'Magento\Framework\Cache\FrontendInterface' =>
+                $this->getMock('Magento\Framework\Cache\FrontendInterface'),
+            'Magento\Framework\App\Resource' => $this->getMockBuilder('Magento\Framework\App\Resource')
+                ->disableOriginalConstructor()
+                ->getMock(),
+            'Magento\Framework\App\Resource\Config' => $this->getMock(
+                'Magento\Framework\App\Resource\Config',
+                [],
+                [],
+                '',
+                false
+            )
+        ];
         $model = new \Magento\TestFramework\ObjectManager(
             $factory,
             $configMock,
-            [
-                'Magento\Framework\App\Cache\Type\Config' => $cache,
-                'Magento\Framework\App\ObjectManager\ConfigLoader' => $configLoader,
-                'Magento\Framework\App\ObjectManager\ConfigCache' => $configCache,
-                'Magento\Framework\Config\ReaderInterface' => $this->getMock(
-                    'Magento\Framework\Config\ReaderInterface'
-                ),
-                'Magento\Framework\Config\ScopeInterface' => $this->getMock('Magento\Framework\Config\ScopeInterface'),
-                'Magento\Framework\Config\CacheInterface' => $this->getMock('Magento\Framework\Config\CacheInterface'),
-                'Magento\Framework\Cache\FrontendInterface' =>
-                    $this->getMock('Magento\Framework\Cache\FrontendInterface'),
-                'Magento\Framework\App\Resource' => $this->getMockBuilder('Magento\Framework\App\Resource')
-                        ->disableOriginalConstructor()
-                        ->getMock(),
-                'Magento\Framework\App\Resource\Config' => $this->getMock(
-                    'Magento\Framework\App\Resource\Config',
-                    [],
-                    [],
-                    '',
-                    false
-                )
-            ],
+            $sharedInstances,
             $primaryLoaderMock
         );
 

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Environment/ConfigTesting.php

@@ -18,6 +18,8 @@ class ConfigTesting implements ConfigInterface
      * @param RelationsInterface $relations
      *
      * @return void
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function setRelations(RelationsInterface $relations)
     {
@@ -30,6 +32,7 @@ public function setRelations(RelationsInterface $relations)
      * @param ConfigCacheInterface $cache
      *
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function setCache(ConfigCacheInterface $cache)
     {
@@ -41,6 +44,7 @@ public function setCache(ConfigCacheInterface $cache)
      *
      * @param string $type
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getArguments($type)
     {
@@ -52,6 +56,7 @@ public function getArguments($type)
      *
      * @param string $type
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function isShared($type)
     {
@@ -96,6 +101,7 @@ public function getVirtualTypes()
      *
      * @param array $configuration
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function extend(array $configuration)
     {
@@ -117,6 +123,7 @@ public function getPreferences()
      *
      * @param \Magento\Framework\Interception\ConfigInterface $interceptionConfig
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInterface $interceptionConfig)
     {
@@ -128,6 +135,7 @@ public function setInterceptionConfig(\Magento\Framework\Interception\ConfigInte
      *
      * @param string $instanceName
      * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getOriginalInstanceType($instanceName)
     {

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Factory/Fixture/Compiled/DependencySharedTesting.php

@@ -8,4 +8,3 @@
 class DependencySharedTesting
 {
 }
- 

dev/tests/unit/testsuite/Magento/Framework/ObjectManager/Factory/Fixture/Compiled/DependencyTesting.php

@@ -8,4 +8,3 @@
 class DependencyTesting
 {
 }
- 

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/BackslashTrim.php

@@ -48,6 +48,7 @@ private function resolveInstancesNames(array $arguments)
      * Resolves instances arguments
      *
      * @param array $argument
+     * @return array
      */
     private function resolveArguments(&$argument)
     {

dev/tools/Magento/Tools/Di/Compiler/Config/Chain/PreferencesResolving.php

@@ -32,6 +32,7 @@ public function modify(array $config)
      *
      * @param array $argument
      * @param array $preferences
+     * @return array
      */
     private function resolvePreferences(&$argument, &$preferences)
     {

dev/tools/Magento/Tools/Di/Compiler/Config/Reader.php

@@ -13,6 +13,11 @@
 use Magento\Tools\Di\Compiler\ArgumentsResolverFactory;
 use Magento\Tools\Di\Definition\Collection as DefinitionsCollection;
 
+/**
+ * Class Reader
+ * @package Magento\Tools\Di\Compiler\Config
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Reader
 {
     /**

lib/internal/Magento/Framework/ObjectManager/Config/Compiled.php

@@ -85,6 +85,7 @@ public function getArguments($type)
      *
      * @param string $type
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function isShared($type)
     {

lib/internal/Magento/Framework/ObjectManager/Environment/AbstractEnvironment.php

@@ -75,7 +75,8 @@ public function getMode()
     /**
      * Decorate factory
      *
-     * @param $arguments
+     * @param array $arguments
+     * @return void
      */
     protected function decorate($arguments)
     {
@@ -90,8 +91,8 @@ protected function decorate($arguments)
     /**
      * Creates factory
      *
-     * @param $arguments
-     * @param $factoryClass
+     * @param array $arguments
+     * @param string $factoryClass
      *
      * @return FactoryInterface
      */

lib/internal/Magento/Framework/ObjectManager/Environment/Compiled.php

@@ -44,8 +44,8 @@ class Compiled extends AbstractEnvironment implements EnvironmentInterface
     /**
      * Creates factory
      *
-     * @param $arguments
-     * @param $factoryClass
+     * @param array $arguments
+     * @param string $factoryClass
      *
      * @return FactoryInterface
      */