ServiceDefinition: setup: prepends @self in depth

Author: dg

src/DI/Definitions/ServiceDefinition.php

@@ -177,15 +177,20 @@ public function complete(Nette\DI\Resolver $resolver): void
 
 		$this->creator = $resolver->completeStatement($this->creator);
 
-		foreach ($this->setup as &$setup) {
-			if (
-				is_string($setup->getEntity())
-				&& strpbrk($setup->getEntity(), ':@?\\') === false
-			) { // auto-prepend @self
-				$setup = new Statement([new Reference(Reference::Self), $setup->getEntity()], $setup->arguments);
-			}
+		foreach ($this->setup as $i => $setup) {
+			$this->setup[$i] = $resolver->completeStatement($this->prependSelf($setup), true);
+		}
+	}
 
-			$setup = $resolver->completeStatement($setup, true);
+
+	private function prependSelf(Statement $setup): Statement
+	{
+		if (is_string($member = $setup->getEntity()) && preg_match('~^\$?[a-z][a-zA-Z0-9[\]]*$~', $member)) {
+			return new Statement([new Reference(Reference::Self), $member], $setup->arguments);
+		} elseif (is_array($setup->getEntity()) && $setup->getEntity()[0] instanceof Statement) {
+			return new Statement([$this->prependSelf($setup->getEntity()[0]), $setup->getEntity()[1]], $setup->arguments);
+		} else {
+			return $setup;
 		}
 	}
 

tests/DI/Compiler.services.setup.phpt

@@ -22,6 +22,7 @@ class Lorem
 	public function test(...$args)
 	{
 		Notes::add(__METHOD__ . ' ' . implode(' ', $args));
+		return new self;
 	}
 }
 
@@ -79,6 +80,8 @@ Assert::same([
 	'globtest 7',
 	'Ipsum::test  a',
 	'Ipsum::test 10 b',
+	'Lorem::test outer',
+	'Lorem::test inner',
 ], Notes::fetch());
 
 Assert::same(8, $container->getService('lorem')->test);

tests/DI/files/compiler.services.setup.neon

@@ -36,6 +36,7 @@ services:
 			# rich
 			- Ipsum(a)::test
 			- Ipsum(b)::test(10)
+			- test(outer)::test(inner)
 
 			# object
 			- \Ipsum(@self)