added DI extensions auto-discovery

Author: dg

composer.json

@@ -55,6 +55,12 @@
 	"extra": {
 		"branch-alias": {
 			"dev-master": "3.3-dev"
+		},
+		"nette": {
+			"di-extensions": {
+				"constants": "Nette\\Bootstrap\\Extensions\\ConstantsExtension",
+				"php": "Nette\\Bootstrap\\Extensions\\PhpIniExtension"
+			}
 		}
 	}
 }

src/Bootstrap/Configurator.php

@@ -78,6 +78,10 @@ class Configurator
 	/** @var list<string|array<string, mixed>> */
 	protected array $configs = [];
 
+	/** @var string[] extension names to exclude from auto-discovery */
+	private array $excludeExtensions = [];
+	private bool $autoDiscovery = true;
+
 
 	public function __construct()
 	{
@@ -175,6 +179,21 @@ public function addServices(array $services): static
 	}
 
 
+	/**
+	 * Disables auto-discovery of extensions from installed packages.
+	 * Without arguments disables completely, with arguments disables only specified extensions.
+	 */
+	public function excludeExtension(string ...$extensions): static
+	{
+		if (count($extensions) === 0) {
+			$this->autoDiscovery = false;
+		} else {
+			$this->excludeExtensions = array_merge($this->excludeExtensions, $extensions);
+		}
+		return $this;
+	}
+
+
 	protected function getDefaultParameters(): array
 	{
 		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@@ -255,6 +274,30 @@ public function addConfig(string|array $config): static
 	}
 
 
+	/**
+	 * Discovers extensions from installed Composer packages.
+	 * Reads extra.nette.di-extensions from vendor/composer/installed.json
+	 * @return array<string, string|array{class: class-string, args: array}>
+	 */
+	protected function discoverExtensions(): array
+	{
+		$vendorDir = $this->staticParameters['vendorDir'] ?? null;
+		if (!$vendorDir || !is_file($installedJson = $vendorDir . '/composer/installed.json')) {
+			return [];
+		}
+
+		$installed = json_decode(Nette\Utils\FileSystem::read($installedJson), true);
+		$extensions = [];
+		foreach ($installed['packages'] ?? [] as $package) {
+			foreach ($package['extra']['nette']['di-extensions'] ?? [] as $name => $def) {
+				$extensions[$name] = is_string($def) ? $def : [$def['class'], $def['args'] ?? []];
+			}
+		}
+
+		return $extensions;
+	}
+
+
 	/**
 	 * Returns system DI container.
 	 */
@@ -312,7 +355,10 @@ public function generateContainer(DI\Compiler $compiler): void
 		$builder = $compiler->getContainerBuilder();
 		$builder->addExcludedClasses($this->autowireExcludedClasses);
 
-		foreach ($this->defaultExtensions as $name => $extension) {
+		$extensions = $this->autoDiscovery ? $this->discoverExtensions() : [];
+		$extensions = array_merge($extensions, $this->defaultExtensions);
+		$extensions = array_diff_key($extensions, $this->excludeExtensions);
+		foreach ($extensions as $name => $extension) {
 			[$class, $args] = is_string($extension)
 				? [$extension, []]
 				: $extension;
@@ -342,6 +388,7 @@ protected function generateContainerKey(): array
 			class_exists(ClassLoader::class) // composer update
 				? filemtime((new \ReflectionClass(ClassLoader::class))->getFilename())
 				: null,
+			$this->autoDiscovery ? $this->excludeExtensions : null,
 		];
 	}
 

tests/Bootstrap/Configurator.excludeExtension.phpt

@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Test: Nette\Configurator::excludeExtension()
+ */
+
+declare(strict_types=1);
+
+use Nette\Bootstrap\Configurator;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+test('excludeExtension() disables extension from defaultExtensions', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->excludeExtension('application');
+
+	$container = $configurator->createContainer();
+
+	// application extension should not be registered
+	Assert::false($container->hasService('application'));
+	Assert::false($container->hasService('nette.presenterFactory'));
+
+	// other extensions should still work
+	Assert::true($container->hasService('httpRequest'));
+});
+
+
+test('excludeExtension() without arguments disables all auto-discovery', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->excludeExtension();
+
+	// defaultExtensions should still be registered
+	$container = $configurator->createContainer();
+	Assert::true($container->hasService('application'));
+	Assert::true($container->hasService('httpRequest'));
+});
+
+
+test('excludeExtension() can disable multiple extensions', function () {
+	$configurator = new Configurator;
+	$configurator->setTempDirectory(getTempDir());
+	$configurator->excludeExtension('application', 'mail');
+
+	$container = $configurator->createContainer();
+
+	Assert::false($container->hasService('application'));
+	Assert::false($container->hasService('nette.mailer'));
+	Assert::true($container->hasService('httpRequest'));
+});