ContainerBuilder: service 'container' is created in constructor

Author: dg

src/DI/ContainerBuilder.php

@@ -42,6 +42,7 @@ class ContainerBuilder
 	public function __construct()
 	{
 		$this->autowiring = new Autowiring($this);
+		$this->addDefinition(self::THIS_CONTAINER)->setType(Container::class);
 	}
 
 
@@ -214,9 +215,6 @@ public function findByTag(string $tag): array
 	 */
 	public function resolveTypes(): void
 	{
-		unset($this->definitions[self::THIS_CONTAINER]);
-		$this->addDefinition(self::THIS_CONTAINER)->setType(Container::class);
-
 		$resolver = new ContainerResolver($this);
 
 		foreach ($this->definitions as $name => $foo) {

tests/DI/Compiler.services.tags.phpt

@@ -30,8 +30,8 @@ $prop->setAccessible(true);
 
 Assert::same([
 	'types' => [
-		'stdClass' => [1 => ['lorem']],
 		Nette\DI\Container::class => [1 => ['container']],
+		'stdClass' => [1 => ['lorem']],
 	],
 	'services' => ['container' => Nette\DI\Container::class, 'lorem' => 'stdClass'],
 	'tags' => [

tests/DI/Compiler.unknownDefinitionKey.phpt

@@ -22,4 +22,4 @@ Assert::throws(function () {
 			setups: []
 			foo: bar
 	');
-}, Nette\InvalidStateException::class, "Service '1': Unknown key 'autowire', 'setups', 'foo' in definition of service, did you mean 'autowired', 'setup'?");
+}, Nette\InvalidStateException::class, "Service '2': Unknown key 'autowire', 'setups', 'foo' in definition of service, did you mean 'autowired', 'setup'?");