MAGETWO-35133: Search for Commands

- changes according to CR
- added unittests

Author: Ivan Gavryshko

dev/tools/Magento/Tools/Console/CommandList.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Tools\Console;
 
+use Symfony\Component\Console\Command\Command;
+
 class CommandList
 {
     /**
@@ -29,7 +31,10 @@ public function getCommands()
 
         foreach ($this->getCommandsClasses() as $class) {
             if (class_exists($class)) {
-                $commands[] = new $class;
+                $command = new $class;;
+                if ($command instanceof Command) {
+                    $commands[] = $command;
+                }
             }
         }
 

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

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App\Test\Unit\Console;
+
+use Magento\Framework\Console\CommandList;
+
+class CommandListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Console\CommandList
+     */
+    private $commandList;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
+    public function setUp()
+    {
+        $commands =[
+            'Symfony\Component\Console\Command\Command'
+        ];
+
+        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
+        $this->commandList = new CommandList($this->objectManager, $commands);
+    }
+
+    public function testGetCommands()
+    {
+        $this->objectManager->expects($this->once())->method('get')->with('Symfony\Component\Console\Command\Command');
+        $this->commandList->getCommands();
+    }
+}

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

@@ -7,6 +7,7 @@
 namespace Magento\Framework\Console;
 
 use Magento\Framework\ObjectManagerInterface;
+use Symfony\Component\Console\Command\Command;
 
 class CommandList
 {
@@ -42,7 +43,10 @@ public function getCommands()
         $commands = [];
         foreach ($this->commands as $class) {
             if (class_exists($class)) {
-                $commands[] = $this->objectManager->get($class);
+                $command = $this->objectManager->get($class);
+                if ($command instanceof Command) {
+                    $commands[] = $command;
+                }
             }
         }
 

lib/internal/Magento/Framework/ObjectManager/Test/Unit/DefinitionFactoryTest.php

@@ -116,7 +116,7 @@ public function createPluginsAndRelationsNotReadableDataProvider()
 
     public function testGetSupportedFormats()
     {
-        $actual = DefinitionFactory::getSupportedFormats();
+        $actual = \Magento\Framework\ObjectManager\DefinitionFactory::getSupportedFormats();
         $this->assertInternalType('array', $actual);
         foreach ($actual as $className) {
             $this->assertInternalType('string', $className);

setup/src/Magento/Setup/Console/CommandList.php

@@ -7,6 +7,7 @@
 namespace Magento\Setup\Console;
 
 use Zend\ServiceManager\ServiceManager;
+use Symfony\Component\Console\Command\Command;
 
 class CommandList
 {
@@ -50,7 +51,10 @@ public function getCommands()
 
         foreach ($this->getCommandsClasses() as $class) {
             if (class_exists($class)) {
-                $commands[] = $this->serviceManager->create($class);
+                $command = $this->serviceManager->create($class);
+                if ($command instanceof Command) {
+                    $commands[] = $command;
+                }
             }
         }
 

setup/src/Magento/Setup/Test/Unit/Console/CommandListTest.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Setup\Test\Unit\Console;
+
+use Magento\Setup\Console\CommandList;
+
+class CommandListTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Console\CommandList
+     */
+    private $commandList;
+
+     /**
+      * @var \PHPUnit_Framework_MockObject_MockObject|\Zend\ServiceManager\ServiceManager
+      */
+    private $serviceManager;
+
+    public function setUp()
+    {
+        $this->serviceManager = $this->getMock('\Zend\ServiceManager\ServiceManager', [], [], '', false);
+        $this->commandList = new CommandList($this->serviceManager);
+    }
+
+    public function testGetCommands()
+    {
+        $this->serviceManager->expects($this->at(0))
+            ->method('create')
+            ->with('Magento\Setup\Console\Command\ConfigInstallCommand');
+        $this->commandList->getCommands();
+    }
+}