Merge remote-tracking branch 'goinc/MAGETWO-51102' into pr-573

Author: duhon

app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php

@@ -35,6 +35,7 @@ class SampleDataDeployCommand extends Command
 
     /**
      * @var ArrayInputFactory
+     * @deprecated
      */
     private $arrayInputFactory;
 
@@ -88,8 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
             $commonArgs = array_merge(['packages' => $packages], $commonArgs);
             $arguments = array_merge(['command' => 'require'], $commonArgs);
-            /** @var ArrayInput $commandInput */
-            $commandInput = $this->arrayInputFactory->create(['parameters' => $arguments]);
+            $commandInput = new ArrayInput($arguments);
 
             /** @var Application $application */
             $application = $this->applicationFactory->create();

app/code/Magento/SampleData/Console/Command/SampleDataRemoveCommand.php

@@ -34,6 +34,7 @@ class SampleDataRemoveCommand extends Command
 
     /**
      * @var ArrayInputFactory
+     * @deprecated
      */
     private $arrayInputFactory;
 
@@ -82,8 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $commonArgs = ['--working-dir' => $baseDir, '--no-interaction' => 1, '--no-progress' => 1];
             $packages = array_keys($sampleDataPackages);
             $arguments = array_merge(['command' => 'remove', 'packages' => $packages], $commonArgs);
-            /** @var ArrayInput $commandInput */
-            $commandInput = $this->arrayInputFactory->create(['parameters' => $arguments]);
+            $commandInput = new ArrayInput($arguments);
 
             /** @var Application $application */
             $application = $this->applicationFactory->create();

app/code/Magento/SampleData/Test/Unit/Console/Command/SampleDataDeployCommandTest.php

@@ -34,10 +34,9 @@ public function testExecute(array $sampleDataPackages, $appRunResult, $expectedM
             ->method('getSampleDataPackages')
             ->willReturn($sampleDataPackages);
 
-        $commandInput = $this->getMock('Symfony\Component\Console\Input\ArrayInput', [], [], '', false);
-
         $arrayInputFactory = $this
             ->getMock('Symfony\Component\Console\Input\ArrayInputFactory', ['create'], [], '', false);
+        $arrayInputFactory->expects($this->never())->method('create');
 
         array_walk($sampleDataPackages, function (&$v, $k) {
             $v = "$k:$v";
@@ -51,10 +50,7 @@ public function testExecute(array $sampleDataPackages, $appRunResult, $expectedM
             '--no-progress' => 1,
             'packages'      => $packages,
         ];
-        $arrayInputFactory->expects($this->any())
-            ->method('create')
-            ->with(['parameters' => $requireArgs])
-            ->willReturn($commandInput);
+        $commandInput = new \Symfony\Component\Console\Input\ArrayInput($requireArgs);
 
         $application = $this->getMock('Composer\Console\Application', [], [], '', false);
         $application->expects($this->any())->method('run')