Refactor for PHP 8.4

Author: daftspunk

contracts/Element/FilterElement.php

@@ -13,5 +13,5 @@ interface FilterElement
     /**
      * defineScope adds a scope to the filter element
      */
-    public function defineScope(string $scopeName = null, string $label = null): ScopeDefinition;
+    public function defineScope(string $scopeName, ?string $label = null): ScopeDefinition;
 }

contracts/Element/FormElement.php

@@ -14,7 +14,7 @@ interface FormElement
     /**
      * addFormField adds a field to the fieldset
      */
-    public function addFormField(string $fieldName = null, string $label = null): FieldDefinition;
+    public function addFormField(string $fieldName, ?string $label = null): FieldDefinition;
 
     /**
      * getFormFieldset returns the current fieldset definition

contracts/Element/ListElement.php

@@ -13,5 +13,5 @@ interface ListElement
     /**
      * defineColumn adds a column to the list element
      */
-    public function defineColumn(string $columnName = null, string $label = null): ColumnDefinition;
+    public function defineColumn(string $columnName, ?string $label = null): ColumnDefinition;
 }

src/Assetic/Asset/AssetCache.php

@@ -190,7 +190,7 @@ public function getValues()
      *
      * @return string A key for identifying the current asset
      */
-    protected static function getCacheKey(AssetInterface $asset, FilterInterface $additionalFilter = null, $salt = '')
+    protected static function getCacheKey(AssetInterface $asset, ?FilterInterface $additionalFilter = null, $salt = '')
     {
         if ($additionalFilter) {
             $asset = clone $asset;

src/Assetic/Combiner.php

@@ -190,7 +190,7 @@ public function resetFilters($extension = null)
     /**
      * getFilters returns all defined filters for a given extension
      */
-    public function getFilters(string $extension = null, $isProduction = false): array
+    public function getFilters(?string $extension = null, bool $isProduction = false): array
     {
         if ($isProduction) {
             if ($extension === null) {

src/Database/Model.php

@@ -420,7 +420,7 @@ public function getSaveOption($key, $default = null)
      * @param null $sessionKey
      * @return bool
      */
-    public function save(array $options = null, $sessionKey = null)
+    public function save(array $options = [], $sessionKey = null)
     {
         return $this->saveInternal((array) $options + ['sessionKey' => $sessionKey]);
     }

src/Database/Relations/DefinedConstraints.php

@@ -26,7 +26,7 @@ public function addDefinedConstraints(): void
     /**
      * addDefinedConstraintsToRelation
      */
-    public function addDefinedConstraintsToRelation($relation, array $args = null)
+    public function addDefinedConstraintsToRelation($relation, ?array $args = null)
     {
         if ($args === null) {
             $args = $this->getRelationDefinitionForDefinedConstraints();
@@ -72,7 +72,7 @@ public function addDefinedConstraintsToRelation($relation, array $args = null)
     /**
      * addDefinedConstraintsToQuery
      */
-    public function addDefinedConstraintsToQuery($query, array $args = null)
+    public function addDefinedConstraintsToQuery($query, ?array $args = null)
     {
         if ($args === null) {
             $args = $this->getRelationDefinitionForDefinedConstraints();

src/Halcyon/Datasource/Resolver.php

@@ -31,9 +31,9 @@ public function __construct(array $datasources = [])
     /**
      * datasource instance
      */
-    public function datasource(string $name = null): DatasourceInterface
+    public function datasource(?string $name = null): DatasourceInterface
     {
-        if (is_null($name)) {
+        if ($name === null) {
             $name = $this->getDefaultDatasource();
         }
 

src/Halcyon/Datasource/ResolverInterface.php

@@ -11,7 +11,7 @@ interface ResolverInterface
     /**
      * datasource instance
      */
-    public function datasource(string $name = null): DatasourceInterface;
+    public function datasource(?string $name = null): DatasourceInterface;
 
     /**
      * getDefaultDatasource name

src/Html/HtmlBuilder.php

@@ -25,7 +25,7 @@ class HtmlBuilder
      * @param  \Illuminate\Routing\UrlGenerator  $url
      * @return void
      */
-    public function __construct(UrlGenerator $url = null)
+    public function __construct(?UrlGenerator $url = null)
     {
         $this->url = $url;
     }

src/Support/helpers.php

@@ -258,7 +258,7 @@ function e($value, $doubleEncode = false)
             return $value->toHtml();
         }
 
-        return htmlspecialchars($value, ENT_QUOTES, 'UTF-8', $doubleEncode);
+        return htmlspecialchars((string) $value, ENT_QUOTES, 'UTF-8', $doubleEncode);
     }
 }