Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/grpc-client/src/BaseClient.php

Author: limingxinleo

src/Middleware/ValidationMiddleware.php

@@ -18,6 +18,7 @@
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\Di\Annotation\MultipleAnnotation;
 use Hyperf\Di\ReflectionManager;
+use Hyperf\HttpServer\CoreMiddleware;
 use Hyperf\HttpServer\Router\Dispatched;
 use Hyperf\Server\Exception\ServerException;
 use Hyperf\Validation\Annotation\Scene;
@@ -129,7 +130,7 @@ protected function shouldHandle(Dispatched $dispatched): bool
     }
 
     /**
-     * @see \Hyperf\HttpServer\CoreMiddleware::prepareHandler()
+     * @see CoreMiddleware::prepareHandler()
      */
     protected function prepareHandler(array|string $handler): array
     {

src/Rules/DatabaseRule.php

@@ -13,8 +13,10 @@
 namespace Hyperf\Validation\Rules;
 
 use Closure;
+use Hyperf\Database\Model\Model;
 
 use function Hyperf\Collection\collect;
+use function Hyperf\Support\make;
 
 trait DatabaseRule
 {
@@ -36,6 +38,29 @@ trait DatabaseRule
      */
     public function __construct(protected string $table, protected string $column = 'NULL')
     {
+        $this->table = $this->resolveTableName($table);
+    }
+
+    /**
+     * Resolves the name of the table from the given string.
+     */
+    public function resolveTableName(string $table): string
+    {
+        if (! str_contains($table, '\\') || ! class_exists($table)) {
+            return $table;
+        }
+
+        if (is_subclass_of($table, Model::class)) {
+            /** @var Model $model */
+            $model = make($table);
+            if ($connection = $model->getConnectionName()) {
+                return $connection . '.' . $model->getTable();
+            }
+
+            return $model->getTable();
+        }
+
+        return $table;
     }
 
     /**

tests/Cases/ValidationExistsRuleTest.php

@@ -65,6 +65,7 @@ protected function setUp(): void
         ApplicationContext::setContainer($container);
         Register::setConnectionResolver($resolver);
         $container->shouldReceive('get')->with(EventDispatcherInterface::class)->andReturn(new EventDispatcher());
+        $container->shouldReceive('make')->with(UserWithConnection::class)->andReturn(new UserWithConnection());
 
         $this->createSchema();
     }
@@ -88,6 +89,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule = new Exists('table', 'column');
         $rule->where('foo', 'bar');
         $this->assertEquals('exists:table,column,foo,"bar"', (string) $rule);
+
+        $rule = new Exists(UserWithConnection::class, 'column');
+        $rule->where('foo', 'bar');
+        $this->assertSame('exists:mysql.users,column,foo,"bar"', (string) $rule);
     }
 
     public function testItChoosesValidRecordsUsingWhereInRule()
@@ -222,3 +227,8 @@ class DatabaseTestUser extends Model
 
     protected array $guarded = [];
 }
+
+class UserWithConnection extends DatabaseTestUser
+{
+    protected ?string $connection = 'mysql';
+}

tests/Cases/ValidationUniqueRuleTest.php

@@ -12,10 +12,13 @@
 
 namespace HyperfTest\Validation\Cases;
 
+use Hyperf\Context\ApplicationContext;
 use Hyperf\Database\Model\Model;
 use Hyperf\Validation\Rules\Unique;
+use Mockery as m;
 use PHPUnit\Framework\Attributes\CoversNothing;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
 
 /**
  * @internal
@@ -24,6 +27,21 @@
 #[CoversNothing]
 class ValidationUniqueRuleTest extends TestCase
 {
+    protected function setUp(): void
+    {
+        $container = m::mock(ContainerInterface::class);
+        $container->shouldReceive('make')
+            ->with(DatabaseModelWithConnection::class)
+            ->andReturn(new DatabaseModelWithConnection());
+
+        ApplicationContext::setContainer($container);
+    }
+
+    protected function tearDown(): void
+    {
+        m::close();
+    }
+
     public function testItCorrectlyFormatsAStringVersionOfTheRule()
     {
         $rule = new Unique('table');
@@ -66,6 +84,10 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule = new Unique('table');
         $rule->where('foo', 1);
         $this->assertEquals('unique:table,NULL,NULL,id,foo,"1"', (string) $rule);
+
+        $rule = new Unique(DatabaseModelWithConnection::class, 'column');
+        $rule->where('foo', 'bar');
+        $this->assertSame('unique:mysql.table,column,NULL,id,foo,"bar"', (string) $rule);
     }
 }
 
@@ -75,3 +97,10 @@ class DatabaseModelStub extends Model
 
     protected array $guarded = [];
 }
+
+class DatabaseModelWithConnection extends DatabaseModelStub
+{
+    protected ?string $table = 'table';
+
+    protected ?string $connection = 'mysql';
+}