MAGETWO-89315: Magento application compatible without cloud Patches

Bohdan Korablov · Bohdan Korablov · commit 332270ab4099 · 2018-04-06T15:58:04.000+03:00
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
@@ -5,7 +5,6 @@
  */
 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;
@@ -14,10 +13,8 @@
 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;
 
 /**
@@ -70,9 +67,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();
@@ -148,29 +145,6 @@ 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;
-        $requestParams = $this->serviceManager->get('magento-init-params');
-        $appBootstrapKey = Bootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS;
-
-        if (isset($requestParams[$appBootstrapKey]) && !isset($params[$appBootstrapKey])) {
-            $params[$appBootstrapKey] = $requestParams[$appBootstrapKey];
-        }
-
-        $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:
diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php
@@ -96,7 +96,7 @@ public function getInstallationWritableDirectories()
                 DirectoryList::MEDIA,
                 DirectoryList::STATIC_VIEW,
             ];
-            if (PHP_SAPI !== 'cli' || $this->state->getMode() !== State::MODE_PRODUCTION) {
+            if ($this->state->getMode() !== State::MODE_PRODUCTION) {
                 $data[] = DirectoryList::GENERATED;
             }
             foreach ($data as $code) {
diff --git a/setup/src/Magento/Setup/Model/ObjectManagerProvider.php b/setup/src/Magento/Setup/Model/ObjectManagerProvider.php
@@ -11,7 +11,9 @@
 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
  *
@@ -57,9 +59,17 @@ 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);
-            $factory = $this->getObjectManagerFactory($initParams);
-            $this->objectManager = $factory->create($initParams);
+            $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);
             if (PHP_SAPI == 'cli') {
                 $this->createCliCommands();
             }
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php
@@ -101,7 +101,10 @@ public function onBootstrap(MvcEvent $e)
         /**
          * Initialize ObjectManager
          */
-        $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class)->get();
+        $serviceManager->setService(
+            \Magento\Framework\ObjectManagerInterface::class,
+            $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class)->get()
+        );
 
         if (!($application->getRequest() instanceof Request)) {
             $eventManager = $application->getEventManager();
@@ -134,7 +137,6 @@ public function authPreDispatch($event)
             if ($serviceManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 /** @var \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider */
                 $objectManagerProvider = $serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class);
-                $objectManagerProvider->reset();
                 /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
                 $objectManager = $objectManagerProvider->get();
                 /** @var \Magento\Framework\App\State $adminAppState */
diff --git a/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php b/setup/src/Magento/Setup/Test/Unit/Model/ObjectManagerProviderTest.php
@@ -15,6 +15,7 @@
 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
@@ -46,7 +47,10 @@ public function setUp()
 
     public function testGet()
     {
-        $initParams = ['param' => 'value'];
+        $initParams = [
+            'param' => 'value',
+            AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS => 'some_dir'
+        ];
 
         $this->serviceLocatorMock
             ->expects($this->atLeastOnce())
@@ -72,7 +76,10 @@ public function testGet()
             ->getMock();
         $objectManagerFactoryMock->expects($this->once())
             ->method('create')
-            ->with($initParams)
+            ->with($this->callback(function ($value) {
+                return array_key_exists(AppBootstrap::INIT_PARAM_FILESYSTEM_DIR_PATHS, $value)
+                    && !array_key_exists('param', $value);
+            }))
             ->willReturn($objectManagerMock);
 
         $this->bootstrapMock
diff --git a/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php b/setup/src/Magento/Setup/Test/Unit/Mvc/Bootstrap/InitParamListenerTest.php
@@ -48,9 +48,13 @@ 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();
@@ -62,7 +66,7 @@ public function testOnBootstrap()
                 [InitParamListener::BOOTSTRAP_PARAM, true, $initParams],
                 [\Magento\Setup\Model\ObjectManagerProvider::class, true, $omProvider],
             ]);
-        $serviceManager->expects($this->exactly(2))->method('setService')
+        $serviceManager->expects($this->exactly(3))->method('setService')
             ->withConsecutive(
                 [
                     \Magento\Framework\App\Filesystem\DirectoryList::class,
@@ -71,6 +75,10 @@ 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);

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function getInstallationWritableDirectories()`
`96`	`96`	`DirectoryList::MEDIA,`
`97`	`97`	`DirectoryList::STATIC_VIEW,`
`98`	`98`	`];`
`99`		`- if (PHP_SAPI !== 'cli' \|\| $this->state->getMode() !== State::MODE_PRODUCTION) {`
	`99`	`+ if ($this->state->getMode() !== State::MODE_PRODUCTION) {`
`100`	`100`	`$data[] = DirectoryList::GENERATED;`
`101`	`101`	`}`
`102`	`102`	`foreach ($data as $code) {`