Merge branch 'master' into 3.1

# Conflicts: #	src/support/tests/FunctionTest.php

Author: limingxinleo

src/Functions.php

@@ -159,7 +159,7 @@ function class_uses_recursive($class)
  $results = [];
 
  /* @phpstan-ignore-next-line */
- foreach (array_reverse(class_parents($class)) + [$class => $class] as $class) {
+ foreach (array_reverse(class_parents($class) ?: []) + [$class => $class] as $class) {
  $results += trait_uses_recursive($class);
  }
 

tests/FunctionTest.php

@@ -12,11 +12,16 @@
 namespace HyperfTest\Support;
 
 use HyperfTest\Support\Exception\RetryException;
+use HyperfTest\Support\Stub\Bar;
+use HyperfTest\Support\Stub\Foo;
 use HyperfTest\Support\Stub\FooClosure;
+use HyperfTest\Support\Stub\Traits\BarTrait;
+use HyperfTest\Support\Stub\Traits\FooTrait;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
 
 use function Hyperf\Support\call;
+use function Hyperf\Support\class_uses_recursive;
 use function Hyperf\Support\env;
 use function Hyperf\Support\retry;
 use function Hyperf\Support\swoole_hook_flags;
@@ -130,4 +135,21 @@ public function testEnv()
 
  $this->assertNull(env($id));
  }
+
+ public function testClassUsesRecursive()
+ {
+ $this->assertSame(
+ [
+ FooTrait::class => FooTrait::class,
+ ],
+ class_uses_recursive(Foo::class)
+ );
+ $this->assertSame(
+ [
+ FooTrait::class => FooTrait::class,
+ BarTrait::class => BarTrait::class,
+ ],
+ class_uses_recursive(Bar::class)
+ );
+ }
 }

tests/Stub/Bar.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact group@hyperf.io
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Support\Stub;
+
+use HyperfTest\Support\Stub\Traits\BarTrait;
+
+class Bar extends Foo
+{
+ use BarTrait;
+}

tests/Stub/Foo.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact group@hyperf.io
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Support\Stub;
+
+use HyperfTest\Support\Stub\Traits\FooTrait;
+
+class Foo
+{
+ use FooTrait;
+}

tests/Stub/Traits/BarTrait.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact group@hyperf.io
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Support\Stub\Traits;
+
+trait BarTrait
+{
+}

tests/Stub/Traits/FooTrait.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact group@hyperf.io
+ * @license https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace HyperfTest\Support\Stub\Traits;
+
+trait FooTrait
+{
+}