Fixed @Inject does not works in nested trait. (#3520)

Author: assert6

src/Aop/PropertyHandlerTrait.php

@@ -30,17 +30,7 @@ protected function __handlePropertyHandler(string $className)
 
         // Inject the properties of traits.
         // Because the property annotations of trait couldn't be collected by class.
-        $traitNames = $reflectionClass->getTraitNames();
-        if (is_array($traitNames)) {
-            foreach ($traitNames ?? [] as $traitName) {
-                $traitProperties = ReflectionManager::reflectPropertyNames($traitName);
-                $traitProperties = array_diff($traitProperties, $handled);
-                $handled = array_merge(
-                    $handled,
-                    $this->__handle($className, $traitName, $traitProperties)
-                );
-            }
-        }
+        $handled = $this->__handleTrait($reflectionClass, $handled, $className);
 
         // Inject the properties of parent class.
         // It can be used to deal with parent classes whose subclasses have constructor function, but don't execute `parent::__construct()`.
@@ -64,6 +54,26 @@ protected function __handlePropertyHandler(string $className)
         }
     }
 
+    protected function __handleTrait(\ReflectionClass $reflectionClass, array $handled, string $className): array
+    {
+        foreach ($reflectionClass->getTraits() ?? [] as $reflectionTrait) {
+            if (in_array($reflectionTrait->getName(), [ProxyTrait::class, PropertyHandlerTrait::class])) {
+                continue;
+            }
+            $traitProperties = ReflectionManager::reflectPropertyNames($reflectionTrait->getName());
+            $traitProperties = array_diff($traitProperties, $handled);
+            if (! $traitProperties) {
+                continue;
+            }
+            $handled = array_merge(
+                $handled,
+                $this->__handle($className, $reflectionTrait->getName(), $traitProperties)
+            );
+            $handled = $this->__handleTrait($reflectionTrait, $handled, $className);
+        }
+        return $handled;
+    }
+
     protected function __handle(string $currentClassName, string $targetClassName, array $properties): array
     {
         $handled = [];

tests/InjectTest.php

@@ -31,12 +31,14 @@
 use HyperfTest\Di\Stub\Inject\Bar;
 use HyperfTest\Di\Stub\Inject\Foo;
 use HyperfTest\Di\Stub\Inject\Foo2Trait;
+use HyperfTest\Di\Stub\Inject\Foo3Trait;
 use HyperfTest\Di\Stub\Inject\FooTrait;
 use HyperfTest\Di\Stub\Inject\Origin2Class;
 use HyperfTest\Di\Stub\Inject\Origin3Class;
 use HyperfTest\Di\Stub\Inject\Origin4Class;
 use HyperfTest\Di\Stub\Inject\Origin5Class;
 use HyperfTest\Di\Stub\Inject\Origin6Class;
+use HyperfTest\Di\Stub\Inject\Origin7Class;
 use HyperfTest\Di\Stub\Inject\OriginClass;
 use HyperfTest\Di\Stub\Inject\Parent2Class;
 use HyperfTest\Di\Stub\Inject\Parent3Class;
@@ -176,6 +178,33 @@ public function testInject2Trait()
         $this->assertInstanceOf(Tar::class, $origin->getFoo());
     }
 
+    public function testInjectTraitNesting()
+    {
+        $this->getContainer();
+        $classes = [
+            FooTrait::class,
+            Foo3Trait::class,
+            Origin7Class::class,
+        ];
+
+        if (! is_dir($dir = BASE_PATH . '/runtime/container/proxy/')) {
+            mkdir($dir, 0777, true);
+        }
+
+        $ast = new Ast();
+        foreach ($classes as $class) {
+            $code = $ast->proxy($class);
+            $id = md5($class);
+            file_put_contents($file = $dir . $id . '.proxy.php', $code);
+            require_once $file;
+        }
+
+        $origin = new Origin7Class();
+        $this->assertInstanceOf(Bar::class, $origin->getFoo());
+        $this->assertInstanceOf(Bar::class, $origin->getBar());
+        $this->assertSame('foo3', $origin->getValue());
+    }
+
     public function testInjectParentParent()
     {
         $this->getContainer();
@@ -306,12 +335,14 @@ protected function getContainer()
             Origin2Class::class,
             Origin3Class::class,
             Foo2Trait::class,
+            Foo3Trait::class,
             Origin4Class::class,
             Origin5Class::class,
             Parent2Class::class,
             Parent3Class::class,
             Parent4Class::class,
             Origin6Class::class,
+            Origin7Class::class,
         ];
 
         foreach ($classes as $class) {

tests/ReflectionTest.php

@@ -13,6 +13,7 @@
 
 use Hyperf\Di\ReflectionManager;
 use HyperfTest\Di\Stub\Ast\Bar;
+use HyperfTest\Di\Stub\Inject\Foo3Trait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -43,4 +44,11 @@ public function testReturnType()
             $this->assertTrue($parameter->getType() instanceof \ReflectionNamedType);
         }
     }
+
+    public function testReflectionPropertyForTraitUseTrait()
+    {
+        $res = ReflectionManager::reflectPropertyNames(Foo3Trait::class);
+
+        $this->assertSame(['bar', 'foo'], $res);
+    }
 }

tests/Stub/Inject/Foo3Trait.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Di\Stub\Inject;
+
+use Hyperf\Di\Annotation\Inject;
+
+trait Foo3Trait
+{
+    use FooTrait;
+
+    /**
+     * @Inject
+     * @var Bar
+     */
+    protected $bar;
+
+    public function getValue()
+    {
+        return 'foo3';
+    }
+}

tests/Stub/Inject/FooTrait.php

@@ -20,4 +20,9 @@ trait FooTrait
      * @var Bar
      */
     protected $foo;
+
+    public function getValue()
+    {
+        return 'foo';
+    }
 }

tests/Stub/Inject/Origin7Class.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Di\Stub\Inject;
+
+class Origin7Class
+{
+    use Foo3Trait;
+
+    public function getFoo()
+    {
+        return $this->foo;
+    }
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}