PHP 7.1: short list syntax, ?? operator, nullable types

sad-spirit · sad-spirit · commit 90b72f681a0a · 2025-04-13T15:12:20.000+03:00
diff --git a/HTML/QuickForm2.php b/HTML/QuickForm2.php
@@ -75,7 +75,7 @@ public function __construct(
         );
         parent::setId(empty($id) ? null : $id);
         if (!isset($this->attributes['action'])) {
-            $this->attributes['action'] = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '';
+            $this->attributes['action'] = $_SERVER['PHP_SELF'] ?? '';
         }
         if ($trackSubmit && isset($_REQUEST['_qf__' . $id]) ||
             !$trackSubmit && ('get' == $method && !empty($_GET) ||
@@ -98,7 +98,7 @@ protected function onAttributeChange($name, $value = null)
         );
     }
 
-    protected function setContainer(HTML_QuickForm2_Container $container = null)
+    protected function setContainer(?HTML_QuickForm2_Container $container = null)
     {
         throw new HTML_QuickForm2_Exception('Form cannot be added to container');
     }
diff --git a/HTML/QuickForm2/Container.php b/HTML/QuickForm2/Container.php
@@ -201,7 +201,7 @@ public static function arrayMerge($a, $b)
             if (!is_array($v) || isset($a[$k]) && !is_array($a[$k])) {
                 $a[$k] = $v;
             } else {
-                $a[$k] = self::arrayMerge(isset($a[$k])? $a[$k]: [], $v);
+                $a[$k] = self::arrayMerge($a[$k] ?? [], $v);
             }
         }
         return $a;
@@ -342,12 +342,12 @@ public function getElementsByName($name)
     *
     * If the reference object is not given, the element will be appended.
     *
-    * @param HTML_QuickForm2_Node $element   Element to insert
-    * @param HTML_QuickForm2_Node $reference Reference to insert before
+    * @param HTML_QuickForm2_Node  $element   Element to insert
+    * @param ?HTML_QuickForm2_Node $reference Reference to insert before
     *
     * @return   HTML_QuickForm2_Node     Inserted element
     */
-    public function insertBefore(HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null)
+    public function insertBefore(HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null)
     {
         if (null === $reference) {
             return $this->appendChild($element);
@@ -465,9 +465,9 @@ public function __call($m, $a)
         if (preg_match('/^(add)([a-zA-Z0-9_]+)$/', $m, $match)) {
             if ($match[1] == 'add') {
                 $type = strtolower($match[2]);
-                $name = isset($a[0]) ? $a[0] : null;
-                $attr = isset($a[1]) ? $a[1] : null;
-                $data = isset($a[2]) ? $a[2] : [];
+                $name = $a[0] ?? null;
+                $attr = $a[1] ?? null;
+                $data = $a[2] ?? [];
                 return $this->addElement($type, $name, $attr, $data);
             }
         }
diff --git a/HTML/QuickForm2/Container/Group.php b/HTML/QuickForm2/Container/Group.php
@@ -70,7 +70,7 @@ protected function getChildValues($filtered = false)
             return $value;
 
         } elseif (!strpos($this->getName(), '[')) {
-            return isset($value[$this->getName()])? $value[$this->getName()]: null;
+            return $value[$this->getName()] ?? null;
 
         } else {
             $tokens   =  explode('[', str_replace(']', '', $this->getName()));
@@ -163,7 +163,7 @@ public function setValue($value)
             }
         }
         foreach (array_keys($nameParts) as $i) {
-            $this->elements[$i]->setValue(isset($groupValues[$i]) ? $groupValues[$i] : null);
+            $this->elements[$i]->setValue($groupValues[$i] ?? null);
         }
 
         return $this;
@@ -281,11 +281,11 @@ public function removeChild(HTML_QuickForm2_Node $element)
     * If the reference object is not given, the element will be appended.
     *
     * @param HTML_QuickForm2_Node $element   Element to insert
-    * @param HTML_QuickForm2_Node $reference Reference to insert before
+    * @param ?HTML_QuickForm2_Node $reference Reference to insert before
     *
     * @return   HTML_QuickForm2_Node     Inserted element
     */
