ContainerBuilder: checks for function/property name validity

Author: dg

src/DI/ContainerBuilder.php

@@ -610,6 +610,9 @@ 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])) {
+			throw new ServiceCreationException("Expected function, method or property name, '$entity[1]' given.");
+
 		} elseif ($entity[0] === '') { // globalFunc
 			return $this->formatPhp("$entity[1](?*)", array($arguments));
 

tests/DI/ContainerBuilder.error.phpt

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Test: Nette\DI\ContainerBuilder.
+ */
+
+use Nette\DI,
+	Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+$builder = new DI\ContainerBuilder;
+$builder->addDefinition('one')
+	->setClass('stdClass')
+	->addSetup('::1234');
+
+Assert::exception(function() use ($builder) {
+	$builder->generateClasses();
+}, 'Nette\InvalidStateException', "Service 'one': Expected function, method or property name, '1234' given.");