Improve PHP 8.4 support

src/Assetic/Asset/AssetCache.php

@@ -38,7 +38,7 @@ public function clearFilters()
         $this->asset->clearFilters();
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'load');
         if ($this->cache->has($cacheKey)) {
@@ -51,7 +51,7 @@ public function load(FilterInterface $additionalFilter = null)
         $this->cache->set($cacheKey, $this->asset->getContent());
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         $cacheKey = self::getCacheKey($this->asset, $additionalFilter, 'dump');
         if ($this->cache->has($cacheKey)) {
@@ -130,13 +130,13 @@ public function getValues()
      *  * last modified
      *  * filters
      *
-     * @param AssetInterface  $asset            The asset
-     * @param FilterInterface $additionalFilter Any additional filter being applied
-     * @param string          $salt             Salt for the key
+     * @param AssetInterface   $asset            The asset
+     * @param ?FilterInterface $additionalFilter Any additional filter being applied
+     * @param string           $salt             Salt for the key
      *
      * @return string A key for identifying the current asset
      */
-    private static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
+    private static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, $salt = '')
     {
         if ($additionalFilter) {
             $asset = clone $asset;

src/Assetic/Asset/AssetCollection.php

@@ -125,7 +125,7 @@ public function clearFilters()
         $this->clones = new \SplObjectStorage();
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         // loop through leaves and load each asset
         $parts = [];
@@ -137,7 +137,7 @@ public function load(FilterInterface $additionalFilter = null)
         $this->content = implode("\n", $parts);
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         // loop through leaves and dump each asset
         $parts = [];

src/Assetic/Asset/AssetReference.php

@@ -52,14 +52,14 @@ public function clearFilters()
         $this->callAsset(__FUNCTION__);
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $this->flushFilters();
 
         return $this->callAsset(__FUNCTION__, array($additionalFilter));
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         $this->flushFilters();
 

src/Assetic/Asset/BaseAsset.php

@@ -70,10 +70,10 @@ public function clearFilters()
     /**
      * Encapsulates asset loading logic.
      *
-     * @param string          $content          The asset content
-     * @param FilterInterface $additionalFilter An additional filter
+     * @param string           $content          The asset content
+     * @param ?FilterInterface $additionalFilter An additional filter
      */
-    protected function doLoad($content, FilterInterface $additionalFilter = null)
+    protected function doLoad($content, ?FilterInterface $additionalFilter = null)
     {
         $filter = clone $this->filters;
         if ($additionalFilter) {
@@ -89,7 +89,7 @@ protected function doLoad($content, FilterInterface $additionalFilter = null)
         $this->loaded = true;
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         if (!$this->loaded) {
             $this->load();

src/Assetic/Asset/FileAsset.php

@@ -45,7 +45,7 @@ public function __construct($source, $filters = [], $sourceRoot = null, $sourceP
         parent::__construct($filters, $sourceRoot, $sourcePath, $vars);
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $source = VarUtils::resolve($this->source, $this->getVars(), $this->getValues());
 

src/Assetic/Asset/GlobAsset.php

@@ -41,7 +41,7 @@ public function all()
         return parent::all();
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         if (!$this->initialized) {
             $this->initialize();
@@ -50,7 +50,7 @@ public function load(FilterInterface $additionalFilter = null)
         parent::load($additionalFilter);
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
         if (!$this->initialized) {
             $this->initialize();

src/Assetic/Asset/HttpAsset.php

@@ -42,7 +42,7 @@ public function __construct($sourceUrl, $filters = [], $ignoreErrors = false, ar
         parent::__construct($filters, $scheme . '://' . $host, $path, $vars);
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $content = @file_get_contents(
             VarUtils::resolve($this->sourceUrl, $this->getVars(), $this->getValues())

src/Assetic/Asset/MockAsset.php

@@ -32,11 +32,11 @@ public function clearFilters()
     {
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
     }
 
-    public function dump(FilterInterface $additionalFilter = null)
+    public function dump(?FilterInterface $additionalFilter = null)
     {
     }
 

src/Assetic/Asset/StringAsset.php

@@ -29,7 +29,7 @@ public function __construct($content, $filters = [], $sourceRoot = null, $source
         parent::__construct($filters, $sourceRoot, $sourcePath);
     }
 
-    public function load(FilterInterface $additionalFilter = null)
+    public function load(?FilterInterface $additionalFilter = null)
     {
         $this->doLoad($this->string, $additionalFilter);
     }

src/Assetic/Contracts/Asset/AssetInterface.php

@@ -35,9 +35,9 @@ public function clearFilters();
      *
      * You may provide an additional filter to apply during load.
      *
-     * @param FilterInterface $additionalFilter An additional filter
+     * @param ?FilterInterface $additionalFilter An additional filter
      */
-    public function load(FilterInterface $additionalFilter = null);
+    public function load(?FilterInterface $additionalFilter = null);
 
     /**
      * Applies dump filters and returns the asset as a string.
@@ -49,11 +49,11 @@ public function load(FilterInterface $additionalFilter = null);
      * If the current asset has not been loaded yet, it should be
      * automatically loaded at this time.
      *
-     * @param FilterInterface $additionalFilter An additional filter
+     * @param ?FilterInterface $additionalFilter An additional filter
      *
      * @return string The filtered content of the current asset
      */
-    public function dump(FilterInterface $additionalFilter = null);
+    public function dump(?FilterInterface $additionalFilter = null);
 
     /**
      * Returns the loaded content of the current asset.

src/Assetic/Exception/FilterException.php

@@ -32,7 +32,7 @@ public static function fromProcess(Process $proc)
         return new self($message);
     }
 
-    public function __construct($message, $code = 0, \Exception $previous = null)
+    public function __construct($message, $code = 0, ?\Exception $previous = null)
     {
         parent::__construct($message, $code, $previous);
 

src/Assetic/Extension/Twig/AsseticExtension.php

@@ -13,7 +13,7 @@ class AsseticExtension extends AbstractExtension implements GlobalsInterface
     protected $functions;
     protected $valueSupplier;
 
-    public function __construct(AssetFactory $factory, $functions = [], ValueSupplierInterface $valueSupplier = null)
+    public function __construct(AssetFactory $factory, $functions = [], ?ValueSupplierInterface $valueSupplier = null)
     {
         $this->factory = $factory;
         $this->functions = [];

src/Assetic/Extension/Twig/TwigFormulaLoader.php

@@ -19,7 +19,7 @@ class TwigFormulaLoader implements FormulaLoaderInterface
     private $twig;
     private $logger;
 
-    public function __construct(Environment $twig, LoggerInterface $logger = null)
+    public function __construct(Environment $twig, ?LoggerInterface $logger = null)
     {
         $this->twig = $twig;
         $this->logger = $logger;

src/Assetic/Filter/CssImportFilter.php

@@ -20,9 +20,9 @@ class CssImportFilter extends BaseCssFilter implements DependencyExtractorInterf
     /**
      * Constructor.
      *
-     * @param FilterInterface $importFilter Filter for each imported asset
+     * @param ?FilterInterface $importFilter Filter for each imported asset
      */
-    public function __construct(FilterInterface $importFilter = null)
+    public function __construct(?FilterInterface $importFilter = null)
     {
         $this->importFilter = $importFilter ?: new CssRewriteFilter();
     }

src/Assetic/Filter/ScssphpFilter.php

@@ -106,7 +106,7 @@ public function addImportPath($path)
         $this->importPaths[] = $path;
     }
 
-    public function registerFunction($name, $callable, array $argumentDeclaration = null)
+    public function registerFunction($name, $callable, ?array $argumentDeclaration = null)
     {
         $this->customFunctions[$name] = [
             'callable' => $callable,

src/Assetic/Filter/UglifyJs3Filter.php

@@ -25,8 +25,8 @@ class UglifyJs3Filter extends BaseNodeFilter
     private $defines;
 
     /**
-     * @param string $uglifyjsBin Absolute path to the uglifyjs executable
-     * @param string $nodeBin     Absolute path to the folder containg node.js executable
+     * @param string  $uglifyjsBin Absolute path to the uglifyjs executable
+     * @param ?string $nodeBin     Absolute path to the folder containing node.js executable
      */
     public function __construct($uglifyjsBin = '/usr/bin/uglifyjs', $nodeBin = null)
     {