Merge branch '2.1' into MAGETWO-55463

Author: magento-services-vantiv-deploy

app/code/Magento/Store/etc/di.xml

@@ -223,6 +223,7 @@
                     <item name="frontName" xsi:type="null" />
                     <item name="router" xsi:type="string">standard</item>
                 </item>
+                <item name="setup" xsi:type="null"/>
             </argument>
             <argument name="default" xsi:type="string">frontend</argument>
         </arguments>

lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader/Compiled.php

@@ -8,6 +8,9 @@
 
 use Magento\Framework\ObjectManager\ConfigLoaderInterface;
 
+/**
+ * Class Compiled returns configuration cache information
+ */
 class Compiled implements ConfigLoaderInterface
 {
     /**
@@ -25,8 +28,12 @@ public function load($area)
         if (isset($this->configCache[$area])) {
             return $this->configCache[$area];
         }
-        $this->configCache[$area] = \unserialize(\file_get_contents(self::getFilePath($area)));
-        return $this->configCache[$area];
+        $filePath = self::getFilePath($area);
+        if (\file_exists($filePath)) {
+            $this->configCache[$area] = \unserialize(\file_get_contents($filePath));
+            return $this->configCache[$area];
+        }
+        return [];
     }
 
     /**

setup/src/Magento/Setup/Console/Command/UpgradeCommand.php

@@ -29,11 +29,6 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $installerFactory;
 
-    /**
-     * @var \Magento\Setup\Model\ObjectManagerProvider;
-     */
-    private $objectManagerProvider;
-
     /**
      * Constructor
      *
@@ -43,7 +38,6 @@ class UpgradeCommand extends AbstractSetupCommand
     public function __construct(InstallerFactory $installerFactory, ObjectManagerProvider $objectManagerProvider)
     {
         $this->installerFactory = $installerFactory;
-        $this->objectManagerProvider = $objectManagerProvider;
         parent::__construct();
     }
 
@@ -73,16 +67,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $areaCode = 'setup';
-        /** @var \Magento\Framework\ObjectManagerInterface $objectManager */
-        $objectManager = $this->objectManagerProvider->get();
-        /** @var \Magento\Framework\App\State $appState */
-        $appState = $objectManager->get('Magento\Framework\App\State');
-        $appState->setAreaCode($areaCode);
-        /** @var \Magento\Framework\ObjectManager\ConfigLoaderInterface $configLoader */
-        $configLoader = $objectManager->get('Magento\Framework\ObjectManager\ConfigLoaderInterface');
-        $objectManager->configure($configLoader->load($areaCode));
-
         $keepGenerated = $input->getOption(self::INPUT_KEY_KEEP_GENERATED);
         $installer = $this->installerFactory->create(new ConsoleLogger($output));
         $installer->updateModulesSequence($keepGenerated);

setup/src/Magento/Setup/Test/Unit/Console/Command/UpgradeCommandTest.php

@@ -7,35 +7,20 @@
 
 use Magento\Setup\Console\Command\UpgradeCommand;
 use Symfony\Component\Console\Tester\CommandTester;
+use Magento\Framework\Console\Cli;
 
 class UpgradeCommandTest extends \PHPUnit_Framework_TestCase
 {
     public function testExecute()
     {
         $installerFactory = $this->getMock('Magento\Setup\Model\InstallerFactory', [], [], '', false);
         $objectManagerProvider = $this->getMock('\Magento\Setup\Model\ObjectManagerProvider', [], [], '', false);
-        $objectManager = $this->getMockForAbstractClass('Magento\Framework\ObjectManagerInterface');
-        $configLoader = $this->getMockForAbstractClass('Magento\Framework\ObjectManager\ConfigLoaderInterface');
-        $configLoader->expects($this->once())->method('load')->willReturn(['some_key' => 'some_value']);
-        $state = $this->getMock('Magento\Framework\App\State', [], [], '', false);
-        $state->expects($this->once())->method('setAreaCode')->with('setup');
-        $objectManagerProvider->expects($this->once())->method('get')->willReturn($objectManager);
-        $objectManager->expects($this->once())->method('configure');
-        $state->expects($this->once())->method('setAreaCode')->with('setup');
         $installer = $this->getMock('Magento\Setup\Model\Installer', [], [], '', false);
         $installer->expects($this->at(0))->method('updateModulesSequence');
         $installer->expects($this->at(1))->method('installSchema');
         $installer->expects($this->at(2))->method('installDataFixtures');
         $installerFactory->expects($this->once())->method('create')->willReturn($installer);
-
-        $objectManager->expects($this->exactly(2))
-            ->method('get')
-            ->will($this->returnValueMap([
-                ['Magento\Framework\App\State', $state],
-                ['Magento\Framework\ObjectManager\ConfigLoaderInterface', $configLoader]
-            ]));
-
         $commandTester = new CommandTester(new UpgradeCommand($installerFactory, $objectManagerProvider));
-        $commandTester->execute([]);
+        $this->assertSame(Cli::RETURN_SUCCESS, $commandTester->execute([]));
     }
 }