Resolver: processing of functions like not() moved to PhpGenerator

nette · Apr 28, 2024 · 6938188 · 6938188
1 parent 5f9473e
commit 6938188
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/DI/PhpGenerator.php b/src/DI/PhpGenerator.php
@@ -112,6 +112,15 @@ public function formatStatement(Statement $statement): string
 			case is_string($entity) && str_contains($entity, '?'): // PHP literal
 				return $this->formatPhp($entity, $arguments);
 
+			case $entity === 'not':
+				return $this->formatPhp('!(?)', $arguments);
+
+			case $entity === 'bool':
+			case $entity === 'int':
+			case $entity === 'float':
+			case $entity === 'string':
+				return $this->formatPhp('?::?(?, ?)', [Helpers::class, 'convertType', $arguments[0], $entity]);
+
 			case is_string($entity): // create class
 				return $arguments
 					? $this->formatPhp("new $entity(...?:)", [$arguments])

diff --git a/src/DI/Resolver.php b/src/DI/Resolver.php
@@ -192,23 +192,13 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 				break;
 
 			case $entity === 'not':
-				if (count($arguments) !== 1) {
-					throw new ServiceCreationException(sprintf('Function %s() expects 1 parameter, %s given.', $entity, count($arguments)));
-				}
-
-				$entity = ['', '!'];
-				break;
-
 			case $entity === 'bool':
 			case $entity === 'int':
 			case $entity === 'float':
 			case $entity === 'string':
 				if (count($arguments) !== 1) {
 					throw new ServiceCreationException(sprintf('Function %s() expects 1 parameter, %s given.', $entity, count($arguments)));
 				}
-
-				$arguments = [$arguments[0], $entity];
-				$entity = [Helpers::class, 'convertType'];
 				break;
 
 			case is_string($entity): // create class