Resolver: added new special functions constant() and getProperty()

Author: dg

src/DI/PhpGenerator.php

@@ -121,6 +121,14 @@ public function formatStatement(Statement $statement): string
 			case $entity === 'string':
 				return $this->formatPhp('?::?(?, ?)', [Helpers::class, 'convertType', $arguments[0], $entity]);
 
+			case $entity === 'getProperty':
+				return $arguments[0] instanceof Reference
+					? $this->formatPhp('?->?', $arguments)
+					: $this->formatPhp('?::$?', $arguments);
+
+			case $entity === 'constant':
+				return implode('::', $arguments);
+
 			case is_string($entity): // create class
 				return $arguments
 					? $this->formatPhp("new $entity(...?:)", [$arguments])

src/DI/Resolver.php

@@ -201,6 +201,22 @@ public function completeStatement(Statement $statement, bool $currentServiceAllo
 				}
 				break;
 
+			case $entity === 'getProperty':
+				if (count($arguments) !== 2) {
+					throw new ServiceCreationException(sprintf('Function %s() expects 2 parameter, %s given.', $entity, count($arguments)));
+				}
+
+				break;
+
+			case $entity === 'constant':
+				if (count($arguments) !== 2) {
+					throw new ServiceCreationException(sprintf('Function %s() expects 2 parameter, %s given.', $entity, count($arguments)));
+				}
+
+				$arguments[0] = $this->resolveReferenceType($arguments[0]);
+				break;
+
+
 			case is_string($entity): // create class
 				if (!class_exists($entity)) {
 					throw new ServiceCreationException(sprintf("Class '%s' not found.", $entity));
@@ -460,9 +476,9 @@ private function convertReferences(array $arguments): array
 				if (!isset($pair[1])) { // @service
 					$val = new Reference($pair[0]);
 				} elseif (preg_match('#^[A-Z][a-zA-Z0-9_]*$#D', $pair[1])) { // @service::CONSTANT
-					$val = ContainerBuilder::literal($this->resolveReferenceType(new Reference($pair[0])) . '::' . $pair[1]);
+					$val = new Statement('constant', [new Reference($pair[0]), $pair[1]]);
 				} else { // @service::property
-					$val = new Statement([new Reference($pair[0]), '$' . $pair[1]]);
+					$val = new Statement('getProperty', [new Reference($pair[0]), $pair[1]]);
 				}
 			} elseif (is_string($val) && str_starts_with($val, '@@')) { // escaped text @@
 				$val = substr($val, 1);