Skip to content

Commit 064d274

Browse files
TomA-RTomA-R
authored
Improve PHP 8.4 support (#45)
Fixed implicitly nullable parameter declarations
1 parent da2b013 commit 064d274

17 files changed

+36
-36
lines changed

‎src/Assetic/Asset/AssetCache.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function clearFilters()
3838
$this->asset->clearFilters();
3939
}
4040

41-
public function load(FilterInterface $additionalFilter = null)
41+
public function load(?FilterInterface $additionalFilter = null)
4242
{
4343
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
4444
if ($this->cache->has($cacheKey)) {
@@ -51,7 +51,7 @@ public function load(FilterInterface $additionalFilter = null)
5151
$this->cache->set($cacheKey, $this->asset->getContent());
5252
}
5353

54-
public function dump(FilterInterface $additionalFilter = null)
54+
public function dump(?FilterInterface $additionalFilter = null)
5555
{
5656
$cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'dump');
5757
if ($this->cache->has($cacheKey)) {
@@ -130,13 +130,13 @@ public function getValues()
130130
* * last modified
131131
* * filters
132132
*
133-
* @param AssetInterface $asset The asset
134-
* @param FilterInterface $additionalFilter Any additional filter being applied
135-
* @param string $salt Salt for the key
133+
* @param AssetInterface $asset The asset
134+
* @param ?FilterInterface $additionalFilter Any additional filter being applied
135+
* @param string $salt Salt for the key
136136
*
137137
* @return string A key for identifying the current asset
138138
*/
139-
private static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
139+
private static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, $salt = '')
140140
{
141141
if ($additionalFilter) {
142142
$asset = clone $asset;

‎src/Assetic/Asset/AssetCollection.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function clearFilters()
125125
$this->clones = new \SplObjectStorage();
126126
}
127127

128-
public function load(FilterInterface $additionalFilter = null)
128+
public function load(?FilterInterface $additionalFilter = null)
129129
{
130130
// loop through leaves and load each asset
131131
$parts = [];
@@ -137,7 +137,7 @@ public function load(FilterInterface $additionalFilter = null)
137137
$this->content = implode("\n", $parts);
138138
}
139139

140-
public function dump(FilterInterface $additionalFilter = null)
140+
public function dump(?FilterInterface $additionalFilter = null)
141141
{
142142
// loop through leaves and dump each asset
143143
$parts = [];

‎src/Assetic/Asset/AssetReference.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public function clearFilters()
5252
$this->callAsset(__FUNCTION__);
5353
}
5454

55-
public function load(FilterInterface $additionalFilter = null)
55+
public function load(?FilterInterface $additionalFilter = null)
5656
{
5757
$this->flushFilters();
5858

5959
return $this->callAsset(__FUNCTION__, array($additionalFilter));
6060
}
6161

62-
public function dump(FilterInterface $additionalFilter = null)
62+
public function dump(?FilterInterface $additionalFilter = null)
6363
{
6464
$this->flushFilters();
6565

‎src/Assetic/Asset/BaseAsset.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ public function clearFilters()
7070
/**
7171
* Encapsulates asset loading logic.
7272
*
73-
* @param string $content The asset content
74-
* @param FilterInterface $additionalFilter An additional filter
73+
* @param string $content The asset content
74+
* @param ?FilterInterface $additionalFilter An additional filter
7575
*/
76-
protected function doLoad($content, FilterInterface $additionalFilter = null)
76+
protected function doLoad($content, ?FilterInterface $additionalFilter = null)
7777
{
7878
$filter = clone $this->filters;
7979
if ($additionalFilter) {
@@ -89,7 +89,7 @@ protected function doLoad($content, FilterInterface $additionalFilter = null)
8989
$this->loaded = true;
9090
}
9191

92-
public function dump(FilterInterface $additionalFilter = null)
92+
public function dump(?FilterInterface $additionalFilter = null)
9393
{
9494
if (!$this->loaded) {
9595
$this->load();

‎src/Assetic/Asset/FileAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function __construct($source, $filters = [], $sourceRoot = null, $sourceP
4545
parent::__construct($filters, $sourceRoot, $sourcePath, $vars);
4646
}
4747

48-
public function load(FilterInterface $additionalFilter = null)
48+
public function load(?FilterInterface $additionalFilter = null)
4949
{
5050
$source = VarUtils::resolve($this->source, $this->getVars(), $this->getValues());
5151

‎src/Assetic/Asset/GlobAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function all()
4141
return parent::all();
4242
}
4343

44-
public function load(FilterInterface $additionalFilter = null)
44+
public function load(?FilterInterface $additionalFilter = null)
4545
{
4646
if (!$this->initialized) {
4747
$this->initialize();
@@ -50,7 +50,7 @@ public function load(FilterInterface $additionalFilter = null)
5050
parent::load($additionalFilter);
5151
}
5252

53-
public function dump(FilterInterface $additionalFilter = null)
53+
public function dump(?FilterInterface $additionalFilter = null)
5454
{
5555
if (!$this->initialized) {
5656
$this->initialize();

‎src/Assetic/Asset/HttpAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function __construct($sourceUrl, $filters = [], $ignoreErrors = false, ar
4242
parent::__construct($filters, $scheme . '://' . $host, $path, $vars);
4343
}
4444

45-
public function load(FilterInterface $additionalFilter = null)
45+
public function load(?FilterInterface $additionalFilter = null)
4646
{
4747
$content = @file_get_contents(
4848
VarUtils::resolve($this->sourceUrl, $this->getVars(), $this->getValues())

‎src/Assetic/Asset/MockAsset.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ public function clearFilters()
3232
{
3333
}
3434

35-
public function load(FilterInterface $additionalFilter = null)
35+
public function load(?FilterInterface $additionalFilter = null)
3636
{
3737
}
3838

39-
public function dump(FilterInterface $additionalFilter = null)
39+
public function dump(?FilterInterface $additionalFilter = null)
4040
{
4141
}
4242

‎src/Assetic/Asset/StringAsset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct($content, $filters = [], $sourceRoot = null, $source
2929
parent::__construct($filters, $sourceRoot, $sourcePath);
3030
}
3131

32-
public function load(FilterInterface $additionalFilter = null)
32+
public function load(?FilterInterface $additionalFilter = null)
3333
{
3434
$this->doLoad($this->string, $additionalFilter);
3535
}

‎src/Assetic/Contracts/Asset/AssetInterface.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public function clearFilters();
3535
*
3636
* You may provide an additional filter to apply during load.
3737
*
38-
* @param FilterInterface $additionalFilter An additional filter
38+
* @param ?FilterInterface $additionalFilter An additional filter
3939
*/
40-
public function load(FilterInterface $additionalFilter = null);
40+
public function load(?FilterInterface $additionalFilter = null);
4141

4242
/**
4343
* Applies dump filters and returns the asset as a string.
@@ -49,11 +49,11 @@ public function load(FilterInterface $additionalFilter = null);
4949
* If the current asset has not been loaded yet, it should be
5050
* automatically loaded at this time.
5151
*
52-
* @param FilterInterface $additionalFilter An additional filter
52+
* @param ?FilterInterface $additionalFilter An additional filter
5353
*
5454
* @return string The filtered content of the current asset
5555
*/
56-
public function dump(FilterInterface $additionalFilter = null);
56+
public function dump(?FilterInterface $additionalFilter = null);
5757

5858
/**
5959
* Returns the loaded content of the current asset.

‎src/Assetic/Exception/FilterException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static function fromProcess(Process $proc)
3232
return new self($message);
3333
}
3434

35-
public function __construct($message, $code = 0, \Exception $previous = null)
35+
public function __construct($message, $code = 0, ?\Exception $previous = null)
3636
{
3737
parent::__construct($message, $code, $previous);
3838

‎src/Assetic/Extension/Twig/AsseticExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class AsseticExtension extends AbstractExtension implements GlobalsInterface
1313
protected $functions;
1414
protected $valueSupplier;
1515

16-
public function __construct(AssetFactory $factory, $functions = [], ValueSupplierInterface $valueSupplier = null)
16+
public function __construct(AssetFactory $factory, $functions = [], ?ValueSupplierInterface $valueSupplier = null)
1717
{
1818
$this->factory = $factory;
1919
$this->functions = [];

‎src/Assetic/Extension/Twig/TwigFormulaLoader.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class TwigFormulaLoader implements FormulaLoaderInterface
1919
private $twig;
2020
private $logger;
2121

22-
public function __construct(Environment $twig, LoggerInterface $logger = null)
22+
public function __construct(Environment $twig, ?LoggerInterface $logger = null)
2323
{
2424
$this->twig = $twig;
2525
$this->logger = $logger;

‎src/Assetic/Filter/CssImportFilter.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ class CssImportFilter extends BaseCssFilter implements DependencyExtractorInterf
2020
/**
2121
* Constructor.
2222
*
23-
* @param FilterInterface $importFilter Filter for each imported asset
23+
* @param ?FilterInterface $importFilter Filter for each imported asset
2424
*/
25-
public function __construct(FilterInterface $importFilter = null)
25+
public function __construct(?FilterInterface $importFilter = null)
2626
{
2727
$this->importFilter = $importFilter ?: new CssRewriteFilter();
2828
}

‎src/Assetic/Filter/ScssphpFilter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function addImportPath($path)
106106
$this->importPaths[] = $path;
107107
}
108108

109-
public function registerFunction($name, $callable, array $argumentDeclaration = null)
109+
public function registerFunction($name, $callable, ?array $argumentDeclaration = null)
110110
{
111111
$this->customFunctions[$name] = [
112112
'callable' => $callable,

‎src/Assetic/Filter/UglifyJs3Filter.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class UglifyJs3Filter extends BaseNodeFilter
2525
private $defines;
2626

2727
/**
28-
* @param string $uglifyjsBin Absolute path to the uglifyjs executable
29-
* @param string $nodeBin Absolute path to the folder containg node.js executable
28+
* @param string $uglifyjsBin Absolute path to the uglifyjs executable
29+
* @param ?string $nodeBin Absolute path to the folder containing node.js executable
3030
*/
3131
public function __construct($uglifyjsBin = '/usr/bin/uglifyjs', $nodeBin = null)
3232
{

‎tests/Assetic/Test/Filter/UglifyJs3FilterTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testDefines()
6868
/**
6969
* Copyright
7070
*/
71-
"undefined"==typeof FOO&&(FOO=1),function(){new Array(FOO,2,3,4);var bar=Array(a,b,c),var2=(new Array(5),new Array(a));function bar(foo){var2.push(foo)}bar("abc123")}();
71+
"undefined"==typeof FOO&&(FOO=1),(()=>{new Array(FOO,2,3,4);var bar=Array(a,b,c),var2=(new Array(5),new Array(a));function bar(foo){var2.push(foo)}bar("abc123")})();
7272
JS;
7373
$this->assertEquals($expected, $this->asset->getContent());
7474
}
@@ -83,7 +83,7 @@ public function testMutipleDefines()
8383
/**
8484
* Copyright
8585
*/
86-
!function(){new Array(2,2,3,4);var bar=Array(a,b,c),var2=(new Array(5),new Array(a));function bar(foo){var2.push(foo)}bar("abc123")}();
86+
(()=>{new Array(2,2,3,4);var bar=Array(a,b,c),var2=(new Array(5),new Array(a));function bar(foo){var2.push(foo)}bar("abc123")})();
8787
JS;
8888
$this->assertEquals($expected, $this->asset->getContent());
8989
}
@@ -98,7 +98,7 @@ public function testUnsafeUglify()
9898
/**
9999
* Copyright
100100
*/
101-
"undefined"==typeof DEBUG&&(DEBUG=!0),"undefined"==typeof FOO&&(FOO=1),function(){FOO;var bar=[a,b,c],var2=Array(a);function bar(foo){var2.push(foo)}DEBUG&&console.log("hellow world"),bar("abc123")}();
101+
"undefined"==typeof DEBUG&&(DEBUG=!0),"undefined"==typeof FOO&&(FOO=1),(()=>{FOO;var bar=[a,b,c],var2=Array(a);function bar(foo){var2.push(foo)}DEBUG&&console.log("hellow world"),bar("abc123")})();
102102
JS;
103103
$this->assertEquals($expected, $this->asset->getContent());
104104
}

0 commit comments

Comments
 (0)