cursor方法返回值改为lazyCollection对象

Author: liu21st

src/db/Query.php

@@ -507,15 +507,17 @@ public function getPdo(): PDOStatement
      *
      * @param bool $unbuffered 是否开启无缓冲查询（仅限mysql）
      * 
-     * @return \Generator
+     * @return LazyCollection
      */
-    public function cursor(bool $unbuffered = false)
+    public function cursor(bool $unbuffered = false): LazyCollection
     {
         $connection = clone $this->connection;
 
-        return $connection->cursor($this, $unbuffered);
+        return new LazyCollection(function () use ($connection, $unbuffered) {
+            yield from $connection->cursor($this, $unbuffered);
+        });
     }
-    
+
     /**
      * 流式处理查询结果
      *
@@ -527,10 +529,11 @@ public function cursor(bool $unbuffered = false)
     public function stream(callable $callback, bool $unbuffered = false): int
     {
         $count = 0;
-        foreach ($this->cursor($unbuffered) as $item) {
-            $callback($item);
-            $count++;
-        }
+        $this->cursor($unbuffered)
+            ->each(function ($item) use ($callback, &$count) {
+                $callback($item);
+                $count++;
+            });
         return $count;
     }
 
@@ -610,7 +613,7 @@ public function chunk(int $count, callable $callback, string | array | null $col
      * @param string      $order   字段排序 
      * @return LazyCollection
      */
-    public function lazy(int $count = 1000, ?string $column = null, string $order = 'desc')
+    public function lazy(int $count = 1000, ?string $column = null, string $order = 'desc'): LazyCollection
     {
         if ($count < 1) {
             throw new Exception('The chunk size should be at least 1');

tests/orm/StreamQueryTest.php

@@ -5,6 +5,7 @@
 use PHPUnit\Framework\TestCase;
 use think\facade\Db;
 use think\DbManager;
+use think\model\LazyCollection;
 
 class StreamQueryTest extends TestCase
 {
@@ -55,7 +56,7 @@ public function testBasicCursor()
     {
         $cursor = Db::table('user')->cursor();
 
-        $this->assertInstanceOf(\Generator::class, $cursor);
+        $this->assertInstanceOf(LazyCollection::class, $cursor);
 
         $count = 0;
         foreach ($cursor as $user) {