-    public function insertBefore(HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null)
+    public function insertBefore(HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null)
     {
         if (null === $reference) {
             return $this->appendChild($element);
@@ -314,7 +314,7 @@ public function setSeparator($separator)
     */
     public function getSeparator()
     {
-        return isset($this->data['separator'])? $this->data['separator']: null;
+        return $this->data['separator'] ?? null;
     }
 
    /**
diff --git a/HTML/QuickForm2/Container/Repeat.php b/HTML/QuickForm2/Container/Repeat.php
@@ -208,12 +208,12 @@ public function removeChild(HTML_QuickForm2_Node $element)
      * Elements are kept in the prototype rather than directly in repeat
      *
      * @param HTML_QuickForm2_Node $element   Element to insert
-     * @param HTML_QuickForm2_Node $reference Reference to insert before
+     * @param ?HTML_QuickForm2_Node $reference Reference to insert before
      *
      * @return   HTML_QuickForm2_Node     Inserted element
      */
     public function insertBefore(
-        HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null
+        HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null
     ) {
         return $this->getPrototype()->insertBefore($element, $reference);
     }
diff --git a/HTML/QuickForm2/Controller.php b/HTML/QuickForm2/Controller.php
@@ -247,7 +247,7 @@ public function getActionName()
     */
     public function run()
     {
-        list($page, $action) = $this->getActionName();
+        [$page, $action] = $this->getActionName();
         return $this->pages[$page]->handle($action);
     }
 
@@ -372,12 +372,12 @@ public function nextPage(HTML_QuickForm2_Controller_Page $reference)
    /**
     * Checks whether the pages of the controller are valid
     *
-    * @param HTML_QuickForm2_Controller_Page $reference If given, check only
+    * @param ?HTML_QuickForm2_Controller_Page $reference If given, check only
     *                               the pages before (not including) that page
     *
     * @return bool
     */
-    public function isValid(HTML_QuickForm2_Controller_Page $reference = null)
+    public function isValid(?HTML_QuickForm2_Controller_Page $reference = null)
     {
         $container = $this->getSessionContainer();
         foreach ($this->pages as $id => $page) {
diff --git a/HTML/QuickForm2/Controller/Action/Display.php b/HTML/QuickForm2/Controller/Action/Display.php
@@ -44,10 +44,10 @@ class HTML_QuickForm2_Controller_Action_Display
 {
     public function perform(HTML_QuickForm2_Controller_Page $page, $name)
     {
-        $validate        = false;
-        $datasources     = $page->getForm()->getDataSources();
-        $container       = $page->getController()->getSessionContainer();
-        list(, $oldName) = $page->getController()->getActionName();
+        $validate    = false;
+        $datasources = $page->getForm()->getDataSources();
+        $container   = $page->getController()->getSessionContainer();
+        [, $oldName] = $page->getController()->getActionName();
         // Check the original action name, we need to do additional processing
         // if it was 'display'
         if ('display' == $oldName) {
diff --git a/HTML/QuickForm2/Controller/Action/Jump.php b/HTML/QuickForm2/Controller/Action/Jump.php
@@ -146,20 +146,20 @@ protected function resolveRelativeURL($url)
             }
             $host = $scheme . '//' . preg_replace('/:\d+$/', '', $host);
             $port = isset($_SERVER['SERVER_PORT']) ? (int)$_SERVER['SERVER_PORT'] : null;
-            $base = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+            $base = $_SERVER['REQUEST_URI'] ?? '';
             if (null !== $port && $port !== ($https ? 443 : 80)) {
                 $host .= ':' . $port;
             }
             if ('' == $url) {
                 return $host . $base;
 
             } elseif ('/' == $url[0]) {
-                list($actPath, $actQuery) = self::splitUri($url);
+                [$actPath, $actQuery] = self::splitUri($url);
                 return $host . self::normalizePath($actPath) . $actQuery;
 
             } else {
-                list($basePath, $baseQuery) = self::splitUri($base);
-                list($actPath, $actQuery)   = self::splitUri($url);
+                [$basePath,]          = self::splitUri($base);
+                [$actPath, $actQuery] = self::splitUri($url);
                 if ('' == $actPath) {
                     return $host . $basePath . $actQuery;
                 } else {
diff --git a/HTML/QuickForm2/Element/Hierselect.php b/HTML/QuickForm2/Element/Hierselect.php
@@ -117,7 +117,7 @@ public function __construct($name = null, $attributes = null, array $data = [])
         if (!empty($data['size'])) {
             $this->size = $data['size'];
         }
-        $options = isset($data['options'])? $data['options']: [];
+        $options = $data['options'] ?? [];
         unset($data['options'], $data['size']);
         parent::__construct($name, $attributes, $data);
         $this->loadOptions($options);
diff --git a/HTML/QuickForm2/Element/Select.php b/HTML/QuickForm2/Element/Select.php
@@ -91,7 +91,7 @@ class HTML_QuickForm2_Element_Select extends HTML_QuickForm2_Element
     */
     public function __construct($name = null, $attributes = null, array $data = [])
     {
-        $options = isset($data['options'])? $data['options']: [];
+        $options = $data['options'] ?? [];
         unset($data['options']);
         parent::__construct($name, $attributes, $data);
         $this->loadOptions($options);
diff --git a/HTML/QuickForm2/Factory.php b/HTML/QuickForm2/Factory.php
@@ -151,7 +151,7 @@ public static function createElement(
             throw new HTML_QuickForm2_InvalidArgumentException("Element type '$type' is not known");
         }
         /** @var class-string<HTML_QuickForm2_Node> $className */
-        list($className, $includeFile) = self::$elementTypes[$type];
+        [$className, $includeFile] = self::$elementTypes[$type];
         HTML_QuickForm2_Loader::loadClass($className, $includeFile, true);
         return new $className($name, $attributes, $data);
     }
@@ -206,7 +206,7 @@ public static function createRule(
         if (!isset(self::$registeredRules[$type])) {
             throw new HTML_QuickForm2_InvalidArgumentException("Rule '$type' is not known");
         }
-        list($className, $includeFile, $globalConfig) = self::$registeredRules[$type];
+        [$className, $includeFile, $globalConfig] = self::$registeredRules[$type];
         HTML_QuickForm2_Loader::loadClass($className, $includeFile, true);
         if (null !== $globalConfig) {
             $config = call_user_func(
diff --git a/HTML/QuickForm2/Node.php b/HTML/QuickForm2/Node.php
@@ -296,7 +296,7 @@ abstract public function getType();
     */
     public function getName()
     {
-        return isset($this->attributes['name'])? $this->attributes['name']: null;
+        return $this->attributes['name'] ?? null;
     }
 
 
@@ -317,7 +317,7 @@ abstract public function setName($name);
     */
     public function getId()
     {
-        return isset($this->attributes['id'])? $this->attributes['id']: null;
+        return $this->attributes['id'] ?? null;
     }
 
 
@@ -452,14 +452,14 @@ public function persistentFreeze($persistent = null)
    /**
     * Adds the link to the element containing current
     *
-    * @param HTML_QuickForm2_Container $container Element containing
+    * @param ?HTML_QuickForm2_Container $container Element containing
     *                           the current one, null if the link should
     *                           really be removed (if removing from container)
     *
     * @throws   HTML_QuickForm2_InvalidArgumentException   If trying to set a
     *                               child of an element as its container
     */
-    protected function setContainer(HTML_QuickForm2_Container $container = null)
+    protected function setContainer(?HTML_QuickForm2_Container $container = null)
     {
         if (null !== $container) {
             $check = $container;
@@ -756,7 +756,7 @@ public function addRecursiveFilter($callback, array $options = [])
     */
     protected static function applyFilter(&$value, $key, $filter)
     {
-        list($callback, $options) = $filter;
+        [$callback, $options] = $filter;
         array_unshift($options, $value);
         $value = call_user_func_array($callback, $options);
     }
diff --git a/HTML/QuickForm2/Renderer.php b/HTML/QuickForm2/Renderer.php
@@ -291,11 +291,11 @@ public function getJavascriptBuilder()
     * You may want to reuse the same builder object if outputting several
     * forms on one page.
     *
-    * @param    HTML_QuickForm2_JavascriptBuilder $builder
+    * @param    ?HTML_QuickForm2_JavascriptBuilder $builder
     *
     * @return $this
     */
-    public function setJavascriptBuilder(HTML_QuickForm2_JavascriptBuilder $builder = null)
+    public function setJavascriptBuilder(?HTML_QuickForm2_JavascriptBuilder $builder = null)
     {
         $this->jsBuilder = $builder;
         return $this;
diff --git a/HTML/QuickForm2/Renderer/Callback.php b/HTML/QuickForm2/Renderer/Callback.php
@@ -699,7 +699,7 @@ public function reset()
     */
     public function __toString()
     {
-        return (isset($this->html[0][0])? $this->html[0][0]: '');
+        return $this->html[0][0] ?? '';
     }
 
    /**
diff --git a/HTML/QuickForm2/Renderer/Default.php b/HTML/QuickForm2/Renderer/Default.php
@@ -256,7 +256,7 @@ public function reset()
     */
     public function __toString()
     {
-        return (isset($this->html[0][0])? $this->html[0][0]: '') .
+        return ($this->html[0][0] ?? '') .
                $this->hiddenHtml;
     }
 
diff --git a/HTML/QuickForm2/Renderer/Proxy.php b/HTML/QuickForm2/Renderer/Proxy.php
@@ -160,7 +160,7 @@ public function methodExists($name)
     protected function updatePlugins()
     {
         for ($i = count($this->_plugins); $i < count($this->_pluginClasses); $i++) {
-            list($className, $includeFile) = $this->_pluginClasses[$i];
+            [$className, $includeFile] = $this->_pluginClasses[$i];
             HTML_QuickForm2_Loader::loadClass($className, $includeFile, true);
 
             $methods    = [];
@@ -210,7 +210,7 @@ public function getJavascriptBuilder()
         return $this->_renderer->getJavascriptBuilder();
     }
 
-    public function setJavascriptBuilder(HTML_QuickForm2_JavascriptBuilder $builder = null)
+    public function setJavascriptBuilder(?HTML_QuickForm2_JavascriptBuilder $builder = null)
     {
         $this->_renderer->setJavascriptBuilder($builder);
         return $this;
diff --git a/HTML/QuickForm2/Rule/Compare.php b/HTML/QuickForm2/Rule/Compare.php
@@ -145,7 +145,7 @@ public static function mergeConfig($localConfig, $globalConfig)
             $config = self::toCanonicalForm($globalConfig, 'operator');
         }
         if (null !== $localConfig && [] !== $localConfig) {
-            $config = (isset($config)? $config: [])
+            $config = ($config ?? [])
                       + self::toCanonicalForm($localConfig);
         }
         return $config;
diff --git a/HTML/QuickForm2/Rule/Length.php b/HTML/QuickForm2/Rule/Length.php
@@ -207,7 +207,7 @@ public function setConfig($config)
 
         if (!empty($config['min']) && !empty($config['max'])) {
             if ($config['min'] > $config['max']) {
-                list($config['min'], $config['max']) = [$config['max'], $config['min']];
+                [$config['min'], $config['max']] = [$config['max'], $config['min']];
             } elseif ($config['min'] == $config['max']) {
                 $config = $config['min'];
             }
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "docs":   "https://pear.php.net/manual/en/package.html.html-quickform2.php"
     },
     "require": {
-        "php":                 ">=5.6.0",
+        "php":                 ">=7.1",
         "pear/pear_exception": "^1.0",
         "pear/html_common2":   "^2.3.1"
     },

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct(`
`75`	`75`	`);`
`76`	`76`	`parent::setId(empty($id) ? null : $id);`
`77`	`77`	`if (!isset($this->attributes['action'])) {`
`78`		`- $this->attributes['action'] = isset($_SERVER['PHP_SELF']) ? $_SERVER['PHP_SELF'] : '';`
	`78`	`+ $this->attributes['action'] = $_SERVER['PHP_SELF'] ?? '';`
`79`	`79`	`}`
`80`	`80`	`if ($trackSubmit && isset($_REQUEST['_qf__' . $id]) \|\|`
`81`	`81`	`!$trackSubmit && ('get' == $method && !empty($_GET) \|\|`
`@@ -98,7 +98,7 @@ protected function onAttributeChange($name, $value = null)`
`98`	`98`	`);`
`99`	`99`	`}`
`100`	`100`
`101`		`- protected function setContainer(HTML_QuickForm2_Container $container = null)`
	`101`	`+ protected function setContainer(?HTML_QuickForm2_Container $container = null)`
`102`	`102`	`{`
`103`	`103`	`throw new HTML_QuickForm2_Exception('Form cannot be added to container');`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ public static function arrayMerge($a, $b)`
`201`	`201`	`if (!is_array($v) \|\| isset($a[$k]) && !is_array($a[$k])) {`
`202`	`202`	`$a[$k] = $v;`
`203`	`203`	`} else {`
`204`		`- $a[$k] = self::arrayMerge(isset($a[$k])? $a[$k]: [], $v);`
	`204`	`+ $a[$k] = self::arrayMerge($a[$k] ?? [], $v);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`return $a;`
`@@ -342,12 +342,12 @@ public function getElementsByName($name)`
`342`	`342`	`*`
`343`	`343`	`* If the reference object is not given, the element will be appended.`
`344`	`344`	`*`
`345`		`- * @param HTML_QuickForm2_Node $element Element to insert`
`346`		`- * @param HTML_QuickForm2_Node $reference Reference to insert before`
	`345`	`+ * @param HTML_QuickForm2_Node $element Element to insert`
	`346`	`+ * @param ?HTML_QuickForm2_Node $reference Reference to insert before`
`347`	`347`	`*`
`348`	`348`	`* @return HTML_QuickForm2_Node Inserted element`
`349`	`349`	`*/`
`350`		`- public function insertBefore(HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null)`
	`350`	`+ public function insertBefore(HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null)`
`351`	`351`	`{`
`352`	`352`	`if (null === $reference) {`
`353`	`353`	`return $this->appendChild($element);`
`@@ -465,9 +465,9 @@ public function __call($m, $a)`
`465`	`465`	`if (preg_match('/^(add)([a-zA-Z0-9_]+)$/', $m, $match)) {`
`466`	`466`	`if ($match[1] == 'add') {`
`467`	`467`	`$type = strtolower($match[2]);`
`468`		`- $name = isset($a[0]) ? $a[0] : null;`
`469`		`- $attr = isset($a[1]) ? $a[1] : null;`
`470`		`- $data = isset($a[2]) ? $a[2] : [];`
	`468`	`+ $name = $a[0] ?? null;`
	`469`	`+ $attr = $a[1] ?? null;`
	`470`	`+ $data = $a[2] ?? [];`
`471`	`471`	`return $this->addElement($type, $name, $attr, $data);`
`472`	`472`	`}`
`473`	`473`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ protected function getChildValues($filtered = false)`
`70`	`70`	`return $value;`
`71`	`71`
`72`	`72`	`} elseif (!strpos($this->getName(), '[')) {`
`73`		`- return isset($value[$this->getName()])? $value[$this->getName()]: null;`
	`73`	`+ return $value[$this->getName()] ?? null;`
`74`	`74`
`75`	`75`	`} else {`
`76`	`76`	`$tokens = explode('[', str_replace(']', '', $this->getName()));`
`@@ -163,7 +163,7 @@ public function setValue($value)`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`foreach (array_keys($nameParts) as $i) {`
`166`		`- $this->elements[$i]->setValue(isset($groupValues[$i]) ? $groupValues[$i] : null);`
	`166`	`+ $this->elements[$i]->setValue($groupValues[$i] ?? null);`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`return $this;`
`@@ -281,11 +281,11 @@ public function removeChild(HTML_QuickForm2_Node $element)`
`281`	`281`	`* If the reference object is not given, the element will be appended.`
`282`	`282`	`*`
`283`	`283`	`* @param HTML_QuickForm2_Node $element Element to insert`
`284`		`- * @param HTML_QuickForm2_Node $reference Reference to insert before`
	`284`	`+ * @param ?HTML_QuickForm2_Node $reference Reference to insert before`
`285`	`285`	`*`
`286`	`286`	`* @return HTML_QuickForm2_Node Inserted element`
`287`	`287`	`*/`
`288`		`- public function insertBefore(HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null)`
	`288`	`+ public function insertBefore(HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null)`
`289`	`289`	`{`
`290`	`290`	`if (null === $reference) {`
`291`	`291`	`return $this->appendChild($element);`
`@@ -314,7 +314,7 @@ public function setSeparator($separator)`
`314`	`314`	`*/`
`315`	`315`	`public function getSeparator()`
`316`	`316`	`{`
`317`		`- return isset($this->data['separator'])? $this->data['separator']: null;`
	`317`	`+ return $this->data['separator'] ?? null;`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -208,12 +208,12 @@ public function removeChild(HTML_QuickForm2_Node $element)`
`208`	`208`	`* Elements are kept in the prototype rather than directly in repeat`
`209`	`209`	`*`
`210`	`210`	`* @param HTML_QuickForm2_Node $element Element to insert`
`211`		`- * @param HTML_QuickForm2_Node $reference Reference to insert before`
	`211`	`+ * @param ?HTML_QuickForm2_Node $reference Reference to insert before`
`212`	`212`	`*`
`213`	`213`	`* @return HTML_QuickForm2_Node Inserted element`
`214`	`214`	`*/`
`215`	`215`	`public function insertBefore(`
`216`		`- HTML_QuickForm2_Node $element, HTML_QuickForm2_Node $reference = null`
	`216`	`+ HTML_QuickForm2_Node $element, ?HTML_QuickForm2_Node $reference = null`
`217`	`217`	`) {`
`218`	`218`	`return $this->getPrototype()->insertBefore($element, $reference);`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public function getActionName()`
`247`	`247`	`*/`
`248`	`248`	`public function run()`
`249`	`249`	`{`
`250`		`- list($page, $action) = $this->getActionName();`
	`250`	`+ [$page, $action] = $this->getActionName();`
`251`	`251`	`return $this->pages[$page]->handle($action);`
`252`	`252`	`}`
`253`	`253`
`@@ -372,12 +372,12 @@ public function nextPage(HTML_QuickForm2_Controller_Page $reference)`
`372`	`372`	`/**`
`373`	`373`	`* Checks whether the pages of the controller are valid`
`374`	`374`	`*`
`375`		`- * @param HTML_QuickForm2_Controller_Page $reference If given, check only`
	`375`	`+ * @param ?HTML_QuickForm2_Controller_Page $reference If given, check only`
`376`	`376`	`* the pages before (not including) that page`
`377`	`377`	`*`
`378`	`378`	`* @return bool`
`379`	`379`	`*/`
`380`		`- public function isValid(HTML_QuickForm2_Controller_Page $reference = null)`
	`380`	`+ public function isValid(?HTML_QuickForm2_Controller_Page $reference = null)`
`381`	`381`	`{`
`382`	`382`	`$container = $this->getSessionContainer();`
`383`	`383`	`foreach ($this->pages as $id => $page) {`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function __construct($name = null, $attributes = null, array $data = [])`
`117`	`117`	`if (!empty($data['size'])) {`
`118`	`118`	`$this->size = $data['size'];`
`119`	`119`	`}`
`120`		`- $options = isset($data['options'])? $data['options']: [];`
	`120`	`+ $options = $data['options'] ?? [];`
`121`	`121`	`unset($data['options'], $data['size']);`
`122`	`122`	`parent::__construct($name, $attributes, $data);`
`123`	`123`	`$this->loadOptions($options);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class HTML_QuickForm2_Element_Select extends HTML_QuickForm2_Element`
`91`	`91`	`*/`
`92`	`92`	`public function __construct($name = null, $attributes = null, array $data = [])`
`93`	`93`	`{`
`94`		`- $options = isset($data['options'])? $data['options']: [];`
	`94`	`+ $options = $data['options'] ?? [];`
`95`	`95`	`unset($data['options']);`
`96`	`96`	`parent::__construct($name, $attributes, $data);`
`97`	`97`	`$this->loadOptions($options);`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public static function createElement(`
`151`	`151`	`throw new HTML_QuickForm2_InvalidArgumentException("Element type '$type' is not known");`
`152`	`152`	`}`
`153`	`153`	`/** @var class-string<HTML_QuickForm2_Node> $className */`
`154`		`- list($className, $includeFile) = self::$elementTypes[$type];`
	`154`	`+ [$className, $includeFile] = self::$elementTypes[$type];`
`155`	`155`	`HTML_QuickForm2_Loader::loadClass($className, $includeFile, true);`
`156`	`156`	`return new $className($name, $attributes, $data);`
`157`	`157`	`}`
`@@ -206,7 +206,7 @@ public static function createRule(`
`206`	`206`	`if (!isset(self::$registeredRules[$type])) {`
`207`	`207`	`throw new HTML_QuickForm2_InvalidArgumentException("Rule '$type' is not known");`
`208`	`208`	`}`
`209`		`- list($className, $includeFile, $globalConfig) = self::$registeredRules[$type];`
	`209`	`+ [$className, $includeFile, $globalConfig] = self::$registeredRules[$type];`
`210`	`210`	`HTML_QuickForm2_Loader::loadClass($className, $includeFile, true);`
`211`	`211`	`if (null !== $globalConfig) {`
`212`	`212`	`$config = call_user_func(`