Resolver::normalizeReference() normalizes current service to 'self', added getDefinition() & resolveReferenceType()

Author: dg

src/DI/Resolver.php

@@ -68,19 +68,34 @@ public function resolveDefinition(Definition $def): void
 	}
 
 
+	private function getDefinition($name): Definition
+	{
+		return $name === ContainerBuilder::THIS_SERVICE
+			? $this->currentService
+			: $this->builder->getDefinition($name);
+	}
+
+
 	public function resolveServiceType(string $name): ?string
 	{
-		$def = $this->builder->getDefinition($name);
+		$def = $this->getDefinition($name);
 		if (!$def->getType()) {
 			$this->resolveDefinition($def);
 		}
 		return $def->getType();
 	}
 
 
+	private function resolveReferenceType(Reference $reference): ?string
+	{
+		return $reference->isName()
+			? $this->resolveServiceType($reference->getValue())
+			: $reference->getValue();
+	}
+
+
 	public function resolveEntityType($entity): ?string
 	{
-		$definitions = $this->builder->getDefinitions();
 		$entity = $this->normalizeEntity($entity instanceof Statement ? $entity->getEntity() : $entity);
 
 		if (is_array($entity)) {
@@ -111,11 +126,7 @@ public function resolveEntityType($entity): ?string
 			return $type;
 
 		} elseif ($entity instanceof Reference) { // alias or factory
-			if (!$entity->isName()) { // @\Class
-				return $entity->getValue();
-			}
-			$service = $entity->getName();
-			return $definitions[$service]->getImplement() ?: $this->resolveServiceType($service);
+			return $this->resolveReferenceType($entity);
 
 		} elseif (is_string($entity)) { // class
 			if (!class_exists($entity)) {
@@ -151,7 +162,6 @@ public function completeStatement(Statement $statement, Definition $currentServi
 
 		$entity = $this->normalizeEntity($statement->getEntity());
 		$arguments = $this->convertReferences($statement->arguments);
-		$definitions = $this->builder->getDefinitions();
 
 		switch (true) {
 			case is_string($entity) && Strings::contains($entity, '?'): // PHP literal
@@ -177,7 +187,7 @@ public function completeStatement(Statement $statement, Definition $currentServi
 
 			case $entity instanceof Reference:
 				$params = [];
-				foreach ($definitions[$entity->getName()]->parameters as $k => $v) {
+				foreach ($this->getDefinition($entity->getName())->parameters as $k => $v) {
 					$params[] = preg_replace('#\w+\z#', '\$$0', (is_int($k) ? $v : $k)) . (is_int($k) ? '' : ' = ' . PhpHelpers::dump($v));
 				}
 				$rm = new \ReflectionFunction(eval('return function(' . implode(', ', $params) . ') {};'));
@@ -214,7 +224,7 @@ public function completeStatement(Statement $statement, Definition $currentServi
 						} elseif (
 							$type = !$entity[0] instanceof Reference || $entity[1] === 'create'
 								? $this->resolveEntityType($entity[0])
-								: $definitions[$entity[0]->getName()]->getType()
+								: $this->resolveServiceType($entity[0]->getName())
 						) {
 							$rc = new ReflectionClass($type);
 							if ($rc->hasMethod($entity[1])) {
@@ -319,7 +329,10 @@ public function normalizeReference($arg): ?Reference
 			return null;
 		}
 		if ($service === ContainerBuilder::THIS_SERVICE) {
-			$service = $this->currentService->getName();
+			if (current(array_keys($this->builder->getDefinitions(), $this->currentService, true))) {
+				return new Reference($this->currentService->getName());
+			}
+			return new Reference(ContainerBuilder::THIS_SERVICE);
 		}
 		if (Strings::contains($service, '\\')) {
 			try {
@@ -402,8 +415,8 @@ private function convertReferences(array $arguments): array
 				if (!isset($pair[1])) { // @service
 					$val = new Reference($pair[0]);
 				} elseif (preg_match('#^[A-Z][A-Z0-9_]*\z#', $pair[1], $m)) { // @service::CONSTANT
-					$ref = $this->normalizeReference(new Reference($pair[0]));
-					$val = ContainerBuilder::literal($this->builder->getDefinition($ref->getName())->getType() . '::' . $pair[1]);
+					$type = $this->resolveReferenceType(new Reference($pair[0]));
+					$val = ContainerBuilder::literal($type . '::' . $pair[1]);
 				} else { // @service::property
 					$val = new Statement([new Reference($pair[0]), '$' . $pair[1]]);
 				}