Fixed bug that eachById cannot work for Hyperf\Database\Query\Builder. (#7705)

Author: limingxinleo

src/Concerns/BuildsQueries.php

@@ -187,7 +187,7 @@ public function first($columns = ['*'])
      */
     public function eachById(callable $callback, int $count = 1000, ?string $column = null, ?string $alias = null): bool
     {
-        return $this->chunkById($count, function (Collection $results) use ($callback) {
+        return $this->chunkById($count, function (BaseCollection $results) use ($callback) {
             foreach ($results as $value) {
                 if ($callback($value) === false) {
                     return false;

tests/ModelRealBuilderTest.php

@@ -67,6 +67,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use RuntimeException;
+use stdClass;
 
 /**
  * @internal
@@ -98,6 +99,25 @@ protected function tearDown(): void
         Mockery::close();
     }
 
+    public function testEachById()
+    {
+        $this->getContainer();
+
+        $count = User::query()->count();
+
+        $i = 0;
+        User::query()->eachById(function (User $user) use (&$i) {
+            ++$i;
+        });
+        $this->assertSame($i, $count);
+
+        $i = 0;
+        Db::table('user')->eachById(function (stdClass $user) use (&$i) {
+            ++$i;
+        }, 100, 'id');
+        $this->assertSame($i, $count);
+    }
+
     public function testPivot()
     {
         $this->getContainer();

tests/Stubs/ContainerStub.php

@@ -19,6 +19,7 @@
 use Hyperf\Database\ConnectionResolverInterface;
 use Hyperf\Database\Connectors\ConnectionFactory;
 use Hyperf\Database\Connectors\MySqlConnector;
+use Hyperf\DbConnection\Db;
 use Hyperf\Di\Container;
 use Mockery;
 use Psr\EventDispatcher\EventDispatcherInterface;
@@ -35,6 +36,7 @@ public static function getContainer($callback = null)
         $container->shouldReceive('has')->with(StdoutLoggerInterface::class)->andReturnFalse();
         $container->shouldReceive('has')->with(EventDispatcherInterface::class)->andReturnFalse();
         $container->shouldReceive('get')->with('db.connector.mysql')->andReturn(new MySqlConnector());
+        $container->shouldReceive('get')->with(Db::class)->andReturn(new Db($container));
         $connector = new ConnectionFactory($container);
 
         $dbConfig = [