Skip to content

Commit 1a00b45

Browse files
daftspunkdaftspunk
committed
Refactor for PHP 8.4
1 parent d220985 commit 1a00b45

22 files changed

+33
-33
lines changed

‎contracts/Database/MultisiteInterface.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ interface MultisiteInterface
1111
/**
1212
* findOrCreateForSite
1313
*/
14-
public function findOrCreateForSite(string $siteId = null);
14+
public function findOrCreateForSite(?string $siteId = null);
1515

1616
/**
1717
* isMultisiteEnabled

‎src/Assetic/Asset/AssetCache.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function clearFilters()
5757
/**
5858
* load
5959
*/
60-
public function load(FilterInterface $additionalFilter = null)
60+
public function load(?FilterInterface $additionalFilter = null)
6161
{
6262
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
6363
if ($this->cache->has($cacheKey)) {
@@ -73,7 +73,7 @@ public function load(FilterInterface $additionalFilter = null)
7373
/**
7474
* dump
7575
*/
76-
public function dump(FilterInterface $additionalFilter = null)
76+
public function dump(?FilterInterface $additionalFilter = null)
7777
{
7878
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'dump');
7979
if ($this->cache->has($cacheKey)) {

‎src/Assetic/Asset/AssetCollection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public function clearFilters()
183183
/**
184184
* load
185185
*/
186-
public function load(FilterInterface $additionalFilter = null)
186+
public function load(?FilterInterface $additionalFilter = null)
187187
{
188188
// loop through leaves and load each asset
189189
$parts = [];
@@ -198,7 +198,7 @@ public function load(FilterInterface $additionalFilter = null)
198198
/**
199199
* dump
200200
*/
201-
public function dump(FilterInterface $additionalFilter = null)
201+
public function dump(?FilterInterface $additionalFilter = null)
202202
{
203203
// loop through leaves and dump each asset
204204
$parts = [];

‎src/Assetic/Asset/AssetInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function clearFilters();
3535
*
3636
* @param FilterInterface $additionalFilter An additional filter
3737
*/
38-
public function load(FilterInterface $additionalFilter = null);
38+
public function load(?FilterInterface $additionalFilter = null);
3939

4040
/**
4141
* Applies dump filters and returns the asset as a string.
@@ -51,7 +51,7 @@ public function load(FilterInterface $additionalFilter = null);
5151
*
5252
* @return string The filtered content of the current asset
5353
*/
54-
public function dump(FilterInterface $additionalFilter = null);
54+
public function dump(?FilterInterface $additionalFilter = null);
5555

5656
/**
5757
* Returns the loaded content of the current asset.

‎src/Assetic/Asset/BaseAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function clearFilters()
106106
* @param string $content The asset content
107107
* @param FilterInterface $additionalFilter An additional filter
108108
*/
109-
protected function doLoad($content, FilterInterface $additionalFilter = null)
109+
protected function doLoad($content, ?FilterInterface $additionalFilter = null)
110110
{
111111
$filter = clone $this->filters;
112112
if ($additionalFilter) {
@@ -122,7 +122,7 @@ protected function doLoad($content, FilterInterface $additionalFilter = null)
122122
$this->loaded = true;
123123
}
124124

125-
public function dump(FilterInterface $additionalFilter = null)
125+
public function dump(?FilterInterface $additionalFilter = null)
126126
{
127127
if (!$this->loaded) {
128128
$this->load();

‎src/Assetic/Asset/FileAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct($source, $filters = [], $sourceRoot = null, $sourceP
5353
/**
5454
* load
5555
*/
56-
public function load(FilterInterface $additionalFilter = null)
56+
public function load(?FilterInterface $additionalFilter = null)
5757
{
5858
$source = VarUtils::resolve($this->source, $this->getVars(), $this->getValues());
5959

‎src/Assetic/Asset/GlobAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function all()
5252
/**
5353
* load
5454
*/
55-
public function load(FilterInterface $additionalFilter = null)
55+
public function load(?FilterInterface $additionalFilter = null)
5656
{
5757
if (!$this->initialized) {
5858
$this->initialize();
@@ -64,7 +64,7 @@ public function load(FilterInterface $additionalFilter = null)
6464
/**
6565
* dump
6666
*/
67-
public function dump(FilterInterface $additionalFilter = null)
67+
public function dump(?FilterInterface $additionalFilter = null)
6868
{
6969
if (!$this->initialized) {
7070
$this->initialize();

‎src/Assetic/Asset/HttpAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct($sourceUrl, $filters = [], $ignoreErrors = false, ar
5353
/**
5454
* load
5555
*/
56-
public function load(FilterInterface $additionalFilter = null)
56+
public function load(?FilterInterface $additionalFilter = null)
5757
{
5858
$content = @file_get_contents(
5959
VarUtils::resolve($this->sourceUrl, $this->getVars(), $this->getValues())

‎src/Assetic/Asset/StringAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct($content, $filters = [], $sourceRoot = null, $source
3030
/**
3131
* load
3232
*/
33-
public function load(FilterInterface $additionalFilter = null)
33+
public function load(?FilterInterface $additionalFilter = null)
3434
{
3535
$this->doLoad($this->string, $additionalFilter);
3636
}

‎src/Assetic/Exception/FilterException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class FilterException extends \RuntimeException implements Exception
1010
private $originalMessage;
1111
private $input;
1212

13-
public function __construct($message, $code = 0, \Exception $previous = null)
13+
public function __construct($message, $code = 0, ?\Exception $previous = null)
1414
{
1515
parent::__construct($message, $code, $previous);
1616

‎src/Assetic/Filter/CssImportFilter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class CssImportFilter extends BaseCssFilter implements HashableInterface, Depend
2929
*
3030
* @param FilterInterface $importFilter Filter for each imported asset
3131
*/
32-
public function __construct(FilterInterface $importFilter = null)
32+
public function __construct(?FilterInterface $importFilter = null)
3333
{
3434
$this->importFilter = $importFilter ?: new CssRewriteFilter();
3535
}

‎src/Auth/AuthException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AuthException extends ApplicationException
4747
* @param int $code
4848
* @param Exception $previous
4949
*/
50-
public function __construct($message = '', $code = 0, Exception $previous = null)
50+
public function __construct($message = '', $code = 0, ?Exception $previous = null)
5151
{
5252
if ($this->useSoftErrors()) {
5353
$message = static::$errorMessage;

‎src/Composer/Concerns/HasOutput.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ trait HasOutput
2323
/**
2424
* setOutput
2525
*/
26-
public function setOutput(IOInterface $output = null)
26+
public function setOutput(?IOInterface $output = null)
2727
{
2828
if ($output === null) {
2929
$this->output = new NullIO();

‎src/Database/Concerns/HasReplication.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait HasReplication
1818
* @param array|null $except
1919
* @return static
2020
*/
21-
public function replicateWithRelations(array $except = null)
21+
public function replicateWithRelations(?array $except = null)
2222
{
2323
return App::makeWith('db.replicator', ['model' => $this])->replicate($except);
2424
}
@@ -31,7 +31,7 @@ public function replicateWithRelations(array $except = null)
3131
* @param array|null $except
3232
* @return static
3333
*/
34-
public function duplicateWithRelations(array $except = null)
34+
public function duplicateWithRelations(?array $except = null)
3535
{
3636
return App::makeWith('db.replicator', ['model' => $this])->duplicate($except);
3737
}

‎src/Database/Dongle.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function __construct($driver = 'mysql', $db = null)
3232
/**
3333
* raw transforms and executes a raw SQL statement
3434
*/
35-
public function raw(string $sql, array $params = null)
35+
public function raw(string $sql, ?array $params = null)
3636
{
3737
return $this->db->raw($this->parse($sql, $params));
3838
}
@@ -56,7 +56,7 @@ public function rawValue($sql): string
5656
* replaces :column_name with array value without requiring a list of names.
5757
* Example: custom_country_id = :country_id → custom_country_id = 7
5858
*/
59-
public function parse(string $sql, array $params = null): string
59+
public function parse(string $sql, ?array $params = null): string
6060
{
6161
if (is_array($params) && preg_match_all('/\:([\w]+)/', $sql, $matches)) {
6262
$sql = $this->parseValues($sql, $params, $matches[1]);

‎src/Database/Replicator.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct($model)
4646
* @param array|null $except
4747
* @return static
4848
*/
49-
public function replicate(array $except = null)
49+
public function replicate(?array $except = null)
5050
{
5151
$this->isDuplicating = false;
5252

@@ -61,7 +61,7 @@ public function replicate(array $except = null)
6161
* @param array|null $except
6262
* @return static
6363
*/
64-
public function duplicate(array $except = null)
64+
public function duplicate(?array $except = null)
6565
{
6666
$this->isDuplicating = true;
6767

@@ -71,7 +71,7 @@ public function duplicate(array $except = null)
7171
/**
7272
* replicateRelationsInternal
7373
*/
74-
protected function replicateRelationsInternal(array $except = null)
74+
protected function replicateRelationsInternal(?array $except = null)
7575
{
7676
$defaults = [
7777
$this->model->getKeyName(),

‎src/Events/PriorityDispatcher.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class PriorityDispatcher
3333
* @param \Illuminate\Contracts\Container\Container|null $container
3434
* @return void
3535
*/
36-
public function __construct(ContainerContract $container = null)
36+
public function __construct(?ContainerContract $container = null)
3737
{
3838
$this->container = $container ?: new Container;
3939
}

‎src/Exception/ExceptionBase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ExceptionBase extends Exception
5353
* @param int $code Error code.
5454
* @param Throwable $previous Previous exception.
5555
*/
56-
public function __construct($message = "", $code = 0, Throwable $previous = null)
56+
public function __construct($message = "", $code = 0, ?Throwable $previous = null)
5757
{
5858
if ($this->className === null) {
5959
$this->className = get_called_class();

‎src/Halcyon/Model.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ public function update(array $attributes = [])
939939
* @param array $options
940940
* @return bool
941941
*/
942-
public function save(array $options = null)
942+
public function save(?array $options = null)
943943
{
944944
return $this->saveInternal(['force' => false] + (array) $options);
945945
}

‎src/Mail/Mailer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public function later($delay, $view, $data = null, $callback = null, $queue = nu
269269
* @param \Closure|string $callback
270270
* @return mixed
271271
*/
272-
public function laterOn($queue, $delay, $view, array $data = null, $callback = null)
272+
public function laterOn($queue, $delay, $view, ?array $data = null, $callback = null)
273273
{
274274
return $this->later($delay, $view, $data, $callback, $queue);
275275
}

‎src/Parse/Parsedown/Parsedown.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ protected function blockHeader($Line)
648648
/**
649649
* blockList
650650
*/
651-
protected function blockList($Line, array $CurrentBlock = null)
651+
protected function blockList($Line, ?array $CurrentBlock = null)
652652
{
653653
list($name, $pattern) = $Line['text'][0] <= '-' ? array('ul', '[*+-]') : array('ol', '[0-9]{1,9}+[.\)]');
654654

@@ -870,7 +870,7 @@ protected function blockRule($Line)
870870
/**
871871
* blockSetextHeader
872872
*/
873-
protected function blockSetextHeader($Line, array $Block = null)
873+
protected function blockSetextHeader($Line, ?array $Block = null)
874874
{
875875
if (!isset($Block) || $Block['type'] !== 'Paragraph' || isset($Block['interrupted'])) {
876876
return;
@@ -953,7 +953,7 @@ protected function blockReference($Line)
953953
/**
954954
* blockTable
955955
*/
956-
protected function blockTable($Line, array $Block = null)
956+
protected function blockTable($Line, ?array $Block = null)
957957
{
958958
if (!isset($Block) || $Block['type'] !== 'Paragraph' || isset($Block['interrupted'])) {
959959
return;

‎src/Parse/Parsedown/ParsedownExtra.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ protected function blockMarkupComplete($Block)
343343
/**
344344
* blockSetextHeader
345345
*/
346-
protected function blockSetextHeader($Line, array $Block = null)
346+
protected function blockSetextHeader($Line, ?array $Block = null)
347347
{
348348
$Block = parent::blockSetextHeader($Line, $Block);
349349

0 commit comments

Comments
 (0)