Enhance CommandRunnerTest

Author: jim-parry

system/CLI/CommandRunner.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\CLI;
+<?php
+namespace CodeIgniter\CLI;
 
 /**
  * CodeIgniter
@@ -39,6 +40,7 @@
 
 class CommandRunner extends Controller
 {
+
 	/**
 	 * Stores the info about found Commands.
 	 *
@@ -73,7 +75,6 @@ public function _remap($method, ...$params)
 
 	//--------------------------------------------------------------------
 
-
 	/**
 	 * @param array $params
 	 *
@@ -143,12 +144,17 @@ protected function createCommandList()
 		foreach ($files as $file)
 		{
 			$className = service('locator')->findQualifiedNameFromPath($file);
-
 			if (empty($className) || ! class_exists($className))
 			{
 				continue;
 			}
 
+			$class = new \ReflectionClass($className);
+			if ( ! $class->isInstantiable() || ! $class->isSubclassOf(BaseCommand::class))
+			{
+				continue;
+			}
+
 			$class = new $className($this->logger, $this);
 
 			// Store it!

tests/_support/Commands/AbstractInfo.php

@@ -0,0 +1,15 @@
+<?php
+namespace Tests\Support\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CodeIgniter;
+
+abstract class AbstractInfo extends BaseCommand
+{
+
+	protected $group = 'demo';
+	protected $name = 'app:pablo';
+	protected $description = 'Displays basic application information.';
+
+}

tests/_support/Commands/AppInfo.php

@@ -0,0 +1,20 @@
+<?php
+namespace Tests\Support\Commands;
+
+use CodeIgniter\CLI\BaseCommand;
+use CodeIgniter\CLI\CLI;
+use CodeIgniter\CodeIgniter;
+
+class AppInfo extends BaseCommand
+{
+
+	protected $group = 'demo';
+	protected $name = 'app:info';
+	protected $description = 'Displays basic application information.';
+
+	public function run(array $params)
+	{
+		CLI::write('CI Version: ' . CLI::color(CodeIgniter::CI_VERSION, 'red'));
+	}
+
+}

tests/system/Commands/CommandsTest.php

@@ -1,4 +1,5 @@
-<?php namespace CodeIgniter\Commands;
+<?php
+namespace CodeIgniter\Commands;
 
 use Config\Services;
 use Tests\Support\Config\MockAppConfig;
@@ -19,7 +20,6 @@ class CommandsTest extends \CIUnitTestCase
 	protected $logger;
 	protected $runner;
 
-
 	public function setUp()
 	{
 		parent::setUp();
@@ -73,4 +73,34 @@ public function testListCommands()
 		$this->assertContains('Displays basic usage information.', $result);
 	}
 
+	public function testCustomCommand()
+	{
+		$this->runner->index(['app:info']);
+		$result = CITestStreamFilter::$buffer;
+
+		$this->assertContains('CI Version:', $result);
+	}
+
+	public function testNonexistantCommand()
+	{
+		// catch errors too
+		$this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+		$this->runner->index(['app:oops']);
+		$result = CITestStreamFilter::$buffer;
+
+		$this->assertContains('not found', $result);
+	}
+
+	public function testAbstractCommand()
+	{
+		// catch errors too
+		$this->stream_filter = stream_filter_append(STDERR, 'CITestStreamFilter');
+
+		$this->runner->index(['app:pablo']);
+		$result = CITestStreamFilter::$buffer;
+
+		$this->assertContains('not found', $result);
+	}
+
 }