The #[Service] attribute at class will make prepareSharedObject insta…

…nt create instance #1141
windwalker-io · Dec 11, 2024 · 78fc73d · 78fc73d
1 parent fc788e8
commit 78fc73d
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/packages/di/src/Container.php b/packages/di/src/Container.php
@@ -190,7 +190,7 @@ public static function getDefaultAttributes(): array
      */
     public function set(string $id, mixed $value, int $options = 0): StoreDefinitionInterface
     {
-        $definition = $this->getDefinition($id);
+        $definition = $this->findDefinition($id, false);
 
         if ($definition && $definition->isProtected()) {
             throw new DefinitionException(
@@ -380,7 +380,7 @@ public function has(string $id): bool
 
     public function hasCached(string $id): bool
     {
-        return $this->getDefinition($id)?->getCache() !== null;
+        return $this->findDefinition($id, false)?->getCache() !== null;
     }
 
     /**
@@ -416,7 +416,7 @@ public function remove(string $id): static
      */
     public function fork(string $id, string $newId, bool $forceNew = false): mixed
     {
-        $raw = clone $this->getDefinition($id);
+        $raw = clone $this->findDefinition($id, true);
 
         $this->storage[$newId] = $raw;
 
@@ -433,6 +433,11 @@ public function fork(string $id, string $newId, bool $forceNew = false): mixed
      * @since   2.0
      */
     public function getDefinition(string $id): ?StoreDefinitionInterface
+    {
+        return $this->findDefinition($id, true);
+    }
+
+    protected function findDefinition(string $id, bool $serviceAutowire = false): ?StoreDefinitionInterface
     {
         $id = $this->resolveAlias($id);
 
@@ -441,7 +446,7 @@ public function getDefinition(string $id): ?StoreDefinitionInterface
         }
 
         // Get instant service
-        if (class_exists($id) && $service = static::getServiceAttribute(new ReflectionClass($id))) {
+        if ($serviceAutowire && class_exists($id) && $service = static::getServiceAttribute(new ReflectionClass($id))) {
             $definition = new StoreDefinition($id, $this->newInstance($id));
             $definition->providedIn($service->providedIn);
 
@@ -451,7 +456,7 @@ public function getDefinition(string $id): ?StoreDefinitionInterface
         }
 
         if ($this->parent instanceof static) {
-            $parentDefinition = $this->parent->getDefinition($id);
+            $parentDefinition = $this->parent->findDefinition($id, $serviceAutowire);
 
             // Store parent definition as self
             if ($parentDefinition) {
@@ -481,7 +486,7 @@ public function clear(): void
     public function clearCache(?string $id = null): void
     {
         if ($id !== null) {
-            $this->getDefinition($id)?->reset();
+            $this->findDefinition($id, false)?->reset();
 
             return;
         }