MAGETWO-81618: Only prompt for deploy command in production mode #11047

Author: vrann

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

@@ -6,6 +6,7 @@
 namespace Magento\Setup\Console\Command;
 
 use Magento\Deploy\Console\Command\App\ConfigImportCommand;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Setup\ConsoleLogger;
@@ -37,16 +38,25 @@ class UpgradeCommand extends AbstractSetupCommand
      */
     private $deploymentConfig;
 
+    /**
+     * @var AppState
+     */
+    private $appState;
+
     /**
      * Constructor
      *
      * @param InstallerFactory $installerFactory
      * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(InstallerFactory $installerFactory, DeploymentConfig $deploymentConfig = null)
-    {
+    public function __construct(
+        InstallerFactory $installerFactory,
+        DeploymentConfig $deploymentConfig = null,
+        AppState $appState = null
+    ) {
         $this->installerFactory = $installerFactory;
         $this->deploymentConfig = $deploymentConfig ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
+        $this->appState = $appState ?: ObjectManager::getInstance()->get(AppState::class);
         parent::__construct();
     }
 
@@ -90,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 $importConfigCommand->run($arrayInput, $output);
             }
 
-            if (!$keepGenerated) {
+            if (!$keepGenerated && $this->appState->getMode() === AppState::MODE_PRODUCTION) {
                 $output->writeln(
                     '<info>Please re-run Magento compile command. Use the command "setup:di:compile"</info>'
                 );

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

@@ -6,6 +6,7 @@
 namespace Magento\Setup\Test\Unit\Console\Command;
 
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Console\Cli;
 use Magento\Setup\Console\Command\UpgradeCommand;
 use Magento\Setup\Model\Installer;
@@ -29,11 +30,15 @@ class UpgradeCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $installerMock;
 
+    /**
+     * @var AppState|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $appStateMock;
+
     /**
      * @var UpgradeCommand
      */
     private $upgradeCommand;
-
     /**
      * @var CommandTester
      */
@@ -56,16 +61,24 @@ protected function setUp()
         $this->installerFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($this->installerMock);
+        $this->appStateMock = $this->getMockBuilder(AppState::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->upgradeCommand = new UpgradeCommand($this->installerFactoryMock, $this->deploymentConfigMock);
+        $this->upgradeCommand = new UpgradeCommand(
+            $this->installerFactoryMock,
+            $this->deploymentConfigMock,
+            $this->appStateMock
+        );
         $this->commandTester = new CommandTester($this->upgradeCommand);
     }
 
     /**
      * @dataProvider executeDataProvider
      */
-    public function testExecute($options, $expectedString = '')
+    public function testExecute($options, $deployMode, $expectedString = '')
     {
+        $this->appStateMock->method('getMode')->willReturn($deployMode);
         $this->installerMock->expects($this->at(0))
             ->method('updateModulesSequence');
         $this->installerMock->expects($this->at(1))
@@ -85,11 +98,23 @@ public function executeDataProvider()
         return [
             [
                 'options' => [],
+                'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
                 'expectedString' => 'Please re-run Magento compile command. Use the command "setup:di:compile"'
                     . PHP_EOL
             ],
             [
                 'options' => ['--keep-generated' => true],
+                'deployMode' => \Magento\Framework\App\State::MODE_PRODUCTION,
+                'expectedString' => ''
+            ],
+            [
+                'options' => [],
+                'deployMode' => \Magento\Framework\App\State::MODE_DEVELOPER,
+                'expectedString' => ''
+            ],
+            [
+                'options' => [],
+                'deployMode' => \Magento\Framework\App\State::MODE_DEFAULT,
                 'expectedString' => ''
             ],
         ];