Resolver: fixed self-dependency [Closes #240]

Author: dg

src/DI/Resolver.php

@@ -365,7 +365,15 @@ public function getByType(string $type): Reference
 		) {
 			return new Reference(Reference::SELF);
 		}
-		return new Reference($this->builder->getByType($type, true));
+
+		$name = $this->builder->getByType($type, true);
+		if (
+			!$this->currentServiceAllowed
+			&& $this->currentService === $this->builder->getDefinition($name)
+		) {
+			throw new MissingServiceException;
+		}
+		return new Reference($name);
 	}
 
 

tests/DI/ContainerBuilder.selfdependency.phpt

@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Test: Nette\DI\ContainerBuilder and self-dependency.
+ */
+
+declare(strict_types=1);
+
+use Nette\DI;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+class Foo
+{
+	public function __construct(self $foo)
+	{
+	}
+}
+
+
+$builder = new DI\ContainerBuilder;
+$builder->addDefinition(null)
+	->setFactory(Foo::class);
+
+Assert::exception(function () use ($builder) {
+	createContainer($builder);
+}, Nette\DI\ServiceCreationException::class, 'Service of type Foo: Service of type Foo needed by $foo in __construct() not found. Did you register it in configuration file?');