MAGETWO-35133: Search for Commands

- optimized Framework CommandList, it does not require object manager now.

Author: Ivan Gavryshko

lib/internal/Magento/Framework/App/Test/Unit/Console/CommandListTest.php

@@ -7,6 +7,7 @@
 namespace Magento\Framework\App\Test\Unit\Console;
 
 use Magento\Framework\Console\CommandList;
+use Symfony\Component\Console\Command\Command;
 
 class CommandListTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,36 +17,24 @@ class CommandListTest extends \PHPUnit_Framework_TestCase
     private $commandList;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\ObjectManagerInterface
+     * @var Symfony\Component\Console\Command\Command
      */
-    private $objectManager;
+    private $testCommand;
 
     public function setUp()
     {
-        $commands =[
-            'Symfony\Component\Console\Command\Command'
+        $this->testCommand = new Command('Test');
+        $commands = [
+            $this->testCommand
         ];
 
-        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
-        $this->commandList = new CommandList($this->objectManager, $commands);
+        $this->commandList = new CommandList($commands);
     }
 
     public function testGetCommands()
     {
-        $this->objectManager->expects($this->once())->method('get')->with('Symfony\Component\Console\Command\Command');
-        $this->commandList->getCommands();
-    }
-
-    /**
-     * @expectedException \Exception
-     * @expectedExceptionMessage Class Symfony\Component\Console\Command\WrongCommand does not exist
-     */
-    public function testGetCommandsException()
-    {
-        $wrongCommands =[
-            'Symfony\Component\Console\Command\WrongCommand'
-        ];
-        $commandList = new CommandList($this->objectManager, $wrongCommands);
-        $commandList->getCommands();
+        $commands = $this->commandList->getCommands();
+        $this->assertEquals(1, count($commands));
+        $this->assertEquals($this->testCommand, $commands[0]);
     }
 }

lib/internal/Magento/Framework/Console/CommandList.php

@@ -20,40 +20,23 @@ class CommandList
      */
     protected $commands;
 
-    /**
-     * @var ObjectManagerInterface
-     */
-    protected $objectManager;
-
     /**
      * Constructor
      *
-     * @param ObjectManagerInterface $objectManager
      * @param array $commands
      */
-    public function __construct(ObjectManagerInterface $objectManager, array $commands = [])
+    public function __construct(array $commands = [])
     {
-        $this->objectManager = $objectManager;
         $this->commands = $commands;
     }
 
     /**
      * Gets list of command instances
      *
      * @return \Symfony\Component\Console\Command\Command[]
-     * @throws \Exception
      */
     public function getCommands()
     {
-        $commands = [];
-        foreach ($this->commands as $class) {
-            if (class_exists($class)) {
-                $commands[] = $this->objectManager->get($class);
-            } else {
-                throw new \Exception('Class ' . $class . ' does not exist');
-            }
-        }
-
-        return $commands;
+        return $this->commands;
     }
 }