Fixed implicitly nullable params (#6616)

Author: huangdijia

src/Migrations/MigrationCreator.php

@@ -36,7 +36,7 @@ public function __construct(protected Filesystem $files)
      *
      * @throws Exception
      */
-    public function create(string $name, string $path, string $table = null, bool $create = false): string
+    public function create(string $name, string $path, ?string $table = null, bool $create = false): string
     {
         $this->ensureMigrationDoesntAlreadyExist($name, $path);
 

src/Model/Builder.php

@@ -261,7 +261,7 @@ public function withoutGlobalScope($scope)
      *
      * @return $this
      */
-    public function withoutGlobalScopes(array $scopes = null)
+    public function withoutGlobalScopes(?array $scopes = null)
     {
         if (! is_array($scopes)) {
             $scopes = array_keys($this->scopes);
@@ -559,7 +559,7 @@ public function firstOrFail($columns = ['*'])
      * @param array|Closure $columns
      * @return \Hyperf\Database\Model\Model|mixed|static
      */
-    public function firstOr($columns = ['*'], Closure $callback = null)
+    public function firstOr($columns = ['*'], ?Closure $callback = null)
     {
         if ($columns instanceof Closure) {
             $callback = $columns;

src/Model/Concerns/HasAttributes.php

@@ -542,7 +542,7 @@ public function syncOriginalAttributes($attributes): static
     /**
      * Sync the changed attributes.
      */
-    public function syncChanges(array $columns = null): static
+    public function syncChanges(?array $columns = null): static
     {
         $changes = $this->getDirty();
 

src/Model/Concerns/HasGlobalScopes.php

@@ -26,7 +26,7 @@ trait HasGlobalScopes
      *
      * @throws InvalidArgumentException
      */
-    public static function addGlobalScope($scope, Closure $implementation = null)
+    public static function addGlobalScope($scope, ?Closure $implementation = null)
     {
         if (is_string($scope) && ! is_null($implementation)) {
             return GlobalScope::$container[static::class][$scope] = $implementation;

src/Model/Concerns/QueriesRelationships.php

@@ -32,7 +32,7 @@ trait QueriesRelationships
      * @param string $boolean
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
+    public function has($relation, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null)
     {
         if (is_string($relation)) {
             if (str_contains($relation, '.')) {
@@ -94,7 +94,7 @@ public function orHas($relation, $operator = '>=', $count = 1)
      * @param string $boolean
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function doesntHave($relation, $boolean = 'and', Closure $callback = null)
+    public function doesntHave($relation, $boolean = 'and', ?Closure $callback = null)
     {
         return $this->has($relation, '<', 1, $boolean, $callback);
     }
@@ -118,7 +118,7 @@ public function orDoesntHave($relation)
      * @param int $count
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function whereHas($relation, Closure $callback = null, $operator = '>=', $count = 1)
+    public function whereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1)
     {
         return $this->has($relation, $operator, $count, 'and', $callback);
     }
@@ -132,7 +132,7 @@ public function whereHas($relation, Closure $callback = null, $operator = '>=',
      * @param int $count
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function orWhereHas($relation, Closure $callback = null, $operator = '>=', $count = 1)
+    public function orWhereHas($relation, ?Closure $callback = null, $operator = '>=', $count = 1)
     {
         return $this->has($relation, $operator, $count, 'or', $callback);
     }
@@ -143,7 +143,7 @@ public function orWhereHas($relation, Closure $callback = null, $operator = '>='
      * @param string $relation
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function whereDoesntHave($relation, Closure $callback = null)
+    public function whereDoesntHave($relation, ?Closure $callback = null)
     {
         return $this->doesntHave($relation, 'and', $callback);
     }
@@ -155,7 +155,7 @@ public function whereDoesntHave($relation, Closure $callback = null)
      * @param Closure $callback
      * @return \Hyperf\Database\Model\Builder|static
      */
-    public function orWhereDoesntHave($relation, Closure $callback = null)
+    public function orWhereDoesntHave($relation, ?Closure $callback = null)
     {
         return $this->doesntHave($relation, 'or', $callback);
     }
@@ -328,7 +328,7 @@ public function mergeConstraintsFrom(Builder $from)
      * @param int $count
      * @return $this
      */
-    public function whereHasMorph($relation, $types, Closure $callback = null, $operator = '>=', $count = 1)
+    public function whereHasMorph($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1)
     {
         return $this->hasMorph($relation, $types, $operator, $count, 'and', $callback);
     }
@@ -340,7 +340,7 @@ public function whereHasMorph($relation, $types, Closure $callback = null, $oper
      * @param Closure $callback
      * @return $this
      */
-    public function orWhereHasMorph(string $relation, $types, Closure $callback = null, string $operator = '>=', int $count = 1)
+    public function orWhereHasMorph(string $relation, $types, ?Closure $callback = null, string $operator = '>=', int $count = 1)
     {
         return $this->hasMorph($relation, $types, $operator, $count, 'or', $callback);
     }
@@ -351,7 +351,7 @@ public function orWhereHasMorph(string $relation, $types, Closure $callback = nu
      * @param array|string $types
      * @return $this
      */
-    public function whereDoesntHaveMorph(string $relation, $types, Closure $callback = null)
+    public function whereDoesntHaveMorph(string $relation, $types, ?Closure $callback = null)
     {
         return $this->doesntHaveMorph($relation, $types, 'and', $callback);
     }
@@ -363,7 +363,7 @@ public function whereDoesntHaveMorph(string $relation, $types, Closure $callback
      * @param Closure $callback
      * @return $this
      */
-    public function orWhereDoesntHaveMorph(string $relation, $types, Closure $callback = null)
+    public function orWhereDoesntHaveMorph(string $relation, $types, ?Closure $callback = null)
     {
         return $this->doesntHaveMorph($relation, $types, 'or', $callback);
     }
@@ -378,7 +378,7 @@ public function orWhereDoesntHaveMorph(string $relation, $types, Closure $callba
      * @param string $boolean
      * @return $this
      */
-    public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null)
+    public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null)
     {
         $relation = $this->getRelationWithoutConstraints($relation);
 
@@ -417,7 +417,7 @@ public function hasMorph($relation, $types, $operator = '>=', $count = 1, $boole
      * @param string $boolean
      * @return $this
      */
-    public function doesntHaveMorph(string $relation, $types, $boolean = 'and', Closure $callback = null)
+    public function doesntHaveMorph(string $relation, $types, $boolean = 'and', ?Closure $callback = null)
     {
         return $this->hasMorph($relation, $types, '<', 1, $boolean, $callback);
     }

src/Model/Model.php

@@ -884,7 +884,7 @@ public function refresh()
      *
      * @return static
      */
-    public function replicate(array $except = null)
+    public function replicate(?array $except = null)
     {
         $defaults = [
             $this->getKeyName(),

src/Model/Relations/BelongsToMany.php

@@ -544,7 +544,7 @@ public function get($columns = ['*'])
     /**
      * Get a paginator for the "select" statement.
      */
-    public function paginate(int $perPage = null, array $columns = ['*'], string $pageName = 'page', ?int $page = null): LengthAwarePaginatorInterface
+    public function paginate(?int $perPage = null, array $columns = ['*'], string $pageName = 'page', ?int $page = null): LengthAwarePaginatorInterface
     {
         $this->query->addSelect($this->shouldSelect($columns));
 

src/Model/Relations/HasManyThrough.php

@@ -330,7 +330,7 @@ public function get($columns = ['*'])
     /**
      * Get a paginator for the "select" statement.
      */
-    public function paginate(int $perPage = null, array $columns = ['*'], string $pageName = 'page', ?int $page = null): LengthAwarePaginatorInterface
+    public function paginate(?int $perPage = null, array $columns = ['*'], string $pageName = 'page', ?int $page = null): LengthAwarePaginatorInterface
     {
         $this->query->addSelect($this->shouldSelect($columns));
 
@@ -547,7 +547,7 @@ public function getSecondLocalKeyName()
     /**
      * Set the join clause on the query.
      */
-    protected function performJoin(Builder $query = null)
+    protected function performJoin(?Builder $query = null)
     {
         $query = $query ?: $this->query;
 

src/Model/Relations/Relation.php

@@ -313,7 +313,7 @@ public function relatedUpdatedAt()
      * @param bool $merge
      * @return array
      */
-    public static function morphMap(array $map = null, $merge = true)
+    public static function morphMap(?array $map = null, $merge = true)
     {
         $map = static::buildMorphMapFromModels($map);
 
@@ -382,7 +382,7 @@ protected function whereInMethod(Model $model, $key)
      * @param null|string[] $models
      * @return null|array
      */
-    protected static function buildMorphMapFromModels(array $models = null)
+    protected static function buildMorphMapFromModels(?array $models = null)
     {
         if (is_null($models) || Arr::isAssoc($models)) {
             return $models;

src/Query/Builder.php

@@ -256,8 +256,8 @@ class Builder
      */
     public function __construct(
         ConnectionInterface $connection,
-        Grammar $grammar = null,
-        Processor $processor = null
+        ?Grammar $grammar = null,
+        ?Processor $processor = null
     ) {
         $this->connection = $connection;
         $this->grammar = $grammar ?: $connection->getQueryGrammar();

src/Schema/Blueprint.php

@@ -98,7 +98,7 @@ class Blueprint
      * @param string $table
      * @param string $prefix
      */
-    public function __construct($table, Closure $callback = null, $prefix = '')
+    public function __construct($table, ?Closure $callback = null, $prefix = '')
     {
         $this->table = $table;
         $this->prefix = $prefix;

src/Schema/Builder.php

@@ -302,7 +302,7 @@ protected function build(Blueprint $blueprint)
      * @param string $table
      * @return \Hyperf\Database\Schema\Blueprint
      */
-    protected function createBlueprint($table, Closure $callback = null)
+    protected function createBlueprint($table, ?Closure $callback = null)
     {
         $prefix = $this->connection->getConfig('prefix_indexes')
             ? $this->connection->getConfig('prefix')