ContainerBuilder: added support for array append '$prop[]' = value

Author: dg

src/DI/ContainerBuilder.php

@@ -744,7 +744,7 @@ public function formatStatement(Statement $statement)
 		} elseif (!Nette\Utils\Arrays::isList($entity) || count($entity) !== 2) {
 			throw new ServiceCreationException(sprintf('Expected class, method or property, %s given.', PhpHelpers::dump($entity)));
 
-		} elseif (!preg_match('#^\$?' . PhpHelpers::PHP_IDENT . '\z#', $entity[1])) {
+		} elseif (!preg_match('#^\$?' . PhpHelpers::PHP_IDENT . '(\[\])?\z#', $entity[1])) {
 			throw new ServiceCreationException("Expected function, method or property name, '$entity[1]' given.");
 
 		} elseif ($entity[0] === '') { // globalFunc
@@ -757,15 +757,22 @@ public function formatStatement(Statement $statement)
 			}
 			return $this->formatPhp("$inner->?(?*)", [$entity[1], $arguments]);
 
-		} elseif ($entity[1][0] === '$') { // property getter or setter
+		} elseif ($entity[1][0] === '$') { // property getter, setter or appender
 			Validators::assert($arguments, 'list:0..1', "setup arguments for '" . Nette\Utils\Callback::toString($entity) . "'");
+			$name = substr($entity[1], 1);
+			if ($append = (substr($name, -2) === '[]')) {
+				if (!$arguments) {
+					throw new ServiceCreationException("Missing argument for $entity[1].");
+				}
+				$name = substr($name, 0, -2);
+			}
 			if ($this->getServiceName($entity[0])) {
-				$prop = $this->formatPhp('?->?', [$entity[0], substr($entity[1], 1)]);
+				$prop = $this->formatPhp('?->?', [$entity[0], $name]);
 			} else {
-				$prop = $this->formatPhp($entity[0] . '::$?', [substr($entity[1], 1)]);
+				$prop = $this->formatPhp($entity[0] . '::$?', [$name]);
 			}
 			return $arguments
-				? $this->formatPhp("$prop = ?", [$arguments[0]])
+				? $this->formatPhp($prop . ($append ? '[]' : '') . ' = ?', [$arguments[0]])
 				: $prop;
 
 		} elseif ($service = $this->getServiceName($entity[0])) { // service method

tests/DI/Compiler.services.setup.phpt

@@ -74,6 +74,7 @@ Assert::same([
 Assert::same(8, $container->getService('lorem')->test);
 Assert::same(9, Ipsum::$staticTest);
 Assert::equal(new Lorem, $container->getService('ipsum')->test);
+Assert::same([1, 2], $container->getService('lorem')->arr);
 
 Assert::count(4, Ipsum::$instances);
 Assert::same($container->getService('lorem'), Ipsum::$instances[3]->arg);

tests/DI/ContainerBuilder.error.phpt

@@ -41,3 +41,14 @@ $builder->addDefinition('25_service')
 Assert::exception(function () use ($builder) {
 	$builder->getByType(stdClass::class);
 }, Nette\DI\ServiceCreationException::class, 'Multiple services of type stdClass found: extension.one, 25_service. If you want to overwrite service extension.one, give it proper name.');
+
+
+
+$builder = new DI\ContainerBuilder;
+$builder->addDefinition('one')
+	->setClass('stdClass')
+	->addSetup('$prop[]');
+
+Assert::exception(function () use ($builder) {
+	$builder->generateClasses();
+}, Nette\InvalidStateException::class, "Service 'one': Missing argument for \$prop[].");

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

@@ -24,6 +24,8 @@ services:
 			- [@self, $test](true)
 			- $test = false
 			- $%property%(8)
+			- '$arr[]' = 1
+			- '$arr[]'=2
 
 			# static class property
 			- Ipsum::$staticTest(9)