added ConfiguratorsExtension [problem v nette\database]

Author: dg

src/DI/Compiler.php

@@ -23,7 +23,8 @@ class Compiler
 	private const
 		SERVICES = 'services',
 		PARAMETERS = 'parameters',
-		DI = 'di';
+		DI = 'di',
+		CONFIGURATORS = 'configurators';
 
 	/** @var CompilerExtension[] */
 	private $extensions = [];
@@ -53,6 +54,7 @@ public function __construct(?ContainerBuilder $builder = null)
 		$this->dependencies = new DependencyChecker;
 		$this->addExtension(self::SERVICES, new Extensions\ServicesExtension);
 		$this->addExtension(self::PARAMETERS, new Extensions\ParametersExtension($this->configs));
+		$this->addExtension(self::CONFIGURATORS, new Extensions\ConfiguratorsExtension);
 	}
 
 
@@ -217,7 +219,10 @@ public function compile(): string
 	/** @internal */
 	public function processExtensions(): void
 	{
-		$first = $this->getExtensions(Extensions\ParametersExtension::class) + $this->getExtensions(Extensions\ExtensionsExtension::class);
+		$first = $this->getExtensions(Extensions\ConfiguratorsExtension::class)
+			+ $this->getExtensions(Extensions\ParametersExtension::class)
+			+ $this->getExtensions(Extensions\ExtensionsExtension::class);
+
 		foreach ($first as $name => $extension) {
 			$config = $this->processSchema($extension->getConfigSchema(), $this->configs[$name] ?? [], $name);
 			$extension->setConfig($this->config[$name] = $config);
@@ -233,7 +238,11 @@ public function processExtensions(): void
 
 		$extensions = array_diff_key($this->extensions, $first, [self::SERVICES => 1]);
 		foreach ($extensions as $name => $extension) {
-			$config = $this->processSchema($extension->getConfigSchema(), $this->configs[$name] ?? [], $name);
+			$config = $this->processSchema(
+				$extension->getConfigSchema(),
+				array_merge([(array) $extension->getConfig()], $this->configs[$name] ?? []),
+				$name
+			);
 			$extension->setConfig($this->config[$name] = $config);
 		}
 

src/DI/Config/Adapters/PhpAdapter.php

@@ -24,7 +24,10 @@ final class PhpAdapter implements Nette\DI\Config\Adapter
 	 */
 	public function load(string $file): array
 	{
-		return require $file;
+		$data = require $file;
+		return $data instanceof \Closure
+			? ['configurators' => [$data]]
+			: $data;
 	}
 
 

src/DI/Extensions/ConfiguratorsExtension.php

@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\DI\Extensions;
+
+use Nette;
+
+
+/**
+ * PHP configurators.
+ */
+class ConfiguratorsExtension extends Nette\DI\CompilerExtension
+{
+	public function loadConfiguration()
+	{
+		foreach ($this->config as $callback) {
+			$callback($this->compiler);
+		}
+	}
+}

tests/DI/Compiler.config.phpt

@@ -29,6 +29,7 @@ test('Compiler config', function () {
 
 	Assert::same(
 		[
+			'configurators' => [],
 			'parameters' => [
 				'item1' => 1,
 			],

tests/DI/Compiler.extension.anonymous.phpt

@@ -18,4 +18,4 @@ $compiler = new DI\Compiler;
 $compiler->addExtension(null, new FooExtension);
 $compiler->addExtension(null, new FooExtension);
 
-Assert::count(4, $compiler->getExtensions());
+Assert::count(5, $compiler->getExtensions());

tests/DI/Compiler.loadConfig.include.phpt

@@ -24,10 +24,12 @@ Assert::same([
 	__DIR__ . DIRECTORY_SEPARATOR . 'files/loader.includes.grandchild.neon',
 	(new ReflectionClass(Nette\DI\Extensions\ServicesExtension::class))->getFileName(),
 	(new ReflectionClass(Nette\DI\Extensions\ParametersExtension::class))->getFileName(),
+	(new ReflectionClass(Nette\DI\Extensions\ConfiguratorsExtension::class))->getFileName(),
 ], array_keys($compiler->exportDependencies()[1]));
 
 
 Assert::equal([
+	'configurators' => [],
 	'parameters' => [
 		'me' => [
 			'loader.includes.child.neon',

tests/DI/ConfiguratorsExtension.basic.phpt

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Service
+{
+}
+
+
+$compiler = new DI\Compiler;
+$compiler->loadConfig(__DIR__ . '/files/phpConfig1.php');
+$compiler->loadConfig(__DIR__ . '/files/phpConfig2.php');
+$container = createContainer($compiler);
+
+Assert::type(Service::class, $container->getByType(Service::class));
+Assert::same(['foo' => 123], $container->parameters);

tests/DI/ExtensionsExtension.basic.phpt

@@ -70,4 +70,4 @@ foo:
 
 Assert::same('hello', $container->parameters['foo']);
 Assert::same('test', $container->parameters['bar']);
-Assert::same(['services', 'parameters', 'first', 'extensions', 'foo', 'bar'], $container->parameters['first']);
+Assert::same(['services', 'parameters', 'configurators', 'first', 'extensions', 'foo', 'bar'], $container->parameters['first']);

tests/DI/files/phpConfig1.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+return function (Nette\DI\Compiler $compiler) {
+	$builder = $compiler->getContainerBuilder();
+	$builder->addDefinition(null)
+		->setFactory(Service::class);
+};

tests/DI/files/phpConfig2.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+return function (Nette\DI\Compiler $compiler) {
+	$compiler->addConfig([
+		'parameters' => [
+			'foo' => 123,
+		],
+	]);
+};