Add console Application to DI container exported types

contributte · Mar 20, 2021 · 5498935 · 5498935
1 parent 859f08c
commit 5498935
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/DI/ConsoleExtension.php b/src/DI/ConsoleExtension.php
@@ -123,6 +123,9 @@ public function loadConfiguration(): void
 
 			$applicationDef->addSetup('setCommandLoader', ['@' . $this->prefix('commandLoader')]);
 		}
+
+		// Export types
+		$this->compiler->addExportedType(Application::class);
 	}
 
 	/**

diff --git a/tests/cases/DI/ConsoleExtension.phpt b/tests/cases/DI/ConsoleExtension.phpt
@@ -11,6 +11,7 @@ use Nette\Bridges\HttpDI\HttpExtension;
 use Nette\DI\Compiler;
 use Nette\DI\Container;
 use Nette\DI\ContainerLoader;
+use Nette\DI\Extensions\DIExtension;
 use Nette\DI\MissingServiceException;
 use Nette\DI\ServiceCreationException;
 use Symfony\Component\Console\Command\Command;
@@ -166,3 +167,23 @@ test(function (): void {
 		}, [getmypid(), 7]);
 	}, ServiceCreationException::class, 'Command "Tests\Fixtures\NoNameCommand" missing tag "console.command[name]" or variable "$defaultName".');
 });
+
+// Always exported
+test(function (): void {
+	$loader = new ContainerLoader(TEMP_DIR, true);
+	$class = $loader->load(function (Compiler $compiler): void {
+		$compiler->addExtension('console', new ConsoleExtension(true));
+		$compiler->addExtension('di', new DIExtension());
+		$compiler->loadConfig(FileMock::create('
+		di:
+			export:
+				types: null
+		', 'neon'));
+	}, [getmypid(), 8]);
+
+	/** @var Container $container */
+	$container = new $class();
+
+	$application = $container->getByType(Application::class);
+	Assert::type(Application::class, $application);
+});