Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/command/composer.json
#	src/serializer/src/Contract/CacheableSupportsMethodInterface.php
#	src/validation/src/ValidationRuleParser.php

Author: limingxinleo

.gitattributes

@@ -1,2 +1,3 @@
 /tests export-ignore
 /.github export-ignore
+/types export-ignore

src/Commands/Migrations/RollbackCommand.php

@@ -45,6 +45,7 @@ public function handle()
             [
                 'pretend' => $this->input->getOption('pretend'),
                 'step' => (int) $this->input->getOption('step'),
+                'batch' => (int) $this->input->getOption('batch'),
             ]
         );
     }
@@ -63,6 +64,7 @@ protected function getOptions()
             ['realpath', null, InputOption::VALUE_NONE, 'Indicate any provided migration file paths are pre-resolved absolute paths'],
             ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run'],
             ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted'],
+            ['batch', null, InputOption::VALUE_OPTIONAL, 'The batch of migrations (identified by their batch number) to be reverted'],
         ];
     }
 }

src/Concerns/BuildsQueries.php

@@ -23,7 +23,6 @@
 use Hyperf\Database\Exception\RecordsNotFoundException;
 use Hyperf\Database\Model\Builder;
 use Hyperf\Database\Model\Collection;
-use Hyperf\Database\Model\Model;
 use Hyperf\Database\Query\Expression;
 use Hyperf\Paginator\Contract\CursorPaginator as CursorPaginatorContract;
 use Hyperf\Paginator\Cursor;
@@ -36,7 +35,7 @@
 use function Hyperf\Collection\data_get;
 
 /**
- * @template TValue
+ * @template TValue of object
  * @mixin Builder
  * @mixin \Hyperf\Database\Query\Builder
  */
@@ -48,6 +47,7 @@ trait BuildsQueries
      * Chunk the results of the query.
      *
      * @param int $count
+     * @param callable(BaseCollection<int, TValue>, int): mixed $callback
      * @return bool
      */
     public function chunk($count, callable $callback)
@@ -85,6 +85,8 @@ public function chunk($count, callable $callback)
 
     /**
      * Run a map over each item while chunking.
+     *
+     * @param callable(TValue): mixed $callback
      */
     public function chunkMap(callable $callback, int $count = 1000): BaseCollection
     {
@@ -102,6 +104,7 @@ public function chunkMap(callable $callback, int $count = 1000): BaseCollection
     /**
      * Execute a callback over each item while chunking.
      *
+     * @param callable(TValue, int): mixed $callback
      * @param int $count
      * @return bool
      */
@@ -118,6 +121,8 @@ public function each(callable $callback, $count = 1000)
 
     /**
      * Query lazily, by chunks of the given size.
+     *
+     * @return LazyCollection<int, TValue>
      */
     public function lazy(int $chunkSize = 1000): LazyCollection
     {
@@ -146,6 +151,8 @@ public function lazy(int $chunkSize = 1000): LazyCollection
 
     /**
      * Query lazily, by chunking the results of a query by comparing IDs.
+     *
+     * @return LazyCollection<int, TValue>
      */
     public function lazyById(int $chunkSize = 1000, ?string $column = null, ?string $alias = null): LazyCollection
     {
@@ -154,6 +161,8 @@ public function lazyById(int $chunkSize = 1000, ?string $column = null, ?string
 
     /**
      * Query lazily, by chunking the results of a query by comparing IDs in descending order.
+     *
+     * @return LazyCollection<int, TValue>
      */
     public function lazyByIdDesc(int $chunkSize = 1000, ?string $column = null, ?string $alias = null): LazyCollection
     {
@@ -164,7 +173,7 @@ public function lazyByIdDesc(int $chunkSize = 1000, ?string $column = null, ?str
      * Execute the query and get the first result.
      *
      * @param array $columns
-     * @return null|Model|object|static
+     * @return null|TValue
      */
     public function first($columns = ['*'])
     {
@@ -173,6 +182,8 @@ public function first($columns = ['*'])
 
     /**
      * Execute a callback over each item while chunking by ID.
+     *
+     * @param callable(TValue, int): mixed $callback
      */
     public function eachById(callable $callback, int $count = 1000, ?string $column = null, ?string $alias = null): bool
     {
@@ -188,6 +199,8 @@ public function eachById(callable $callback, int $count = 1000, ?string $column
 
     /**
      * Chunk the results of a query by comparing IDs in a given order.
+     *
+     * @param callable(BaseCollection<int, TValue>, int): mixed $callback
      */
     public function orderedChunkById(int $count, callable $callback, ?string $column = null, ?string $alias = null, bool $descending = false): bool
     {
@@ -240,6 +253,8 @@ public function orderedChunkById(int $count, callable $callback, ?string $column
 
     /**
      * Chunk the results of a query by comparing IDs in descending order.
+     *
+     * @param callable(BaseCollection<int, TValue>, int): mixed $callback
      */
     public function chunkByIdDesc(int $count, callable $callback, ?string $column = null, ?string $alias = null): bool
     {

src/Migrations/DatabaseMigrationRepository.php

@@ -88,6 +88,21 @@ public function getMigrationBatches()
             ->pluck('batch', 'migration')->all();
     }
 
+    /**
+     * Get the list of the migrations by batch number.
+     *
+     * @param int $batch
+     * @return array
+     */
+    public function getMigrationsByBatch($batch)
+    {
+        return $this->table()
+            ->where('batch', $batch)
+            ->orderBy('migration', 'desc')
+            ->get()
+            ->all();
+    }
+
     /**
      * Log that a migration was run.
      *

src/Migrations/MigrationRepositoryInterface.php

@@ -43,6 +43,14 @@ public function getLast();
      */
     public function getMigrationBatches();
 
+    /**
+     * Get the list of the migrations by batch number.
+     *
+     * @param int $batch
+     * @return array
+     */
+    public function getMigrationsByBatch($batch);
+
     /**
      * Log that a migration was run.
      *

src/Migrations/Migrator.php

@@ -355,6 +355,10 @@ protected function getMigrationsForRollback(array $options): array
             return $this->repository->getMigrations($steps);
         }
 
+        if (($batch = $options['batch'] ?? 0) > 0) {
+            return $this->repository->getMigrationsByBatch($batch);
+        }
+
         return $this->repository->getLast();
     }