MAGETWO-89746: [Backport 2.2.x] Magento application compatible with cloud

Author: Bohdan Korablov

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

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\Console;
 
+use Magento\Framework\App\Bootstrap;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ProductMetadata;
@@ -13,9 +14,12 @@
 use Magento\Framework\Console\Exception\GenerationDirectoryAccessException;
 use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\Shell\ComplexParameter;
 use Magento\Setup\Application;
 use Magento\Setup\Console\CompilerPreparation;
+use Magento\Setup\Model\ObjectManagerProvider;
 use Symfony\Component\Console;
+use Zend\ServiceManager\ServiceManager;
 
 /**
  * Magento 2 CLI Application.
@@ -67,9 +71,9 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
             $bootstrapApplication = new Application();
             $application = $bootstrapApplication->bootstrap($configuration);
             $this->serviceManager = $application->getServiceManager();
-            $this->objectManager = $this->serviceManager->get(ObjectManagerInterface::class);
 
             $this->assertCompilerPreparation();
+            $this->initObjectManager();
             $this->assertGenerationPermissions();
         } catch (\Exception $exception) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
@@ -145,6 +149,23 @@ protected function getApplicationCommands()
         return $commands;
     }
 
+    /**
+     * Object Manager initialization.
+     *
+     * @return void
+     */
+    private function initObjectManager()
+    {
+        $params = (new ComplexParameter(self::INPUT_KEY_BOOTSTRAP))->mergeFromArgv($_SERVER, $_SERVER);
+        $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+
+        $this->objectManager = Bootstrap::create(BP, $params)->getObjectManager();
+
+        /** @var ObjectManagerProvider $omProvider */
+        $omProvider = $this->serviceManager->get(ObjectManagerProvider::class);
+        $omProvider->setObjectManager($this->objectManager);
+    }
+
     /**
      * Checks whether generation directory is read-only.
      * Depends on the current mode:

setup/index.php

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 use Magento\Setup\Application;
+use Magento\Setup\Model\ObjectManagerProvider;
 
 if (PHP_SAPI == 'cli') {
     echo "You cannot run this from the command line." . PHP_EOL .
@@ -32,4 +33,7 @@
 $configuration = require __DIR__ . '/config/application.config.php';
 $bootstrap = new Application();
 $application = $bootstrap->bootstrap($configuration);
+$application->getServiceManager()
+    ->get(ObjectManagerProvider::class)
+    ->setObjectManager(\Magento\Framework\App\Bootstrap::create(BP, $_SERVER)->getObjectManager());
 $application->run();

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

@@ -11,9 +11,6 @@
 use Magento\Framework\ObjectManagerInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Magento\Setup\Mvc\Bootstrap\InitParamListener;
-use Magento\Framework\App\Bootstrap as AppBootstrap;
-use Magento\Framework\Shell\ComplexParameter;
-use Magento\Framework\Console\Cli;
 
 /**
  * Object manager provider
@@ -60,17 +57,9 @@ public function __construct(
     public function get()
     {
         if (null === $this->objectManager) {
-            $params = (new ComplexParameter(Cli::INPUT_KEY_BOOTSTRAP))->mergeFromArgv($_SERVER, $_SERVER);
-            $params[AppBootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
             $initParams = $this->serviceLocator->get(InitParamListener::BOOTSTRAP_PARAM);
-            $appBootstrapKey = AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS;
-
-            if (isset($initParams[$appBootstrapKey]) && !isset($params[$appBootstrapKey])) {
-                $params[$appBootstrapKey] = $initParams[$appBootstrapKey];
-            }
-
-            $factory = $this->getObjectManagerFactory($params);
-            $this->objectManager = $factory->create($params);
+            $factory = $this->getObjectManagerFactory($initParams);
+            $this->objectManager = $factory->create($initParams);
             if (PHP_SAPI == 'cli') {
                 $this->createCliCommands();
             }

setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php

@@ -98,14 +98,6 @@ public function onBootstrap(MvcEvent $e)
         $serviceManager->setService(\Magento\Framework\App\Filesystem\DirectoryList::class, $directoryList);
         $serviceManager->setService(\Magento\Framework\Filesystem::class, $this->createFilesystem($directoryList));
 
-        /**
-         * Initialize ObjectManager
-         */
-        $serviceManager->setService(
-            \Magento\Framework\ObjectManagerInterface::class,
-            $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class)->get()
-        );
-
         if (!($application->getRequest() instanceof Request)) {
             $eventManager = $application->getEventManager();
             $eventManager->attach(MvcEvent::EVENT_DISPATCH, [$this, 'authPreDispatch'], 100);

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

@@ -15,7 +15,6 @@
 use Magento\Framework\Console\CommandListInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Application;
-use Magento\Framework\App\Bootstrap as AppBootstrap;
 
 /**
  * Class ObjectManagerProviderTest
@@ -47,10 +46,7 @@ public function setUp()
 
     public function testGet()
     {
-        $initParams = [
-            'param' => 'value',
-            AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => 'some_dir'
-        ];
+        $initParams = ['param' => 'value'];
 
         $this->serviceLocatorMock
             ->expects($this->atLeastOnce())
@@ -76,10 +72,7 @@ public function testGet()
             ->getMock();
         $objectManagerFactoryMock->expects($this->once())
             ->method('create')
-            ->with($this->callback(function ($value) {
-                return array_key_exists(AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS, $value)
-                    && !array_key_exists('param', $value);
-            }))
+            ->with($initParams)
             ->willReturn($objectManagerMock);
 
         $this->bootstrapMock

setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php

@@ -48,25 +48,15 @@ public function testDetach()
 
     public function testOnBootstrap()
     {
-        $objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
-        $omProvider = $this->getMockBuilder(\Magento\Setup\Model\ObjectManagerProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $omProvider->expects($this->once())
-            ->method('get')
-            ->willReturn($objectManager);
         /** @var \Zend\Mvc\MvcEvent|\PHPUnit_Framework_MockObject_MockObject $mvcEvent */
         $mvcEvent = $this->createMock(\Zend\Mvc\MvcEvent::class);
         $mvcApplication = $this->getMockBuilder(\Zend\Mvc\Application::class)->disableOriginalConstructor()->getMock();
         $mvcEvent->expects($this->once())->method('getApplication')->willReturn($mvcApplication);
         $serviceManager = $this->createMock(\Zend\ServiceManager\ServiceManager::class);
         $initParams[AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS][DirectoryList::ROOT] = ['path' => '/test'];
-        $serviceManager->expects($this->any())->method('get')
-            ->willReturnMap([
-                [InitParamListener::BOOTSTRAP_PARAM, true, $initParams],
-                [\Magento\Setup\Model\ObjectManagerProvider::class, true, $omProvider],
-            ]);
-        $serviceManager->expects($this->exactly(3))->method('setService')
+        $serviceManager->expects($this->once())->method('get')
+            ->willReturn($initParams);
+        $serviceManager->expects($this->exactly(2))->method('setService')
             ->withConsecutive(
                 [
                     \Magento\Framework\App\Filesystem\DirectoryList::class,
@@ -75,10 +65,6 @@ public function testOnBootstrap()
                 [
                     \Magento\Framework\Filesystem::class,
                     $this->isInstanceOf(\Magento\Framework\Filesystem::class),
-                ],
-                [
-                    \Magento\Framework\ObjectManagerInterface::class,
-                    $this->isInstanceOf(\Magento\Framework\ObjectManagerInterface::class),
                 ]
             );
         $mvcApplication->expects($this->any())->method('getServiceManager')->willReturn($serviceManager);