improved phpDoc errors

Author: dg

src/Forms/Controls/BaseControl.php

@@ -391,7 +391,7 @@ public function translate(mixed $value, mixed ...$parameters): mixed
 
 	/**
 	 * Adds a validation rule.
-	 * @param  (callable(Control): bool)|string  $validator
+	 * @param  (callable(Control, mixed): bool)|string  $validator
 	 * @return static
 	 */
 	public function addRule(
@@ -406,7 +406,7 @@ public function addRule(
 
 	/**
 	 * Adds a validation condition and returns a new branch.
-	 * @param  (callable(Control): bool)|string|bool  $validator
+	 * @param  (callable(Control, mixed): bool)|string|bool  $validator
 	 */
 	public function addCondition($validator, mixed $value = null): Rules
 	{
@@ -416,7 +416,7 @@ public function addCondition($validator, mixed $value = null): Rules
 
 	/**
 	 * Adds a validation condition based on another control and returns a new branch.
-	 * @param  (callable(Control): bool)|string  $validator
+	 * @param  (callable(Control, mixed): bool)|string  $validator
 	 */
 	public function addConditionOn(Control $control, $validator, mixed $value = null): Rules
 	{

src/Forms/Controls/TextBase.php

@@ -124,7 +124,7 @@ protected function getRenderedValue(): ?string
 
 
 	/**
-	 * @param  (callable(Nette\Forms\Control): bool)|string  $validator
+	 * @param  (callable(Nette\Forms\Control, mixed): bool)|string  $validator
 	 * @return static
 	 */
 	public function addRule(

src/Forms/Controls/TextInput.php

@@ -61,7 +61,7 @@ public function getControl(): Nette\Utils\Html
 
 
 	/**
-	 * @param  (callable(Nette\Forms\Control): bool)|string  $validator
+	 * @param  (callable(Nette\Forms\Control, mixed): bool)|string  $validator
 	 * @return static
 	 */
 	public function addRule(

src/Forms/Controls/UploadControl.php

@@ -125,7 +125,7 @@ public function isOk(): bool
 
 
 	/**
-	 * @param  (callable(Nette\Forms\Control): bool)|string  $validator
+	 * @param  (callable(Nette\Forms\Control, mixed): bool)|string  $validator
 	 * @return static
 	 */
 	public function addRule(

src/Forms/Rule.php

@@ -19,7 +19,7 @@ final class Rule
 {
 	public Control $control;
 
-	/** @var (callable(Control): bool)|string */
+	/** @var (callable(Control, mixed): bool)|string */
 	public mixed $validator;
 	public mixed $arg = null;
 	public bool $isNegative = false;

src/Forms/Rules.php

@@ -65,7 +65,7 @@ public function isRequired(): bool
 
 	/**
 	 * Adds a validation rule for the current control.
-	 * @param  (callable(Control): bool)|string  $validator
+	 * @param  (callable(Control, mixed): bool)|string  $validator
 	 */
 	public function addRule(
 		callable|string $validator,
@@ -95,7 +95,7 @@ public function addRule(
 
 	/**
 	 * Removes a validation rule for the current control.
-	 * @param  (callable(Control): bool)|string  $validator
+	 * @param  (callable(Control, mixed): bool)|string  $validator
 	 */
 	public function removeRule(callable|string $validator): static
 	{
@@ -115,7 +115,7 @@ public function removeRule(callable|string $validator): static
 
 	/**
 	 * Adds a validation condition and returns new branch.
-	 * @param  (callable(Control): bool)|string|bool  $validator
+	 * @param  (callable(Control, mixed): bool)|string|bool  $validator
 	 */
 	public function addCondition(callable|string|bool $validator, mixed $arg = null): static
 	{
@@ -132,7 +132,7 @@ public function addCondition(callable|string|bool $validator, mixed $arg = null)
 
 	/**
 	 * Adds a validation condition on a specified control and returns new branch.
-	 * @param  (callable(Control): bool)|string  $validator
+	 * @param  (callable(Control, mixed): bool)|string  $validator
 	 */
 	public function addConditionOn(Control $control, callable|string $validator, mixed $arg = null): static
 	{
@@ -230,11 +230,11 @@ public function getToggleStates(array $toggles = [], bool $success = true, ?bool
 			if ($rule->branch) {
 				$toggles = $rule->branch->getToggleStates(
 					$toggles,
-					$success && static::validateRule($rule),
+					$success && Rules::validateRule($rule),
 					$rule->validator === Form::Blank ? false : $emptyOptional,
 				);
 			} elseif (!$emptyOptional || $rule->validator === Form::Filled) {
-				$success = $success && static::validateRule($rule);
+				$success = $success && Rules::validateRule($rule);
 			}
 		}
 

tests/types/forms-types.php

@@ -50,3 +50,63 @@ function testFormEvents(Form $form): void
 		assertType(Form::class, $form);
 	};
 }
+
+
+// Issue #350: addRule() must accept validators with a second $arg parameter
+function testAddRuleValidatorOneParam(Form $form): void
+{
+	$form->addText('field')
+		->addRule(fn(Nette\Forms\Control $input): bool => (bool) $input->getValue());
+}
+
+
+function testAddRuleValidatorTwoParams(Form $form): void
+{
+	$form->addInteger('num')
+		->addRule(
+			fn(Nette\Forms\Control $input, mixed $arg): bool => $input->getValue() > $arg,
+			'Must be greater than %d',
+			0,
+		);
+}
+
+
+function testAddRuleStaticCallableWithArg(Form $form): void
+{
+	$form->addInteger('num')
+		->addRule(
+			[CustomValidators::class, 'validateDivisibility'],
+			'Must be divisible by %d',
+			8,
+		);
+}
+
+
+// addCondition() with one-parameter handler
+function testAddConditionOneParam(Form $form): void
+{
+	$form->addText('field')
+		->addCondition(fn(Nette\Forms\Control $input): bool => (bool) $input->getValue())
+			->setRequired();
+}
+
+
+// addCondition() with two-parameter handler
+function testAddConditionTwoParams(Form $form): void
+{
+	$form->addInteger('num')
+		->addCondition(
+			fn(Nette\Forms\Control $input, mixed $arg): bool => $input->getValue() > $arg,
+			0,
+		)
+			->setRequired();
+}
+
+
+class CustomValidators
+{
+	public static function validateDivisibility(Nette\Forms\Control $input, mixed $arg): bool
+	{
+		return $input->getValue() % $arg === 0;
+	}
+}