support for nette/forms 3.2

composer.json

@@ -18,7 +18,7 @@
   ],
   "require": {
     "php": ">=8.1",
-    "nette/forms": "3.1.15",
+    "nette/forms": "3.2.0",
     "nette/application": "^3.0"
   },
   "require-dev": {

src/BootstrapForm.php

@@ -57,7 +57,7 @@ public function __construct($container = null)
 
 		$prototype = Html::el('form', [
 			'action' => '',
-			'method' => self::POST,
+			'method' => self::Post,
 			'class' => [],
 		]);
 		$this->elementPrototype = $prototype;
@@ -98,10 +98,7 @@ public function getRenderer(): FormRenderer
 		return $renderer;
 	}
 
-	/**
-	 * @return static
-	 */
-	public function setRenderer(?FormRenderer $renderer = null)
+	public function setRenderer(?FormRenderer $renderer = null): static
 	{
 		if (!$renderer instanceof BootstrapRenderer) {
 			throw new InvalidArgumentException('Renderer must be a BootstrapRenderer class');

src/BootstrapRenderer.php

@@ -375,7 +375,7 @@ public function renderBody(): string
 
 			//region getting container
 
-			$container = $group->getOption(RendererOptions::CONTAINER, null);
+			$container = $group->getOption(RendererOptions::CONTAINER);
 			if (is_string($container)) {
 				$container = $this->configElem(Cnf::GROUP, Html::el($container));
 			} elseif ($container instanceof Html) {
@@ -462,7 +462,7 @@ public function renderControls($parent): string
 
 		// note that these are NOT form groups, these are groups specified to group
 		foreach ($parent->getControls() as $control) {
-			if ($control->getOption(RendererOptions::_RENDERED, false)) {
+			if ($control->getOption(RendererOptions::_RENDERED)) {
 				continue;
 			}
 

src/Grid/BootstrapRow.php

@@ -197,12 +197,11 @@ public function setParent(?IContainer $parent = null, ?string $name = null): sta
 	/**
 	 * Gets previously set option
 	 *
-	 * @param mixed|null $default
 	 * @return mixed|null
 	 */
-	public function getOption(string $option, $default = null)
+	public function getOption(string $option)
 	{
-		return $this->options[$option] ?? $default;
+		return $this->options[$option];
 	}
 
 	/**

src/Inputs/ButtonInput.php

@@ -35,7 +35,7 @@ public function getControl($content = null): Html
 		$btn = parent::getControl($content);
 		$btn->setName('button');
 		$this->addBtnClass($btn);
-		$btn->setHtml($content ?? (string) $this->caption); //@phpstan-ignore-line
+		$btn->setHtml($content ?? (string) $this->caption);
 		$btn->removeAttribute('value');
 
 		return $btn;

src/Inputs/CheckboxInput.php

@@ -24,22 +24,15 @@ class CheckboxInput extends Checkbox implements IValidationInput
 
 	/**
 	 * set to true so that checkboxes by defaults are alligned on right with input fields, you can also set
-	 *
-	 * @var bool
 	 */
-	public static $defaultAllignWithInputControls = false;
+	public static bool $defaultAllignWithInputControls = false;
 
 	/**
 	 * set to true to allign checkbox to right with all other input controls
-	 *
-	 * @var bool
 	 */
-	public $allignWithInputControls;
+	public bool $allignWithInputControls;
 
-	/**
-	 * @param  string|object  $label
-	 */
-	public function __construct($label = null)
+	public function __construct(string|\Stringable|null $label = null)
 	{
 		$this->allignWithInputControls = static::$defaultAllignWithInputControls;
 
@@ -54,7 +47,7 @@ public function __construct($label = null)
 	 */
 	public static function makeCheckbox(
 		string $name,
-		string $htmlId,
+		bool|null|string $htmlId,
 		$caption = null,
 		bool $checked = false,
 		$value = false,

src/Inputs/DateInput.php

@@ -70,7 +70,7 @@ public function cleanErrors(): void
 	/**
 	 * @inheritdoc
 	 */
-	public function getValue()
+	public function getValue(): mixed
 	{
 		$val = parent::getValue();
 

src/Inputs/SelectInput.php

@@ -10,10 +10,6 @@
 use Nette\Forms\Controls\SelectBox;
 use Nette\Utils\Html;
 
-/**
- * Class SelectInput.
- * Single select.
- */
 class SelectInput extends SelectBox implements IValidationInput
 {
 

src/Inputs/TextInput.php

@@ -97,10 +97,7 @@ public function setPlaceholder(string $placeholder)
 		return $this;
 	}
 
-	/**
-	 * @param object|string $caption
-	 */
-	public function getLabel($caption = null): Html
+	public function getLabel(string|\Stringable|null $caption = null): Html
 	{
 		/** @var Html $label */
 		$label = parent::getLabel($caption);

src/Traits/BootstrapContainerTrait.php

@@ -188,7 +188,7 @@ public function addEmail(string $name, $label = null): NetteTextInput
 	{
 		return $this->addText($name, $label)
 			->setNullable(BootstrapForm::$allwaysUseNullable)
-			->addRule(Form::EMAIL);
+			->addRule(Form::Email);
 	}
 
 	/**
@@ -207,7 +207,7 @@ public function addInteger(string $name, $label = null): NetteTextInput
 	{
 		return $this->addText($name, $label)
 			->setNullable(BootstrapForm::$allwaysUseNullable)
-			->addRule(Form::INTEGER);
+			->addRule(Form::Integer);
 	}
 
 	/**

src/Traits/InputPromptTrait.php

@@ -14,11 +14,8 @@ trait InputPromptTrait
 
 	/**
 	 * Sets the first unselectable item on list. Its value is null.
-	 *
-	 * @param string|null $prompt
-	 * @return static
 	 */
-	public function setPrompt($prompt)
+	public function setPrompt(string|\Stringable|false $prompt): static
 	{
 		if (empty($prompt)) {
 			return $this;

tests/Inputs/DateTimeInputTest.php

@@ -45,6 +45,8 @@ public function testValidationWithValueFromDatabase(): void
 		$form = new BootstrapForm();
 		$dt = $form->addBootstrapDateTime('datetime', 'Date and time');
 		$dt->setValue('2020-05-05 20:00:00');
+		$submit = $form->addSubmit('send');
+		$form->setSubmittedBy($submit);
 		$form->validate();
 		$this->assertEquals(new DateTime('2020-05-05 20:00:00'), $dt->getValue());
 	}
@@ -54,6 +56,8 @@ public function testValidationWithCorrectFormat(): void
 		$form = new BootstrapForm();
 		$dt = $form->addBootstrapDateTime('datetime', 'Date and time');
 		$dt->setValue((new DateTime('2020-05-01'))->format($dt->format));
+		$submit = $form->addSubmit('send');
+		$form->setSubmittedBy($submit);
 		$form->validate();
 		$this->assertEquals(new DateTime('2020-05-01'), $dt->getValue());
 	}