use as contextual attribute as well

Author: cosmastech

src/Illuminate/Container/Attributes/Lazy.php

@@ -3,8 +3,16 @@
 namespace Illuminate\Container\Attributes;
 
 use Attribute;
+use Illuminate\Contracts\Container\Container;
+use Illuminate\Contracts\Container\ContextualAttribute;
+use ReflectionNamedType;
+use ReflectionParameter;
 
-#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_CLASS)]
-class Lazy
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_CLASS | Attribute::TARGET_PARAMETER)]
+class Lazy implements ContextualAttribute
 {
+    public static function resolve(self $attribute, Container $container, ReflectionNamedType $type)
+    {
+        return proxy($type->getName(), fn () => $container->make($type->getName()));
+    }
 }

src/Illuminate/Container/Container.php

@@ -20,6 +20,7 @@
 use ReflectionClass;
 use ReflectionException;
 use ReflectionFunction;
+use ReflectionNamedType;
 use ReflectionParameter;
 use TypeError;
 
@@ -1243,8 +1244,9 @@ protected function resolveDependencies(array $dependencies)
 
             $result = null;
 
+            //
             if (! is_null($attribute = Util::getContextualAttributeFromDependency($dependency))) {
-                $result = $this->resolveFromAttribute($attribute);
+                $result = $this->resolveFromAttribute($attribute, $dependency->getType());
             }
 
             // If the class is null, it means the dependency is a string or some other
@@ -1395,7 +1397,7 @@ protected function resolveVariadicClass(ReflectionParameter $parameter)
      * @param  \ReflectionAttribute  $attribute
      * @return mixed
      */
-    public function resolveFromAttribute(ReflectionAttribute $attribute)
+    public function resolveFromAttribute(ReflectionAttribute $attribute, ?ReflectionNamedType $type = null)
     {
         $handler = $this->contextualAttributes[$attribute->getName()] ?? null;
 
@@ -1409,7 +1411,7 @@ public function resolveFromAttribute(ReflectionAttribute $attribute)
             throw new BindingResolutionException("Contextual binding attribute [{$attribute->getName()}] has no registered handler.");
         }
 
-        return $handler($instance, $this);
+        return $handler($instance, $this, $type);
     }
 
     /**

tests/Container/ContainerTest.php

@@ -236,6 +236,17 @@ public function testLazyObjects()
         $this->assertFalse((new ReflectionClass($class))->isUninitializedLazyObject($class));
     }
 
+    public function testObjectWithLazyDependencies()
+    {
+        $container = new Container;
+        $container->bind(IContainerContractStub::class, ContainerImplementationStub::class);
+        $class = $container->make(ClassWithLazyDependencies::class);
+        $this->assertFalse((new ReflectionClass($class))->isUninitializedLazyObject($class));
+        $this->assertTrue((new ReflectionClass(ContainerDependentStub::class))->isUninitializedLazyObject($class->stubby));
+        $this->assertTrue($class->stubbyIsSet());
+        $this->assertFalse((new ReflectionClass($class))->isUninitializedLazyObject($class));
+    }
+
     public function testContainerIsPassedToResolvers()
     {
         $container = new Container;
@@ -1121,9 +1132,7 @@ class WildcardConcrete implements WildcardOnlyInterface
 {
 }
 
-/*
- * The order of these attributes matters because we want to ensure we only fallback to '*' when there's no more specific environment.
- */
+// The order of these attributes matters because we want to ensure we only fallback to '*' when there's no more specific environment.
 #[Bind(FallbackConcrete::class)]
 #[Bind(ProdConcrete::class, environments: 'prod')]
 interface WildcardAndProdInterface
@@ -1243,3 +1252,17 @@ public function stubbyIsSet(): bool
         return isset($this->stubby);
     }
 }
+
+class ClassWithLazyDependencies
+{
+    public function __construct(
+        #[Lazy]
+        public ContainerDependentStub $stubby
+    ) {
+    }
+
+    public function stubbyIsSet(): bool
+    {
+        return isset($this->stubby);
+    }
+}