Bugfix: nullable helperSet

Author: f3l1x

.docs/README.md

@@ -31,7 +31,6 @@ console:
     autoExit: true / false
     url: https://contributte.com
     lazy: false
-    helperSet: @customHelperSet
 ```
 
 In SAPI (CLI) mode there is no http request and thus no URL address. This is an inconvenience you have to solve by yourself - via the `console.url` option.
@@ -41,7 +40,7 @@ console:
     url: https://contributte.org
 ```
 
-### HelperSet
+### Helpers
 
 You could also define you custom `helperSet` just in case. There are 2 possible approaches. You can register your
 `App\Model\MyCustomHelperSet` as a service under the `services` section or provide it directly to the extension config `helperSet`.
@@ -63,8 +62,7 @@ console:
     helperSet: App\Model\MyCustomHelperSet
 ```
 
-By default, helperSet contains 5 helpers - 4 defined in `Symfony\Component\Console\Application` and 1 defined
-by the extension itself. You can add more helpers, if needed.
+By default, helperSet contains 4 helpers defined in `Symfony\Component\Console\Application`. You can add more helpers, if need them.
 
 ```yaml
 console:

src/DI/ConsoleExtension.php

@@ -16,6 +16,7 @@
 use Nette\Http\UrlScript;
 use Nette\Schema\Expect;
 use Nette\Schema\Schema;
+use Nette\Schema\ValidationException;
 use Nette\Utils\Arrays;
 use stdClass;
 use Symfony\Component\Console\Command\Command;
@@ -50,7 +51,14 @@ public function getConfigSchema(): Schema
 			'version' => Expect::anyOf(Expect::string(), Expect::int(), Expect::float()),
 			'catchExceptions' => Expect::bool(),
 			'autoExit' => Expect::bool(),
-			'helperSet' => Expect::anyOf(Expect::string(), Expect::array(), Expect::type(Statement::class)),
+			'helperSet' => Expect::anyOf(Expect::string(), Expect::type(Statement::class))
+				->assert(function ($helperSet) {
+					if ($helperSet === null) {
+						throw new ValidationException('helperSet cannot be null');
+					}
+
+					return true;
+				}),
 			'helpers' => Expect::arrayOf(
 				Expect::anyOf(Expect::string(), Expect::array(), Expect::type(Statement::class))
 			),
@@ -70,42 +78,43 @@ public function loadConfiguration(): void
 
 		$builder = $this->getContainerBuilder();
 		$config = $this->config;
-		$definitionsHelper = new ExtensionDefinitionsHelper($this->compiler);
+		$defhelp = new ExtensionDefinitionsHelper($this->compiler);
 
+		// Register Symfony Console Application
 		$applicationDef = $builder->addDefinition($this->prefix('application'))
 			->setFactory(Application::class);
 
+		// Setup console name
 		if ($config->name !== null) {
 			$applicationDef->addSetup('setName', [$config->name]);
 		}
 
+		// Setup console version
 		if ($config->version !== null) {
 			$applicationDef->addSetup('setVersion', [(string) $config->version]);
 		}
 
+		// Catch or populate exceptions
 		if ($config->catchExceptions !== null) {
 			$applicationDef->addSetup('setCatchExceptions', [$config->catchExceptions]);
 		}
 
+		// Call die() or not
 		if ($config->autoExit !== null) {
 			$applicationDef->addSetup('setAutoExit', [$config->autoExit]);
 		}
 
+		// Register given or default HelperSet
 		if ($config->helperSet !== null) {
-			$helperSetConfig = $config->helperSet;
-			$helperSetPrefix = $this->prefix('helperSet');
-			$helperSetDef = $definitionsHelper->getDefinitionFromConfig($helperSetConfig, $helperSetPrefix);
-
-			if ($helperSetDef instanceof Definition) {
-				$helperSetDef->setAutowired(false);
-			}
-
-			$applicationDef->addSetup('setHelperSet', [$helperSetDef]);
+			$applicationDef->addSetup('setHelperSet', [
+				$defhelp->getDefinitionFromConfig($config->helperSet, $this->prefix('helperSet')),
+			]);
 		}
 
+		// Register extra helpers
 		foreach ($config->helpers as $helperName => $helperConfig) {
 			$helperPrefix = $this->prefix('helper.' . $helperName);
-			$helperDef = $definitionsHelper->getDefinitionFromConfig($helperConfig, $helperPrefix);
+			$helperDef = $defhelp->getDefinitionFromConfig($helperConfig, $helperPrefix);
 
 			if ($helperDef instanceof Definition) {
 				$helperDef->setAutowired(false);
@@ -114,6 +123,7 @@ public function loadConfiguration(): void
 			$applicationDef->addSetup('?->getHelperSet()->set(?)', ['@self', $helperDef]);
 		}
 
+		// Commands lazy loading
 		if ($config->lazy) {
 			$builder->addDefinition($this->prefix('commandLoader'))
 				->setType(CommandLoaderInterface::class)

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

@@ -8,6 +8,7 @@ use Contributte\Console\DI\ConsoleExtension;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
+use Nette\DI\InvalidConfigurationException;
 use Symfony\Component\Console\Application;
 use Tester\Assert;
 use Tester\FileMock;
@@ -87,3 +88,17 @@ test(function (): void {
 	// 1 foo helper
 	Assert::count(5, $container->getByType(Application::class)->getHelperSet()->getIterator());
 });
+
+// Null helperSet
+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:
+			helperSet: null
+		', 'neon'));
+		}, [getmypid(), 5]);
+	}, InvalidConfigurationException::class, "The option 'console › helperSet' expects to be string|Nette\DI\Definitions\Statement, null given.");
+});