Support PHP 8.5

composer.json

@@ -14,7 +14,7 @@
     "ipl/stdlib": ">=0.12.0",
     "ipl/validator": ">=0.5.0",
     "psr/http-message": "^1.1",
-    "guzzlehttp/psr7": "^2.5"
+    "guzzlehttp/psr7": "^2.8"
   },
   "require-dev": {
     "ext-dom": "*",

src/Attributes.php

@@ -21,7 +21,7 @@
  * @phpstan-import-type AttributeValue from Attribute
  * @phpstan-type AttributesType array<string, AttributeValue>
  */
 class Attributes implements ArrayAccess, IteratorAggregate
 {
     /** @var Attribute[] */
     protected $attributes = [];
@@ -38,9 +38,9 @@
     /**
      * Create new HTML attributes
      *
-     * @param AttributesType $attributes
+     * @param ?AttributesType $attributes
      */
-    public function __construct(array $attributes = null)
+    public function __construct(?array $attributes = null)
     {
         if (empty($attributes)) {
             return;
@@ -60,11 +60,11 @@
     /**
      * Create new HTML attributes
      *
-     * @param AttributesType $attributes
+     * @param ?AttributesType $attributes
      *
      * @return static
      */
-    public static function create(array $attributes = null)
+    public static function create(?array $attributes = null)
     {
         return new static($attributes);
     }
@@ -508,7 +508,7 @@
      *
      * @return Attribute[]|ArrayIterator
      */
     public function getIterator(): Traversable
     {
         return new ArrayIterator($this->attributes);
     }

src/FormElement/BaseFormElement.php

@@ -408,7 +408,6 @@ protected function getValueOfNameAttribute()
         $attributes = $this->getAttributes();
 
         $callbacksProperty = new ReflectionProperty(get_class($attributes), 'callbacks');
-        $callbacksProperty->setAccessible(true);
         $callbacks = $callbacksProperty->getValue($attributes);
 
         if (isset($callbacks['name'])) {

src/FormElement/RadioElement.php

@@ -66,7 +66,7 @@ public function setOptions(array $options): self
      *
      * @throws InvalidArgumentException If no option with the specified value exists
      */
-    public function getOption($value): RadioOption
+    public function getOption(string|int $value): RadioOption
     {
         if (! isset($this->options[$value])) {
             throw new InvalidArgumentException(sprintf('There is no such option "%s"', $value));
@@ -127,10 +127,15 @@ protected function assemble()
                     'checked',
                     function () use ($option) {
                         $optionValue = $option->getValue();
+                        $value = $this->getValue();
+
+                        if ($optionValue === '' && $value === null) {
+                            return true;
+                        }
 
                         return ! is_int($optionValue)
-                            ? $this->getValue() === $optionValue
-                            : $this->getValue() == $optionValue;
+                            ? $value === $optionValue
+                            : $value == $optionValue;
                     }
                 )
                 ->registerAttributeCallback(

src/FormElement/RadioOption.php

@@ -9,7 +9,7 @@ class RadioOption
     /** @var string The default label class */
     public const LABEL_CLASS = 'radio-label';
 
-    /** @var string|int|null Value of the option */
+    /** @var string|int Value of the option */
     protected $value;
 
     /** @var string Label of the option */
@@ -27,12 +27,12 @@ class RadioOption
     /**
      * RadioOption constructor.
      *
-     * @param string|int|null $value
+     * @param string|int $value
      * @param string $label
      */
-    public function __construct($value, string $label)
+    public function __construct(string|int $value, string $label)
     {
-        $this->value = $value === '' ? null : $value;
+        $this->value = $value;
         $this->label = $label;
     }
 
@@ -63,9 +63,9 @@ public function getLabel(): string
     /**
      * Get the value of the option
      *
-     * @return string|int|null
+     * @return string|int
      */
-    public function getValue()
+    public function getValue(): string|int
     {
         return $this->value;
     }

src/FormElement/SelectElement.php

@@ -2,7 +2,6 @@
 
 namespace ipl\Html\FormElement;
 
-use InvalidArgumentException;
 use ipl\Html\Attributes;
 use ipl\Html\Common\MultipleAttribute;
 use ipl\Html\Html;
@@ -32,11 +31,11 @@ class SelectElement extends BaseFormElement
     /**
      * Get the option with specified value
      *
-     * @param string|int|null $value
+     * @param string|int $value
      *
      * @return ?SelectOption
      */
-    public function getOption($value): ?SelectOption
+    public function getOption(string|int $value): ?SelectOption
     {
         return $this->options[$value] ?? null;
     }
@@ -75,7 +74,7 @@ public function setDisabledOptions(array $disabledOptions): self
                 $option->setAttribute(
                     'disabled',
                     in_array($optionValue, $disabledOptions, ! is_int($optionValue))
-                    || ($optionValue === null && in_array('', $disabledOptions, true))
+                    || ($optionValue === '' && in_array(null, $disabledOptions, true))
                 );
             }
 
@@ -119,12 +118,12 @@ public function getNameAttribute()
     /**
      * Make the selectOption for the specified value and the label
      *
-     * @param string|int|null $value Value of the option
+     * @param string|int $value Value of the option
      * @param string|array $label Label of the option
      *
      * @return SelectOption|HtmlElement
      */
-    protected function makeOption($value, $label)
+    protected function makeOption(string|int $value, string|array $label)
     {
         if (is_array($label)) {
             $grp = Html::tag('optgroup', ['label' => $value]);
@@ -150,27 +149,23 @@ protected function makeOption($value, $label)
     /**
      * Get whether the given option is selected
      *
-     * @param int|string|null $optionValue
+     * @param string|int $optionValue
      *
      * @return bool
      */
-    protected function isSelectedOption($optionValue): bool
+    protected function isSelectedOption(string|int $optionValue): bool
     {
         $value = $this->getValue();
 
-        if ($optionValue === '') {
-            $optionValue = null;
-        }
-
         if ($this->isMultiple()) {
             if (! is_array($value)) {
                 throw new UnexpectedValueException(
                     'Value must be an array when the `multiple` attribute is set to `true`'
                 );
             }
 
-            return in_array($optionValue, $this->getValue(), ! is_int($optionValue))
-                || ($optionValue === null && in_array('', $this->getValue(), true));
+            return in_array($optionValue, $value, ! is_int($optionValue))
+                || ($optionValue === '' && in_array(null, $value, true));
         }
 
         if (is_array($value)) {
@@ -179,6 +174,10 @@ protected function isSelectedOption($optionValue): bool
             );
         }
 
+        if ($optionValue === '' && $value === null) {
+            return true;
+        }
+
         return is_int($optionValue)
             // The loose comparison is required because PHP casts
             // numeric strings to integers if used as array keys

src/FormElement/SelectOption.php

@@ -8,7 +8,7 @@ class SelectOption extends BaseHtmlElement
 {
     protected $tag = 'option';
 
-    /** @var string|int|null Value of the option */
+    /** @var string|int Value of the option */
     protected $value;
 
     /** @var string Label of the option */
@@ -17,12 +17,12 @@ class SelectOption extends BaseHtmlElement
     /**
      * SelectOption constructor.
      *
-     * @param string|int|null $value
+     * @param string|int $value
      * @param string $label
      */
-    public function __construct($value, string $label)
+    public function __construct(string|int $value, string $label)
     {
-        $this->value = $value === '' ? null : $value;
+        $this->value = $value;
         $this->label = $label;
 
         $this->getAttributes()->registerAttributeCallback('value', [$this, 'getValueAttribute']);
@@ -55,7 +55,7 @@ public function getLabel(): string
     /**
      * Get the value of the option
      *
-     * @return string|int|null
+     * @return string|int
      */
     public function getValue()
     {

src/HtmlElement.php

@@ -13,10 +13,10 @@ class HtmlElement extends BaseHtmlElement
      * Create a new HTML element from the given tag, attributes and content
      *
      * @param string     $tag        The tag for the element
-     * @param Attributes $attributes The HTML attributes for the element
+     * @param ?Attributes $attributes The HTML attributes for the element
      * @param ValidHtml  ...$content The content of the element
      */
-    public function __construct($tag, Attributes $attributes = null, ValidHtml ...$content)
+    public function __construct($tag, ?Attributes $attributes = null, ValidHtml ...$content)
     {
         $this->tag = $tag;
 

tests/DocumentationFormsTest.php

@@ -25,7 +25,7 @@ public function testSelectElement()
         $form->addElement('select', 'customer', [
             'label'   => 'Customer',
             'options' => [
-                null => 'Please choose',
+                ''   => 'Please choose',
                 '1'  => 'The one',
                 '4'  => 'Four',
                 '5'  => 'Hi five',
@@ -57,7 +57,7 @@ public function testSetValues()
         $form->addElement('select', 'customer', [
             'label'   => 'Customer',
             'options' => [
-                null => 'Please choose',
+                ''   => 'Please choose',
                 '1'  => 'The one',
                 '4'  => 'Four',
                 '5'  => 'Hi five',

tests/FormElement/FieldsetElementTest.php

@@ -15,7 +15,7 @@
 class FieldsetElementTest extends TestCase
 {
     private const SELECT_OPTIONS_TO_TEST = [
-        null  => 'Nothing',
+        ''    => 'Nothing',
         1     => 'One',
         'two' => 2,
     ];