Fix nulls used as array offsets (deprecated in PHP 8.5)

These were caught by tests and psalm. Also made a few comparisons more explicit, updated types and initializers for some properties.

Author: sad-spirit

HTML/QuickForm2/Container/Group.php

@@ -112,7 +112,7 @@ public function setValue($value)
             foreach ($nameParts as $i => $tokens) {
                 $val = [$k => $v];
                 do {
-                    $token = array_shift($tokens);
+                    $token = array_shift($tokens) ?? '';
                     $numeric = false;
                     if ($token == "") {
                         // special case for a group of checkboxes

HTML/QuickForm2/Element/Select.php

@@ -55,7 +55,7 @@ class HTML_QuickForm2_Element_Select extends HTML_QuickForm2_Element
     *
     * A value is considered possible if it is present as a value attribute of
     * some option and that option is not disabled.
-    * @var array
+    * @var array<string, true>
     */
     protected $possibleValues = [];
 
@@ -171,20 +171,21 @@ protected function getFrozenHtml()
     */
     public function getRawValue()
     {
-        if (!empty($this->attributes['disabled']) || 0 == count($this->values)
+        if (!empty($this->attributes['disabled'])
+            || [] === $this->values
             || ($this->data['intrinsic_validation']
-                && (0 == count($this->optionContainer) || 0 == count($this->possibleValues)))
+                && (0 === count($this->optionContainer) || [] === $this->possibleValues))
         ) {
             return null;
         }
 
         $values = [];
         foreach ($this->values as $value) {
-            if (!$this->data['intrinsic_validation'] || !empty($this->possibleValues[$value])) {
+            if (!$this->data['intrinsic_validation'] || !empty($this->possibleValues[(string)$value])) {
                 $values[] = $value;
             }
         }
-        if (0 == count($values)) {
+        if ([] === $values) {
             return null;
         } elseif (!empty($this->attributes['multiple'])) {
             return $values;

HTML/QuickForm2/Element/Select/Optgroup.php

@@ -45,11 +45,11 @@ class HTML_QuickForm2_Element_Select_Optgroup
    /**
     * Class constructor
     *
-    * @param array        &$values         Reference to values of parent <select> element
-    * @param array        &$possibleValues Reference to possible values of parent <select> element
-    * @param string       $label           'label' attribute for optgroup tag
-    * @param string|array $attributes      Additional attributes for <optgroup> tag
-    *                                      (either as a string or as an associative array)
+    * @param array               &$values         Reference to values of parent <select> element
+    * @param array<string, true> &$possibleValues Reference to possible values of parent <select> element
+    * @param string              $label           'label' attribute for optgroup tag
+    * @param string|array        $attributes      Additional attributes for <optgroup> tag
+    *                                             (either as a string or as an associative array)
     */
     public function __construct(&$values, &$possibleValues, $label, $attributes = null)
     {

HTML/QuickForm2/Element/Select/OptionContainer.php

@@ -62,16 +62,16 @@ class HTML_QuickForm2_Element_Select_OptionContainer extends HTML_Common2
 
    /**
     * Reference to parent <select>'s possible values
-    * @var array
+    * @var array<string, true>
     */
     protected $possibleValues;
 
 
    /**
     * Class constructor
     *
-    * @param array &$values         Reference to values of parent <select> element
-    * @param array &$possibleValues Reference to possible values of parent <select> element
+    * @param array               &$values         Reference to values of parent <select> element
+    * @param array<string, true> &$possibleValues Reference to possible values of parent <select> element
     */
     public function __construct(&$values, &$possibleValues)
     {

HTML/QuickForm2/JavascriptBuilder.php

@@ -41,13 +41,13 @@ class HTML_QuickForm2_JavascriptBuilder
     * Client-side rules
     * @var array<string, string[]>
     */
-    protected $rules = [];
+    protected $rules = ['' => []];
 
    /**
     * Elements' setup code
     * @var array<string, string[]>
     */
-    protected $scripts = [];
+    protected $scripts = ['' => []];
 
    /**
     * Whether to generate a validator object for the form if no rules are present
@@ -56,7 +56,7 @@ class HTML_QuickForm2_JavascriptBuilder
     *
     * @var array<string, bool>
     */
-    protected $forceValidator = [];
+    protected $forceValidator = ['' => false];
 
     /**
     * Javascript libraries
@@ -86,7 +86,7 @@ class HTML_QuickForm2_JavascriptBuilder
     * Current form ID
     * @var string
     */
-    protected $formId;
+    protected $formId = '';
 
 
    /**
@@ -257,7 +257,7 @@ public function getSetupCode($formId = null, $addScriptTags = false)
     {
         $js = '';
         foreach ($this->scripts as $id => $scripts) {
-            if ((null === $formId || $id == $formId) && !empty($scripts)) {
+            if ((null === $formId || $id === $formId) && [] !== $scripts) {
                 $js .= ('' == $js? '': "\n") . implode("\n", $scripts);
             }
         }
@@ -277,8 +277,8 @@ public function getValidator($formId = null, $addScriptTags = false)
     {
         $js = '';
         foreach ($this->rules as $id => $rules) {
-            if ((null === $formId || $id == $formId)
-                && (!empty($rules) || !empty($this->forceValidator[$id]))
+            if ((null === $formId || $id === $formId)
+                && ([] !== $rules || $this->forceValidator[$id])
             ) {
                 $js .= ('' == $js ? '' : "\n")
                        . "new qf.Validator(document.getElementById('{$id}'), [\n"

HTML/QuickForm2/MessageProvider/Default.php

@@ -272,11 +272,11 @@ public function get(array $messageId, $langId = null)
             $langId = HTML_Common2::getOption(HTML_QuickForm2_Node::OPTION_LANGUAGE);
         }
         $key = array_shift($messageId);
-        if (empty($this->messages[$key]) || empty($this->messages[$key][$langId])) {
+        if (null === $key || empty($this->messages[$key]) || empty($this->messages[$key][$langId])) {
             return null;
         }
         $message = $this->messages[$key][$langId];
-        while (!empty($messageId)) {
+        while ([] !== $messageId) {
             $key = array_shift($messageId);
             if (empty($message[$key])) {
                 return null;

tests/QuickForm2/Element/InputCheckboxTest.php

@@ -22,6 +22,7 @@
 /** Sets up includes */
 require_once dirname(dirname(__DIR__)) . '/TestHelper.php';
 
+use PHPUnit\Framework\Attributes\DoesNotPerformAssertions;
 use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
 /**
@@ -90,6 +91,7 @@ public function testRequest16806()
     * @see http://pear.php.net/bugs/bug.php?id=16816
     * @doesNotPerformAssertions
     */
+    #[DoesNotPerformAssertions]
     public function testBug16816()
     {
         $box = new HTML_QuickForm2_Element_InputCheckbox(