support for PHP 8.5

Author: dg

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3', '8.4']
+                php: ['8.1', '8.2', '8.3', '8.4', '8.5']
 
             fail-fast: false
 

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": "8.1 - 8.4",
+		"php": "8.1 - 8.5",
 		"nette/component-model": "^3.1",
 		"nette/http": "^3.3",
 		"nette/utils": "^4.0.4"

readme.md

@@ -44,7 +44,7 @@ The recommended way to install is via Composer:
 composer require nette/forms
 ```
 
-It requires PHP version 8.1 and supports PHP up to 8.4.
+It requires PHP version 8.1 and supports PHP up to 8.5.
 
 
 Client-side support can be installed with npm or yarn:

src/Forms/Controls/ChoiceControl.php

@@ -69,7 +69,8 @@ public function setValue($value)
 	 */
 	public function getValue(): mixed
 	{
-		return array_key_exists($this->value, $this->items)
+		return $this->value !== null
+			&& array_key_exists($this->value, $this->items)
 			&& !isset($this->disabled[$this->value])
 			? $this->value
 			: null;

src/Forms/Controls/SelectBox.php

@@ -109,7 +109,7 @@ public function getControl(): Nette\Utils\Html
 			if ($this->isRequired()) {
 				$attrs['hidden:'][$promptKey] = $attrs['disabled:'][$promptKey] = true;
 				// disabled & selected for Safari, hidden for other browsers
-				$selected = array_key_exists($this->value, $this->getItems()) ? $this->value : $promptKey;
+				$selected = $this->value !== null && array_key_exists($this->value, $this->getItems()) ? $this->value : $promptKey;
 			}
 		}