Tests: improvements

Author: f3l1x

src/CommandLoader/ContainerCommandLoader.php

@@ -29,12 +29,10 @@ public function __construct(Container $container, array $commandMap)
 	 * Loads a command.
 	 *
 	 * @param string $name
-	 * @return Command
 	 * @throws CommandNotFoundException
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
-	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
 	 */
-	public function get($name)
+	public function get($name): Command
 	{
 		if (!$this->has($name)) {
 			throw new CommandNotFoundException(sprintf('Command "%s" does not exist.', $name));

tests/cases/Unit/CommandLoader/CommandLoader.phpt

@@ -8,14 +8,9 @@ use Contributte\Console\CommandLoader\ContainerCommandLoader;
 use Contributte\Console\Exception\Runtime\CommandNotFoundException;
 use Nette\DI\Container;
 use Tester\Assert;
-use Tester\Environment;
 
 require_once __DIR__ . '/../../../bootstrap.php';
 
-if (!interface_exists('Symfony\Component\Console\CommandLoader\CommandLoaderInterface', true)) {
-	Environment::skip('CommandLoaderInterface is available from symfony/console 3.4');
-}
-
 // Empty loader
 test(function (): void {
 	$container = new Container();

tests/cases/Unit/DI/ConsoleExtension.lazy.phpt

@@ -5,11 +5,13 @@
  */
 
 use Contributte\Console\Application;
+use Contributte\Console\CommandLoader\ContainerCommandLoader;
 use Contributte\Console\DI\ConsoleExtension;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
 use Tester\Assert;
 use Tester\FileMock;
 use Tests\Fixtures\FooCommand;
@@ -33,7 +35,12 @@ test(function (): void {
 	$container = new $class();
 
 	Assert::type(Application::class, $container->getByType(Application::class));
+
 	Assert::false($container->isCreated('foo'));
 	Assert::count(1, $container->findByType(Command::class));
 	Assert::type(FooCommand::class, $container->getByType(Command::class));
+
+	$loader = $container->getByType(CommandLoaderInterface::class);
+	Assert::type(ContainerCommandLoader::class, $loader);
+	Assert::same(['app:foo'], $loader->getNames());
 });

tests/cases/Unit/DI/ConsoleExtension.phpt

@@ -11,6 +11,8 @@ use Nette\Bridges\HttpDI\HttpExtension;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
+use Nette\DI\MissingServiceException;
+use Nette\DI\ServiceCreationException;
 use Symfony\Component\Console\Command\Command;
 use Tester\Assert;
 use Tester\FileMock;
@@ -71,9 +73,96 @@ test(function (): void {
 	Assert::equal('https://contributte.org/', (string) $container->getService('http.request')->getUrl());
 });
 
-// No CLI mode
+// No mode provided
 test(function (): void {
 	Assert::exception(function (): void {
 		new ConsoleExtension();
 	}, InvalidArgumentException::class, 'Provide CLI mode, e.q. Contributte\Console\DI\ConsoleExtension(%consoleMode%).');
 });
+
+// Non-CLI mode
+test(function (): void {
+	$loader = new ContainerLoader(TEMP_DIR, true);
+	$class = $loader->load(function (Compiler $compiler): void {
+		$compiler->addExtension('console', new ConsoleExtension(false));
+	}, [getmypid(), 4]);
+
+	/** @var Container $container */
+	$container = new $class();
+
+	Assert::exception(static function () use ($container): void {
+		$container->getByType(Application::class);
+	}, MissingServiceException::class);
+});
+
+// Config
+test(function (): void {
+	$loader = new ContainerLoader(TEMP_DIR, true);
+	$class = $loader->load(function (Compiler $compiler): void {
+		$compiler->addExtension('console', new ConsoleExtension(true));
+		$compiler->loadConfig(FileMock::create('
+		console:
+			name: Hello world
+			version: 1.0.0
+			catchExceptions: false
+			autoExit: false
+		', 'neon'));
+	}, [getmypid(), 5]);
+
+	/** @var Container $container */
+	$container = new $class();
+
+	$application = $container->getByType(Application::class);
+	Assert::type(Application::class, $application);
+	Assert::same('Hello world', $application->getName());
+	Assert::same('1.0.0', $application->getVersion());
+	Assert::false($application->areExceptionsCaught());
+	Assert::false($application->isAutoExitEnabled());
+});
+
+// Lazy commands
+test(function (): void {
+	$loader = new ContainerLoader(TEMP_DIR, true);
+	$class = $loader->load(function (Compiler $compiler): void {
+		$compiler->addExtension('console', new ConsoleExtension(true));
+		$compiler->loadConfig(FileMock::create('
+		console:
+			lazy: true
+		services:
+			defaultName: Tests\Fixtures\FooCommand
+			tagNameString:
+				factory: Tests\Fixtures\FooCommand
+				tags: [console.command: bar]
+			tagNameArray:
+				factory: Tests\Fixtures\FooCommand
+				tags: [console.command: [name: baz]]
+		', 'neon'));
+	}, [getmypid(), 6]);
+
+	/** @var Container $container */
+	$container = new $class();
+
+	$application = $container->getByType(Application::class);
+	Assert::type(Application::class, $application);
+	Assert::false($container->isCreated('defaultName'));
+	Assert::count(3, $container->findByType(Command::class));
+	Assert::true($application->has('app:foo'));
+	Assert::true($application->has('bar'));
+	Assert::true($application->has('baz'));
+});
+
+// Invalid command
+test(function (): void {
+	Assert::exception(function (): void {
+		$loader = new ContainerLoader(TEMP_DIR, true);
+		$loader->load(function (Compiler $compiler): void {
+			$compiler->addExtension('console', new ConsoleExtension(true));
+			$compiler->loadConfig(FileMock::create('
+			console:
+				lazy: true
+			services:
+				noName: Tests\Fixtures\NoNameCommand
+		', 'neon'));
+		}, [getmypid(), 7]);
+	}, ServiceCreationException::class, 'Command "Tests\Fixtures\NoNameCommand" missing tag "console.command[name]" or variable "$defaultName".');
+});

tests/fixtures/NoNameCommand.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Tests\Fixtures;
+
+use Symfony\Component\Console\Command\Command;
+
+final class NoNameCommand extends Command
+{
+
+}