proxy WIP

nette · Nov 25, 2024 · 933ce25 · 933ce25
1 parent 9b9bfb4
commit 933ce25
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/DI/Container.php b/src/DI/Container.php
@@ -43,6 +43,7 @@ class Container
 
 	/** @var array<string, \Closure>  service name => \Closure */
 	private array $factories = [];
+	private array $lazy = [];
 
 
 	public function __construct(array $params = [])
@@ -215,7 +216,12 @@ public function createService(string $name): object
 		if ($callback = ($this->factories[$name] ?? null)) {
 			$service = $this->preventDeadLock($name, fn() => $callback());
 		} elseif (isset($this->methods[$method])) {
-			$service = $this->preventDeadLock($name, fn() => $this->$method());
+			if (isset($this->lazy[$name])) {
+				$rc = new \ReflectionClass($this->lazy[$name]);
+				$service = $rc->newLazyProxy($this->$method(...));
+			} else {
+				$service = $this->preventDeadLock($name, fn() => $this->$method());
+			}
 		} else {
 			throw new MissingServiceException(sprintf("Service '%s' not found.", $name));
 		}

diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -367,6 +367,12 @@ public function exportMeta(): array
 					$all[$class][] = $name;
 				}
 			}
+
+			if ($def instanceof Definitions\ServiceDefinition && PHP_VERSION_ID >= 80400) {
+				if (is_string($def->getEntity())) {
+					$meta['lazy'][$name] = $def->getEntity();
+				}
+			}
 		}
 
 		[$low, $high] = $this->autowiring->getClassList();