Skip to content

Commit 9a4d43c

Browse files
Merge pull request #60 from biiiiiigmonster/fix/php84-callback-laravel-v12
fix: solve PHP explicit nullable type deprecation
2 parents a037365 + 33a10dd commit 9a4d43c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/Database/Eloquent/BuilderMixin.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class BuilderMixin
1717
*/
1818
public function hasIn(): Closure
1919
{
20-
return function ($relation, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null): Builder {
20+
return function ($relation, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null): Builder {
2121
/** @var Builder $this */
2222
if (is_string($relation)) {
2323
if (str_contains($relation, '.')) {
@@ -113,7 +113,7 @@ public function orHasIn(): Closure
113113
*/
114114
public function doesntHaveIn(): Closure
115115
{
116-
return function ($relation, $boolean = 'and', Closure $callback = null): Builder {
116+
return function ($relation, $boolean = 'and', ?Closure $callback = null): Builder {
117117
/** @var Builder $this */
118118
return $this->hasIn($relation, '<', 1, $boolean, $callback);
119119
};
@@ -139,7 +139,7 @@ public function orDoesntHaveIn(): Closure
139139
*/
140140
public function whereHasIn(): Closure
141141
{
142-
return function ($relation, Closure $callback = null, $operator = '>=', $count = 1): Builder {
142+
return function ($relation, ?Closure $callback = null, $operator = '>=', $count = 1): Builder {
143143
/** @var Builder $this */
144144
return $this->hasIn($relation, $operator, $count, 'and', $callback);
145145
};
@@ -154,7 +154,7 @@ public function whereHasIn(): Closure
154154
*/
155155
public function withWhereHasIn(): Closure
156156
{
157-
return function ($relation, Closure $callback = null, $operator = '>=', $count = 1): Builder {
157+
return function ($relation, ?Closure $callback = null, $operator = '>=', $count = 1): Builder {
158158
/** @var Builder $this */
159159
return $this->whereHasIn(Str::before($relation, ':'), $callback, $operator, $count)
160160
->with($callback ? [$relation => fn ($query) => $callback($query)] : $relation);
@@ -168,7 +168,7 @@ public function withWhereHasIn(): Closure
168168
*/
169169
public function orWhereHasIn(): Closure
170170
{
171-
return function ($relation, Closure $callback = null, $operator = '>=', $count = 1): Builder {
171+
return function ($relation, ?Closure $callback = null, $operator = '>=', $count = 1): Builder {
172172
/** @var Builder $this */
173173
return $this->hasIn($relation, $operator, $count, 'or', $callback);
174174
};
@@ -181,7 +181,7 @@ public function orWhereHasIn(): Closure
181181
*/
182182
public function whereDoesntHaveIn(): Closure
183183
{
184-
return function ($relation, Closure $callback = null): Builder {
184+
return function ($relation, ?Closure $callback = null): Builder {
185185
/** @var Builder $this */
186186
return $this->doesntHaveIn($relation, 'and', $callback);
187187
};
@@ -194,7 +194,7 @@ public function whereDoesntHaveIn(): Closure
194194
*/
195195
public function orWhereDoesntHaveIn(): Closure
196196
{
197-
return function ($relation, Closure $callback = null): Builder {
197+
return function ($relation, ?Closure $callback = null): Builder {
198198
/** @var Builder $this */
199199
return $this->doesntHaveIn($relation, 'or', $callback);
200200
};
@@ -207,7 +207,7 @@ public function orWhereDoesntHaveIn(): Closure
207207
*/
208208
public function hasMorphIn(): Closure
209209
{
210-
return function ($relation, $types, $operator = '>=', $count = 1, $boolean = 'and', Closure $callback = null): Builder {
210+
return function ($relation, $types, $operator = '>=', $count = 1, $boolean = 'and', ?Closure $callback = null): Builder {
211211
/** @var Builder $this */
212212
if (is_string($relation)) {
213213
$relation = $this->getRelationWithoutConstraints($relation);
@@ -262,7 +262,7 @@ public function orHasMorphIn(): Closure
262262
*/
263263
public function doesntHaveMorphIn(): Closure
264264
{
265-
return function ($relation, $types, $boolean = 'and', Closure $callback = null): Builder {
265+
return function ($relation, $types, $boolean = 'and', ?Closure $callback = null): Builder {
266266
/** @var Builder $this */
267267
return $this->hasMorphIn($relation, $types, '<', 1, $boolean, $callback);
268268
};
@@ -288,7 +288,7 @@ public function orDoesntHaveMorphIn(): Closure
288288
*/
289289
public function whereHasMorphIn(): Closure
290290
{
291-
return function ($relation, $types, Closure $callback = null, $operator = '>=', $count = 1): Builder {
291+
return function ($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1): Builder {
292292
/** @var Builder $this */
293293
return $this->hasMorphIn($relation, $types, $operator, $count, 'and', $callback);
294294
};
@@ -301,7 +301,7 @@ public function whereHasMorphIn(): Closure
301301
*/
302302
public function orWhereHasMorphIn(): Closure
303303
{
304-
return function ($relation, $types, Closure $callback = null, $operator = '>=', $count = 1): Builder {
304+
return function ($relation, $types, ?Closure $callback = null, $operator = '>=', $count = 1): Builder {
305305
/** @var Builder $this */
306306
return $this->hasMorphIn($relation, $types, $operator, $count, 'or', $callback);
307307
};
@@ -314,7 +314,7 @@ public function orWhereHasMorphIn(): Closure
314314
*/
315315
public function whereDoesntHaveMorphIn(): Closure
316316
{
317-
return function ($relation, $types, Closure $callback = null): Builder {
317+
return function ($relation, $types, ?Closure $callback = null): Builder {
318318
/** @var Builder $this */
319319
return $this->doesntHaveMorphIn($relation, $types, 'and', $callback);
320320
};
@@ -327,7 +327,7 @@ public function whereDoesntHaveMorphIn(): Closure
327327
*/
328328
public function orWhereDoesntHaveMorphIn(): Closure
329329
{
330-
return function ($relation, $types, Closure $callback = null): Builder {
330+
return function ($relation, $types, ?Closure $callback = null): Builder {
331331
/** @var Builder $this */
332332
return $this->doesntHaveMorphIn($relation, $types, 'or', $callback);
333333
};

0 commit comments

Comments
 (0)