MAGETWO-50934: setup:upgrade failed during CLI upgrade from CE 2.0.x to 2.1.0

- merge conflicts fixes

Author: mazhalai

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

@@ -24,25 +24,13 @@ abstract class AbstractModuleManageCommand extends AbstractModuleCommand
     /**
      * @var GeneratedFiles
      */
-    private $generatedFiles;
+    protected $generatedFiles;
 
     /**
      * @var DeploymentConfig
      */
     protected $deploymentConfig;
 
-    /**
-     * Constructor
-     *
-     * @param GeneratedFiles $generatedFiles
-     * @param ObjectManagerProvider $objectManagerProvider
-     */
-    public function __construct(GeneratedFiles $generatedFiles, ObjectManagerProvider $objectManagerProvider)
-    {
-        $this->generatedFiles = $generatedFiles;
-        parent::__construct($objectManagerProvider);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -110,6 +98,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $this->setIsEnabled($isEnable, $modulesToChange, $output);
             $this->cleanup($input, $output);
+            $this->getGeneratedFiles()->requestRegeneration();
             if ($force) {
                 $output->writeln(
                     '<error>Alert: You used the --force option.'
@@ -147,7 +136,6 @@ private function setIsEnabled($isEnable, $modulesToChange, $output)
             $output->writeln('<info>- ' . implode("\n- ", $modulesToChange) . '</info>');
             $output->writeln('');
         }
-        $this->generatedFiles->requestRegeneration();
     }
 
     /**
@@ -196,4 +184,18 @@ private function getDeploymentConfig()
         }
         return $this->deploymentConfig;
     }
+
+    /**
+     * Get deployment config
+     *
+     * @return GeneratedFiles
+     * @deprecated
+     */
+    private function getGeneratedFiles()
+    {
+        if (!($this->generatedFiles instanceof GeneratedFiles)) {
+            return $this->objectManager->get(GeneratedFiles::class);
+        }
+        return $this->generatedFiles;
+    }
 }

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

@@ -9,6 +9,9 @@
 use Magento\Setup\Console\Command\ModuleEnableCommand;
 use Symfony\Component\Console\Tester\CommandTester;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class ModuleEnableDisableCommandTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -319,10 +322,13 @@ public function testExecuteNoChanges($isEnable)
     private function getCommandTester($isEnable)
     {
         $class = $isEnable ? ModuleEnableCommand::class : ModuleDisableCommand::class;
-        $command = new $class($this->generatedFiles, $this->objectManagerProviderMock);
+        $command = new $class($this->objectManagerProviderMock);
         $deploymentConfigProperty = new \ReflectionProperty($class, 'deploymentConfig');
         $deploymentConfigProperty->setAccessible(true);
         $deploymentConfigProperty->setValue($command, $this->deploymentConfigMock);
+        $deploymentConfigProperty = new \ReflectionProperty($class, 'generatedFiles');
+        $deploymentConfigProperty->setAccessible(true);
+        $deploymentConfigProperty->setValue($command, $this->generatedFiles);
         return new CommandTester($command);
     }
 }