Compiler: InjectExtension is moved after extensions added by ExtensionsExtension [Closes #88]

Author: dg

src/DI/Compiler.php

@@ -155,9 +155,6 @@ public function processParameters()
 	/** @internal */
 	public function processExtensions()
 	{
-		$last = $this->getExtensions(Extensions\InjectExtension::class);
-		$this->extensions = array_merge(array_diff_key($this->extensions, $last), $last);
-
 		$this->config = Helpers::expand(array_diff_key($this->config, self::$reserved), $this->builder->parameters)
 			+ array_intersect_key($this->config, self::$reserved);
 
@@ -166,6 +163,9 @@ public function processExtensions()
 			$extension->loadConfiguration();
 		}
 
+		$last = $this->getExtensions(Extensions\InjectExtension::class);
+		$this->extensions = array_merge(array_diff_key($this->extensions, $last), $last);
+
 		$extensions = array_diff_key($this->extensions, $first);
 		foreach (array_intersect_key($extensions, $this->config) as $name => $extension) {
 			$extension->setConfig($this->config[$name] ?: []);

tests/DI/InjectExtension.basic.phpt

@@ -45,7 +45,7 @@ class LastExtension extends DI\CompilerExtension
 	function beforeCompile()
 	{
 		// note that services should be added in loadConfiguration()
-		$this->getContainerBuilder()->addDefinition('one')
+		$this->getContainerBuilder()->addDefinition($this->prefix('one'))
 			->setClass('Service')
 			->setInject(TRUE);
 	}
@@ -54,8 +54,12 @@ class LastExtension extends DI\CompilerExtension
 
 $compiler = new DI\Compiler;
 $compiler->addExtension('inject', new Nette\DI\Extensions\InjectExtension);
+$compiler->addExtension('extensions', new Nette\DI\Extensions\ExtensionsExtension);
 $compiler->addExtension('last', new LastExtension);
 $container = createContainer($compiler, '
+extensions:
+	ext: LastExtension
+
 services:
 	- stdClass
 	two:
@@ -75,7 +79,16 @@ Assert::equal([
 	new Statement(['@self', 'injectC']),
 	new Statement(['@self', '$c'], ['@\\stdClass']),
 	new Statement(['@self', '$a'], ['@\\stdClass']),
-], $builder->getDefinition('one')->getSetup());
+], $builder->getDefinition('last.one')->getSetup());
+
+Assert::equal([
+	new Statement(['@self', 'injectB']),
+	new Statement(['@self', 'injectA']),
+	new Statement(['@self', 'injectD']),
+	new Statement(['@self', 'injectC']),
+	new Statement(['@self', '$c'], ['@\\stdClass']),
+	new Statement(['@self', '$a'], ['@\\stdClass']),
+], $builder->getDefinition('ext.one')->getSetup());
 
 Assert::equal([
 	new Statement(['@self', 'injectB'], [1]),