Skip to content

Commit 654656d

Browse files
JubekiJubeki
authored
Add explicit nullable type declaration (#50922)
1 parent b9e4c7a commit 654656d

File tree

112 files changed

+206
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+206
-206
lines changed

‎src/Illuminate/Auth/Access/AuthorizationException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class AuthorizationException extends Exception
2929
* @param \Throwable|null $previous
3030
* @return void
3131
*/
32-
public function __construct($message = null, $code = null, Throwable $previous = null)
32+
public function __construct($message = null, $code = null, ?Throwable $previous = null)
3333
{
3434
parent::__construct($message ?? 'This action is unauthorized.', 0, $previous);
3535

‎src/Illuminate/Auth/Access/Gate.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function __construct(Container $container,
100100
array $policies = [],
101101
array $beforeCallbacks = [],
102102
array $afterCallbacks = [],
103-
callable $guessPolicyNamesUsingCallback = null)
103+
?callable $guessPolicyNamesUsingCallback = null)
104104
{
105105
$this->policies = $policies;
106106
$this->container = $container;
@@ -224,7 +224,7 @@ public function define($ability, $callback)
224224
* @param array|null $abilities
225225
* @return $this
226226
*/
227-
public function resource($name, $class, array $abilities = null)
227+
public function resource($name, $class, ?array $abilities = null)
228228
{
229229
$abilities = $abilities ?: [
230230
'viewAny' => 'viewAny',

‎src/Illuminate/Auth/Passwords/PasswordBroker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct(TokenRepositoryInterface $tokens, UserProvider $user
4545
* @param \Closure|null $callback
4646
* @return string
4747
*/
48-
public function sendResetLink(array $credentials, Closure $callback = null)
48+
public function sendResetLink(array $credentials, ?Closure $callback = null)
4949
{
5050
// First we will check to see if we found a user at the given credentials and
5151
// if we did not we will redirect back to this current URI with a piece of

‎src/Illuminate/Auth/RequestGuard.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class RequestGuard implements Guard
3333
* @param \Illuminate\Contracts\Auth\UserProvider|null $provider
3434
* @return void
3535
*/
36-
public function __construct(callable $callback, Request $request, UserProvider $provider = null)
36+
public function __construct(callable $callback, Request $request, ?UserProvider $provider = null)
3737
{
3838
$this->request = $request;
3939
$this->callback = $callback;

‎src/Illuminate/Auth/SessionGuard.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ class SessionGuard implements StatefulGuard, SupportsBasicAuth
131131
public function __construct($name,
132132
UserProvider $provider,
133133
Session $session,
134-
Request $request = null,
135-
Timebox $timebox = null,
134+
?Request $request = null,
135+
?Timebox $timebox = null,
136136
bool $rehashOnLogin = true)
137137
{
138138
$this->name = $name;

‎src/Illuminate/Broadcasting/BroadcastManager.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function __construct($app)
6464
* @param array|null $attributes
6565
* @return void
6666
*/
67-
public function routes(array $attributes = null)
67+
public function routes(?array $attributes = null)
6868
{
6969
if ($this->app instanceof CachesRoutes && $this->app->routesAreCached()) {
7070
return;
@@ -86,7 +86,7 @@ public function routes(array $attributes = null)
8686
* @param array|null $attributes
8787
* @return void
8888
*/
89-
public function userRoutes(array $attributes = null)
89+
public function userRoutes(?array $attributes = null)
9090
{
9191
if ($this->app instanceof CachesRoutes && $this->app->routesAreCached()) {
9292
return;
@@ -110,7 +110,7 @@ public function userRoutes(array $attributes = null)
110110
* @param array|null $attributes
111111
* @return void
112112
*/
113-
public function channelRoutes(array $attributes = null)
113+
public function channelRoutes(?array $attributes = null)
114114
{
115115
$this->routes($attributes);
116116
}

‎src/Illuminate/Bus/Batch.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ public function delete()
450450
* @param \Throwable|null $e
451451
* @return void
452452
*/
453-
protected function invokeHandlerCallback($handler, Batch $batch, Throwable $e = null)
453+
protected function invokeHandlerCallback($handler, Batch $batch, ?Throwable $e = null)
454454
{
455455
try {
456456
return $handler($batch, $e);

‎src/Illuminate/Bus/Dispatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class Dispatcher implements QueueingDispatcher
5858
* @param \Closure|null $queueResolver
5959
* @return void
6060
*/
61-
public function __construct(Container $container, Closure $queueResolver = null)
61+
public function __construct(Container $container, ?Closure $queueResolver = null)
6262
{
6363
$this->container = $container;
6464
$this->queueResolver = $queueResolver;

‎src/Illuminate/Cache/RedisTagSet.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class RedisTagSet extends TagSet
1515
* @param string $updateWhen
1616
* @return void
1717
*/
18-
public function addEntry(string $key, int $ttl = null, $updateWhen = null)
18+
public function addEntry(string $key, ?int $ttl = null, $updateWhen = null)
1919
{
2020
$ttl = is_null($ttl) ? -1 : Carbon::now()->addSeconds($ttl)->getTimestamp();
2121

‎src/Illuminate/Collections/Arr.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public static function exists($array, $key)
190190
* @param TFirstDefault|(\Closure(): TFirstDefault) $default
191191
* @return TValue|TFirstDefault
192192
*/
193-
public static function first($array, callable $callback = null, $default = null)
193+
public static function first($array, ?callable $callback = null, $default = null)
194194
{
195195
if (is_null($callback)) {
196196
if (empty($array)) {
@@ -221,7 +221,7 @@ public static function first($array, callable $callback = null, $default = null)
221221
* @param mixed $default
222222
* @return mixed
223223
*/
224-
public static function last($array, callable $callback = null, $default = null)
224+
public static function last($array, ?callable $callback = null, $default = null)
225225
{
226226
if (is_null($callback)) {
227227
return empty($array) ? value($default) : end($array);

‎src/Illuminate/Collections/Collection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ public function except($keys)
381381
* @param (callable(TValue, TKey): bool)|null $callback
382382
* @return static
383383
*/
384-
public function filter(callable $callback = null)
384+
public function filter(?callable $callback = null)
385385
{
386386
if ($callback) {
387387
return new static(Arr::where($this->items, $callback));
@@ -399,7 +399,7 @@ public function filter(callable $callback = null)
399399
* @param TFirstDefault|(\Closure(): TFirstDefault) $default
400400
* @return TValue|TFirstDefault
401401
*/
402-
public function first(callable $callback = null, $default = null)
402+
public function first(?callable $callback = null, $default = null)
403403
{
404404
return Arr::first($this->items, $callback, $default);
405405
}
@@ -747,7 +747,7 @@ public function keys()
747747
* @param TLastDefault|(\Closure(): TLastDefault) $default
748748
* @return TValue|TLastDefault
749749
*/
750-
public function last(callable $callback = null, $default = null)
750+
public function last(?callable $callback = null, $default = null)
751751
{
752752
return Arr::last($this->items, $callback, $default);
753753
}

‎src/Illuminate/Collections/Enumerable.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static function make($items = []);
3838
* @param callable|null $callback
3939
* @return static
4040
*/
41-
public static function times($number, callable $callback = null);
41+
public static function times($number, ?callable $callback = null);
4242

4343
/**
4444
* Create a collection with the given range.
@@ -297,7 +297,7 @@ public function except($keys);
297297
* @param (callable(TValue): bool)|null $callback
298298
* @return static
299299
*/
300-
public function filter(callable $callback = null);
300+
public function filter(?callable $callback = null);
301301

302302
/**
303303
* Apply the callback if the given "value" is (or resolves to) truthy.
@@ -309,7 +309,7 @@ public function filter(callable $callback = null);
309309
* @param (callable($this): TWhenReturnType)|null $default
310310
* @return $this|TWhenReturnType
311311
*/
312-
public function when($value, callable $callback = null, callable $default = null);
312+
public function when($value, ?callable $callback = null, ?callable $default = null);
313313

314314
/**
315315
* Apply the callback if the collection is empty.
@@ -320,7 +320,7 @@ public function when($value, callable $callback = null, callable $default = null
320320
* @param (callable($this): TWhenEmptyReturnType)|null $default
321321
* @return $this|TWhenEmptyReturnType
322322
*/
323-
public function whenEmpty(callable $callback, callable $default = null);
323+
public function whenEmpty(callable $callback, ?callable $default = null);
324324

325325
/**
326326
* Apply the callback if the collection is not empty.
@@ -331,7 +331,7 @@ public function whenEmpty(callable $callback, callable $default = null);
331331
* @param (callable($this): TWhenNotEmptyReturnType)|null $default
332332
* @return $this|TWhenNotEmptyReturnType
333333
*/
334-
public function whenNotEmpty(callable $callback, callable $default = null);
334+
public function whenNotEmpty(callable $callback, ?callable $default = null);
335335

336336
/**
337337
* Apply the callback if the given "value" is (or resolves to) truthy.
@@ -343,7 +343,7 @@ public function whenNotEmpty(callable $callback, callable $default = null);
343343
* @param (callable($this): TUnlessReturnType)|null $default
344344
* @return $this|TUnlessReturnType
345345
*/
346-
public function unless($value, callable $callback, callable $default = null);
346+
public function unless($value, callable $callback, ?callable $default = null);
347347

348348
/**
349349
* Apply the callback unless the collection is empty.
@@ -354,7 +354,7 @@ public function unless($value, callable $callback, callable $default = null);
354354
* @param (callable($this): TUnlessEmptyReturnType)|null $default
355355
* @return $this|TUnlessEmptyReturnType
356356
*/
357-
public function unlessEmpty(callable $callback, callable $default = null);
357+
public function unlessEmpty(callable $callback, ?callable $default = null);
358358

359359
/**
360360
* Apply the callback unless the collection is not empty.
@@ -365,7 +365,7 @@ public function unlessEmpty(callable $callback, callable $default = null);
365365
* @param (callable($this): TUnlessNotEmptyReturnType)|null $default
366366
* @return $this|TUnlessNotEmptyReturnType
367367
*/
368-
public function unlessNotEmpty(callable $callback, callable $default = null);
368+
public function unlessNotEmpty(callable $callback, ?callable $default = null);
369369

370370
/**
371371
* Filter items by the given key value pair.
@@ -477,7 +477,7 @@ public function whereInstanceOf($type);
477477
* @param TFirstDefault|(\Closure(): TFirstDefault) $default
478478
* @return TValue|TFirstDefault
479479
*/
480-
public function first(callable $callback = null, $default = null);
480+
public function first(?callable $callback = null, $default = null);
481481

482482
/**
483483
* Get the first item by the given key value pair.
@@ -645,7 +645,7 @@ public function keys();
645645
* @param TLastDefault|(\Closure(): TLastDefault) $default
646646
* @return TValue|TLastDefault
647647
*/
648-
public function last(callable $callback = null, $default = null);
648+
public function last(?callable $callback = null, $default = null);
649649

650650
/**
651651
* Run a map over each of the items.

‎src/Illuminate/Collections/LazyCollection.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public function except($keys)
428428
* @param (callable(TValue, TKey): bool)|null $callback
429429
* @return static
430430
*/
431-
public function filter(callable $callback = null)
431+
public function filter(?callable $callback = null)
432432
{
433433
if (is_null($callback)) {
434434
$callback = fn ($value) => (bool) $value;
@@ -452,7 +452,7 @@ public function filter(callable $callback = null)
452452
* @param TFirstDefault|(\Closure(): TFirstDefault) $default
453453
* @return TValue|TFirstDefault
454454
*/
455-
public function first(callable $callback = null, $default = null)
455+
public function first(?callable $callback = null, $default = null)
456456
{
457457
$iterator = $this->getIterator();
458458

@@ -732,7 +732,7 @@ public function keys()
732732
* @param TLastDefault|(\Closure(): TLastDefault) $default
733733
* @return TValue|TLastDefault
734734
*/
735-
public function last(callable $callback = null, $default = null)
735+
public function last(?callable $callback = null, $default = null)
736736
{
737737
$needle = $placeholder = new stdClass;
738738

‎src/Illuminate/Collections/Traits/EnumeratesValues.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public static function empty()
163163
* @param (callable(int): TTimesValue)|null $callback
164164
* @return static<int, TTimesValue>
165165
*/
166-
public static function times($number, callable $callback = null)
166+
public static function times($number, ?callable $callback = null)
167167
{
168168
if ($number < 1) {
169169
return new static;
@@ -530,7 +530,7 @@ public function sum($callback = null)
530530
* @param (callable($this): TWhenEmptyReturnType)|null $default
531531
* @return $this|TWhenEmptyReturnType
532532
*/
533-
public function whenEmpty(callable $callback, callable $default = null)
533+
public function whenEmpty(callable $callback, ?callable $default = null)
534534
{
535535
return $this->when($this->isEmpty(), $callback, $default);
536536
}
@@ -544,7 +544,7 @@ public function whenEmpty(callable $callback, callable $default = null)
544544
* @param (callable($this): TWhenNotEmptyReturnType)|null $default
545545
* @return $this|TWhenNotEmptyReturnType
546546
*/
547-
public function whenNotEmpty(callable $callback, callable $default = null)
547+
public function whenNotEmpty(callable $callback, ?callable $default = null)
548548
{
549549
return $this->when($this->isNotEmpty(), $callback, $default);
550550
}
@@ -558,7 +558,7 @@ public function whenNotEmpty(callable $callback, callable $default = null)
558558
* @param (callable($this): TUnlessEmptyReturnType)|null $default
559559
* @return $this|TUnlessEmptyReturnType
560560
*/
561-
public function unlessEmpty(callable $callback, callable $default = null)
561+
public function unlessEmpty(callable $callback, ?callable $default = null)
562562
{
563563
return $this->whenNotEmpty($callback, $default);
564564
}
@@ -572,7 +572,7 @@ public function unlessEmpty(callable $callback, callable $default = null)
572572
* @param (callable($this): TUnlessNotEmptyReturnType)|null $default
573573
* @return $this|TUnlessNotEmptyReturnType
574574
*/
575-
public function unlessNotEmpty(callable $callback, callable $default = null)
575+
public function unlessNotEmpty(callable $callback, ?callable $default = null)
576576
{
577577
return $this->whenEmpty($callback, $default);
578578
}

‎src/Illuminate/Conditionable/Traits/Conditionable.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait Conditionable
1818
* @param (callable($this, TWhenParameter): TWhenReturnType)|null $default
1919
* @return $this|TWhenReturnType
2020
*/
21-
public function when($value = null, callable $callback = null, callable $default = null)
21+
public function when($value = null, ?callable $callback = null, ?callable $default = null)
2222
{
2323
$value = $value instanceof Closure ? $value($this) : $value;
2424

@@ -50,7 +50,7 @@ public function when($value = null, callable $callback = null, callable $default
5050
* @param (callable($this, TUnlessParameter): TUnlessReturnType)|null $default
5151
* @return $this|TUnlessReturnType
5252
*/
53-
public function unless($value = null, callable $callback = null, callable $default = null)
53+
public function unless($value = null, ?callable $callback = null, ?callable $default = null)
5454
{
5555
$value = $value instanceof Closure ? $value($this) : $value;
5656

‎src/Illuminate/Container/Container.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ protected function unresolvablePrimitive(ReflectionParameter $parameter)
11401140
* @param \Closure|null $callback
11411141
* @return void
11421142
*/
1143-
public function beforeResolving($abstract, Closure $callback = null)
1143+
public function beforeResolving($abstract, ?Closure $callback = null)
11441144
{
11451145
if (is_string($abstract)) {
11461146
$abstract = $this->getAlias($abstract);
@@ -1160,7 +1160,7 @@ public function beforeResolving($abstract, Closure $callback = null)
11601160
* @param \Closure|null $callback
11611161
* @return void
11621162
*/
1163-
public function resolving($abstract, Closure $callback = null)
1163+
public function resolving($abstract, ?Closure $callback = null)
11641164
{
11651165
if (is_string($abstract)) {
11661166
$abstract = $this->getAlias($abstract);
@@ -1180,7 +1180,7 @@ public function resolving($abstract, Closure $callback = null)
11801180
* @param \Closure|null $callback
11811181
* @return void
11821182
*/
1183-
public function afterResolving($abstract, Closure $callback = null)
1183+
public function afterResolving($abstract, ?Closure $callback = null)
11841184
{
11851185
if (is_string($abstract)) {
11861186
$abstract = $this->getAlias($abstract);
@@ -1419,7 +1419,7 @@ public static function getInstance()
14191419
* @param \Illuminate\Contracts\Container\Container|null $container
14201420
* @return \Illuminate\Contracts\Container\Container|static
14211421
*/
1422-
public static function setInstance(ContainerContract $container = null)
1422+
public static function setInstance(?ContainerContract $container = null)
14231423
{
14241424
return static::$instance = $container;
14251425
}

‎src/Illuminate/Contracts/Auth/Access/Gate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function define($ability, $callback);
2929
* @param array|null $abilities
3030
* @return $this
3131
*/
32-
public function resource($name, $class, array $abilities = null);
32+
public function resource($name, $class, ?array $abilities = null);
3333

3434
/**
3535
* Define a policy class for a given class type.

‎src/Illuminate/Contracts/Auth/PasswordBroker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ interface PasswordBroker
4848
* @param \Closure|null $callback
4949
* @return string
5050
*/
51-
public function sendResetLink(array $credentials, Closure $callback = null);
51+
public function sendResetLink(array $credentials, ?Closure $callback = null);
5252

5353
/**
5454
* Reset the password for the given token.

0 commit comments

Comments
 (0)