Merge remote-tracking branch 'mpi/MC-19749' into Chaika-2019-09-12-CE

Author: veloraven

dev/tests/integration/testsuite/Magento/Setup/Model/ObjectManagerProviderTest.php

@@ -6,31 +6,52 @@
 
 namespace Magento\Setup\Model;
 
+use Magento\Framework\ObjectManagerInterface;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+use Symfony\Component\Console\Application;
+use Zend\ServiceManager\ServiceLocatorInterface;
 
-class ObjectManagerProviderTest extends \PHPUnit\Framework\TestCase
+/**
+ * Tests ObjectManagerProvider
+ */
+class ObjectManagerProviderTest extends TestCase
 {
     /**
      * @var ObjectManagerProvider
      */
     private $object;
 
     /**
-     * @var \Zend\ServiceManager\ServiceLocatorInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ServiceLocatorInterface|PHPUnit_Framework_MockObject_MockObject
      */
     private $locator;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp()
     {
-        $this->locator = $this->getMockForAbstractClass(\Zend\ServiceManager\ServiceLocatorInterface::class);
+        $this->locator = $this->getMockForAbstractClass(ServiceLocatorInterface::class);
         $this->object = new ObjectManagerProvider($this->locator, new Bootstrap());
+        $this->locator->expects($this->any())
+            ->method('get')
+            ->willReturnMap(
+                [
+                    [InitParamListener::BOOTSTRAP_PARAM, []],
+                    [Application::class, $this->getMockForAbstractClass(Application::class)],
+                ]
+            );
     }
 
+    /**
+     * Tests the same instance of ObjectManagerInterface should be provided by the ObjectManagerProvider
+     */
     public function testGet()
     {
-        $this->locator->expects($this->once())->method('get')->with(InitParamListener::BOOTSTRAP_PARAM)->willReturn([]);
         $objectManager = $this->object->get();
-        $this->assertInstanceOf(\Magento\Framework\ObjectManagerInterface::class, $objectManager);
+        $this->assertInstanceOf(ObjectManagerInterface::class, $objectManager);
         $this->assertSame($objectManager, $this->object->get());
     }
 }

lib/internal/Magento/Framework/Console/Cli.php

@@ -93,6 +93,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
         }
 
         parent::__construct($name, $version);
+        $this->serviceManager->setService(\Symfony\Component\Console\Application::class, $this);
     }
 
     /**

setup/src/Magento/Setup/Model/ObjectManagerProvider.php

@@ -76,10 +76,9 @@ private function createCliCommands()
     {
         /** @var CommandListInterface $commandList */
         $commandList = $this->objectManager->create(CommandListInterface::class);
+        $application = $this->serviceLocator->get(Application::class);
         foreach ($commandList->getCommands() as $command) {
-            $command->setApplication(
-                $this->serviceLocator->get(Application::class)
-            );
+            $application->add($command);
         }
     }
 

setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php

@@ -47,6 +47,14 @@ public function setUp()
     public function testGet()
     {
         $initParams = ['param' => 'value'];
+        $commands = [
+            new Command('setup:install'),
+            new Command('setup:upgrade'),
+        ];
+
+        $application = $this->getMockBuilder(Application::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
 
         $this->serviceLocatorMock
             ->expects($this->atLeastOnce())
@@ -56,16 +64,21 @@ public function testGet()
                     [InitParamListener::BOOTSTRAP_PARAM, $initParams],
                     [
                         Application::class,
-                        $this->getMockBuilder(Application::class)->disableOriginalConstructor()->getMock(),
+                        $application,
                     ],
                 ]
             );
 
+        $commandListMock = $this->createMock(CommandListInterface::class);
+        $commandListMock->expects($this->once())
+            ->method('getCommands')
+            ->willReturn($commands);
+
         $objectManagerMock = $this->createMock(ObjectManagerInterface::class);
         $objectManagerMock->expects($this->once())
             ->method('create')
             ->with(CommandListInterface::class)
-            ->willReturn($this->getCommandListMock());
+            ->willReturn($commandListMock);
 
         $objectManagerFactoryMock = $this->getMockBuilder(ObjectManagerFactory::class)
             ->disableOriginalConstructor()
@@ -81,21 +94,9 @@ public function testGet()
             ->willReturn($objectManagerFactoryMock);
 
         $this->assertInstanceOf(ObjectManagerInterface::class, $this->model->get());
-    }
-
-    /**
-     * @return \PHPUnit_Framework_MockObject_MockObject
-     */
-    private function getCommandListMock()
-    {
-        $commandMock = $this->getMockBuilder(Command::class)->disableOriginalConstructor()->getMock();
-        $commandMock->expects($this->once())->method('setApplication');
-
-        $commandListMock = $this->createMock(CommandListInterface::class);
-        $commandListMock->expects($this->once())
-            ->method('getCommands')
-            ->willReturn([$commandMock]);
 
-        return $commandListMock;
+        foreach ($commands as $command) {
+            $this->assertSame($application, $command->getApplication());
+        }
     }
 }