MAGETWO-55903: Prepare PR

Author: shiftedreality

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

@@ -6,7 +6,7 @@
 
 namespace Magento\Setup\Model;
 
-use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Application;
 use Magento\Framework\Console\CommandListInterface;
 use Magento\Framework\ObjectManagerInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
@@ -78,7 +78,7 @@ private function createCliCommands()
         $commandList = $this->objectManager->create(CommandListInterface::class);
         foreach ($commandList->getCommands() as $command) {
             $command->setApplication(
-                $this->serviceLocator->get(Cli::class)
+                $this->serviceLocator->get(Application::class)
             );
         }
     }

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

@@ -14,7 +14,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Console\CommandListInterface;
 use Symfony\Component\Console\Command\Command;
-use Magento\Framework\Console\Cli;
+use Symfony\Component\Console\Application;
 
 /**
  * Class ObjectManagerProviderTest
@@ -54,7 +54,10 @@ public function testGet()
             ->willReturnMap(
                 [
                     [InitParamListener::BOOTSTRAP_PARAM, $initParams],
-                    [Cli::class, $this->getMockBuilder(Cli::class)->disableOriginalConstructor()->getMock()],
+                    [
+                        Application::class,
+                        $this->getMockBuilder(Application::class)->disableOriginalConstructor()->getMock(),
+                    ],
                 ]
             );