added missing native types

Author: dg

src/Bridges/FormsLatte/Runtime.php

@@ -83,7 +83,7 @@ public static function renderFormEnd(Form $form, bool $withTags = true): string
 	 * Resolves a control or container from the current form on the stack.
 	 * @param object{formsStack: Form[]}  $global
 	 */
-	public static function item($item, $global): object
+	public static function item(object|string|int $item, object $global): object
 	{
 		if (is_object($item)) {
 			return $item;

src/Forms/Container.php

@@ -184,7 +184,7 @@ public function getUntrustedValues(string|object|null $returnType = null, ?array
 	 * @return object|mixed[]
 	 * @deprecated use getUntrustedValues()
 	 */
-	public function getUnsafeValues($returnType, ?array $controls = null)
+	public function getUnsafeValues(string|object|null $returnType, ?array $controls = null): object|array
 	{
 		return $this->getUntrustedValues($returnType, $controls);
 	}
@@ -410,7 +410,7 @@ public function addFloat(string $name, string|Stringable|null $label = null): Co
 	/**
 	 * Adds input for date selection.
 	 */
-	public function addDate(string $name, string|object|null $label = null): Controls\DateTimeControl
+	public function addDate(string $name, string|Stringable|null $label = null): Controls\DateTimeControl
 	{
 		return $this[$name] = new Controls\DateTimeControl($label, Controls\DateTimeControl::TypeDate);
 	}
@@ -421,7 +421,7 @@ public function addDate(string $name, string|object|null $label = null): Control
 	 */
 	public function addTime(
 		string $name,
-		string|object|null $label = null,
+		string|Stringable|null $label = null,
 		bool $withSeconds = false,
 	): Controls\DateTimeControl
 	{
@@ -434,7 +434,7 @@ public function addTime(
 	 */
 	public function addDateTime(
 		string $name,
-		string|object|null $label = null,
+		string|Stringable|null $label = null,
 		bool $withSeconds = false,
 	): Controls\DateTimeControl
 	{
@@ -463,7 +463,7 @@ public function addMultiUpload(string $name, string|Stringable|null $label = nul
 	/**
 	 * Adds hidden form control used to store a non-displayed value.
 	 */
-	public function addHidden(string $name, $default = null): Controls\HiddenField
+	public function addHidden(string $name, mixed $default = null): Controls\HiddenField
 	{
 		return $this[$name] = (new Controls\HiddenField)
 			->setDefaultValue($default);
@@ -600,7 +600,7 @@ public function addContainer(string|int $name): self
 
 
 	/** @param mixed[] $args */
-	public function __call(string $name, array $args)
+	public function __call(string $name, array $args): mixed
 	{
 		if (isset(self::$extMethods[$name])) {
 			return (self::$extMethods[$name])($this, ...$args);
@@ -611,7 +611,7 @@ public function __call(string $name, array $args)
 
 
 	/** @param callable(static): mixed  $callback */
-	public static function extensionMethod(string $name, /*callable*/ $callback): void
+	public static function extensionMethod(string $name, callable $callback): void
 	{
 		if (str_contains($name, '::')) { // back compatibility
 			[, $name] = explode('::', $name);

src/Forms/ControlGroup.php

@@ -30,7 +30,7 @@ public function __construct()
 
 
 	/** @param Control|Container|iterable<Control|Container> ...$items */
-	public function add(...$items): static
+	public function add(Control|Container|iterable ...$items): static
 	{
 		foreach ($items as $item) {
 			if ($item instanceof Control) {
@@ -40,12 +40,8 @@ public function add(...$items): static
 				foreach ($item->getComponents() as $component) {
 					$this->add($component);
 				}
-			} elseif (is_iterable($item)) {
-				$this->add(...$item);
-
 			} else {
-				$type = get_debug_type($item);
-				throw new Nette\InvalidArgumentException("Control or Container items expected, $type given.");
+				$this->add(...$item);
 			}
 		}
 

src/Forms/Controls/BaseControl.php

@@ -113,7 +113,7 @@ public function loadHttpData(): void
 	/**
 	 * Returns submitted HTTP value for this control.
 	 */
-	protected function getHttpData($type, ?string $htmlTail = null): mixed
+	protected function getHttpData(int $type, ?string $htmlTail = null): mixed
 	{
 		return $this->getForm()->getHttpData($type, $this->getHtmlName() . $htmlTail);
 	}
@@ -163,7 +163,7 @@ public function isFilled(): bool
 	 * Sets the default value. Has no effect on submitted or disabled controls.
 	 * @return static
 	 */
-	public function setDefaultValue($value)
+	public function setDefaultValue(mixed $value)
 	{
 		$form = $this->getForm(throw: false);
 		if ($this->isDisabled() || !$form || !$form->isAnchored() || !$form->isSubmitted()) {
@@ -369,7 +369,7 @@ public function getTranslator(): ?Nette\Localization\Translator
 	/**
 	 * Translates a string or array of strings using the configured translator, or returns the value unchanged if no translator is set or the value is HtmlStringable.
 	 */
-	public function translate($value, ...$parameters): mixed
+	public function translate(mixed $value, mixed ...$parameters): mixed
 	{
 		if ($translator = $this->getTranslator()) {
 			$tmp = is_array($value) ? [&$value] : [[&$value]];
@@ -406,7 +406,7 @@ public function addRule(
 	 * Adds a validation condition and returns a new branch.
 	 * @param  (callable(Control): bool)|string|bool  $validator
 	 */
-	public function addCondition($validator, $value = null): Rules
+	public function addCondition($validator, mixed $value = null): Rules
 	{
 		return $this->rules->addCondition($validator, $value);
 	}
@@ -416,7 +416,7 @@ public function addCondition($validator, $value = null): Rules
 	 * Adds a validation condition based on another control and returns a new branch.
 	 * @param  (callable(Control): bool)|string  $validator
 	 */
-	public function addConditionOn(Control $control, $validator, $value = null): Rules
+	public function addConditionOn(Control $control, $validator, mixed $value = null): Rules
 	{
 		return $this->rules->addConditionOn($control, $validator, $value);
 	}
@@ -518,7 +518,7 @@ public function cleanErrors(): void
 	/**
 	 * Sets a rendering or user-specific option (e.g. 'description', 'class', 'id').
 	 */
-	public function setOption($key, mixed $value): static
+	public function setOption(string $key, mixed $value): static
 	{
 		if ($value === null) {
 			unset($this->options[$key]);
@@ -533,7 +533,7 @@ public function setOption($key, mixed $value): static
 	/**
 	 * Returns a rendering or user-specific option value.
 	 */
-	public function getOption($key): mixed
+	public function getOption(string $key): mixed
 	{
 		if (func_num_args() > 1) {
 			trigger_error(__METHOD__ . '() parameter $default is deprecated, use operator ??', E_USER_DEPRECATED);
@@ -573,7 +573,7 @@ public function __call(string $name, array $args)
 
 
 	/** @param callable(static): mixed  $callback */
-	public static function extensionMethod(string $name, /*callable*/ $callback): void
+	public static function extensionMethod(string $name, callable $callback): void
 	{
 		if (str_contains($name, '::')) { // back compatibility
 			[, $name] = explode('::', $name);

src/Forms/Controls/HiddenField.php

@@ -22,7 +22,7 @@ class HiddenField extends BaseControl
 	private bool $nullable = false;
 
 
-	public function __construct($persistentValue = null)
+	public function __construct(mixed $persistentValue = null)
 	{
 		parent::__construct();
 		$this->control->type = 'hidden';

src/Forms/Controls/MultiSelectBox.php

@@ -24,7 +24,7 @@ class MultiSelectBox extends MultiChoiceControl
 
 
 	/** @param  ?mixed[]  $items */
-	public function __construct($label = null, ?array $items = null)
+	public function __construct(string|\Stringable|null $label = null, ?array $items = null)
 	{
 		parent::__construct($label, $items);
 		$this->setOption('type', 'select');

src/Forms/Form.php

@@ -499,7 +499,7 @@ public function fireEvents(): void
 
 
 	/** @param  iterable<callable>  $handlers */
-	private function invokeHandlers(iterable $handlers, $button = null): void
+	private function invokeHandlers(iterable $handlers, ?SubmitterControl $button = null): void
 	{
 		foreach ($handlers as $handler) {
 			$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
@@ -699,7 +699,7 @@ public function fireRenderEvents(): void
 	}
 
 
-	public function render(...$args): void
+	public function render(mixed ...$args): void
 	{
 		$this->fireRenderEvents();
 		echo $this->getRenderer()->render($this, ...$args);

src/Forms/Helpers.php

@@ -67,7 +67,7 @@ public static function extractHttpData(
 	}
 
 
-	private static function sanitize(int $type, $value): string|Nette\Http\FileUpload|null
+	private static function sanitize(int $type, mixed $value): string|Nette\Http\FileUpload|null
 	{
 		if ($type === Form::DataText) {
 			return is_scalar($value)
@@ -185,7 +185,7 @@ public static function createInputList(
 		array $items,
 		?array $inputAttrs = null,
 		?array $labelAttrs = null,
-		$wrapper = null,
+		Html|string|null $wrapper = null,
 	): string
 	{
 		[$inputAttrs, $inputTag] = self::prepareAttrs($inputAttrs, 'input');
@@ -222,7 +222,7 @@ public static function createInputList(
 	 * @param  mixed[]  $items
 	 * @param  ?array<string, mixed>  $optionAttrs
 	 */
-	public static function createSelectBox(array $items, ?array $optionAttrs = null, $selected = null): Html
+	public static function createSelectBox(array $items, ?array $optionAttrs = null, mixed $selected = null): Html
 	{
 		if ($selected !== null) {
 			$optionAttrs['selected?'] = $selected;
@@ -307,7 +307,7 @@ public static function iniGetSize(string $name): int
 	 * Returns the single type name from reflection, or null if no type is defined.
 	 * @internal
 	 */
-	public static function getSingleType($reflection): ?string
+	public static function getSingleType(\ReflectionParameter|\ReflectionProperty $reflection): ?string
 	{
 		$type = Nette\Utils\Type::fromReflection($reflection);
 		if (!$type) {
@@ -323,7 +323,10 @@ public static function getSingleType($reflection): ?string
 
 
 	/** @internal */
-	public static function tryEnumConversion(mixed $value, $reflection): mixed
+	public static function tryEnumConversion(
+		mixed $value,
+		\ReflectionParameter|\ReflectionProperty|null $reflection,
+	): mixed
 	{
 		if ($value !== null
 			&& $reflection

src/Forms/Rules.php

@@ -117,7 +117,7 @@ public function removeRule(callable|string $validator): static
 	 * Adds a validation condition and returns new branch.
 	 * @param  (callable(Control): bool)|string|bool  $validator
 	 */
-	public function addCondition($validator, $arg = null): static
+	public function addCondition(callable|string|bool $validator, mixed $arg = null): static
 	{
 		if ($validator === Form::Valid || $validator === ~Form::Valid) {
 			throw new Nette\InvalidArgumentException('You cannot use Form::Valid in the addCondition method.');
@@ -134,7 +134,7 @@ public function addCondition($validator, $arg = null): static
 	 * Adds a validation condition on a specified control and returns new branch.
 	 * @param  (callable(Control): bool)|string  $validator
 	 */
-	public function addConditionOn(Control $control, $validator, $arg = null): static
+	public function addConditionOn(Control $control, callable|string $validator, mixed $arg = null): static
 	{
 		$rule = new Rule;
 		$rule->control = $control;
@@ -348,7 +348,7 @@ private function adjustOperation(Rule $rule): void
 	}
 
 
-	private static function getCallback(Rule $rule)
+	private static function getCallback(Rule $rule): array|callable|string
 	{
 		$op = $rule->validator;
 		return is_string($op) && str_starts_with($op, ':')

src/Forms/Validator.php

@@ -112,7 +112,7 @@ public static function formatMessage(Rule $rule, bool $withValue = true): string
 	/**
 	 * Checks whether the control's value equals the argument (string comparison, supports arrays).
 	 */
-	public static function validateEqual(Control $control, $arg): bool
+	public static function validateEqual(Control $control, mixed $arg): bool
 	{
 		$value = $control->getValue();
 		$values = is_array($value) ? $value : [$value];
@@ -139,7 +139,7 @@ public static function validateEqual(Control $control, $arg): bool
 	/**
 	 * Checks whether the control's value does not equal the argument.
 	 */
-	public static function validateNotEqual(Control $control, $arg): bool
+	public static function validateNotEqual(Control $control, mixed $arg): bool
 	{
 		return !static::validateEqual($control, $arg);
 	}
@@ -198,7 +198,7 @@ public static function validateRange(Control $control, array $range): bool
 	/**
 	 * Checks whether the control's value is greater than or equal to the minimum.
 	 */
-	public static function validateMin(Control $control, $minimum): bool
+	public static function validateMin(Control $control, int|float|string|\DateTimeInterface $minimum): bool
 	{
 		return Validators::isInRange($control->getValue(), [$minimum === '' ? null : $minimum, null]);
 	}
@@ -207,7 +207,7 @@ public static function validateMin(Control $control, $minimum): bool
 	/**
 	 * Checks whether the control's value is less than or equal to the maximum.
 	 */
-	public static function validateMax(Control $control, $maximum): bool
+	public static function validateMax(Control $control, int|float|string|\DateTimeInterface $maximum): bool
 	{
 		return Validators::isInRange($control->getValue(), [null, $maximum === '' ? null : $maximum]);
 	}
@@ -231,7 +231,7 @@ public static function validateLength(Control $control, array|int $range): bool
 	/**
 	 * Checks whether the string length or array count is at least the specified minimum.
 	 */
-	public static function validateMinLength(Control $control, $length): bool
+	public static function validateMinLength(Control $control, int $length): bool
 	{
 		return static::validateLength($control, [$length, null]);
 	}
@@ -240,7 +240,7 @@ public static function validateMinLength(Control $control, $length): bool
 	/**
 	 * Checks whether the string length or array count does not exceed the specified maximum.
 	 */
-	public static function validateMaxLength(Control $control, $length): bool
+	public static function validateMaxLength(Control $control, int $length): bool
 	{
 		return static::validateLength($control, [null, $length]);
 	}
@@ -357,7 +357,7 @@ public static function validateFloat(Control $control): bool
 	/**
 	 * Checks whether all uploaded files are within the size limit (in bytes).
 	 */
-	public static function validateFileSize(Controls\UploadControl $control, $limit): bool
+	public static function validateFileSize(Controls\UploadControl $control, int $limit): bool
 	{
 		foreach (static::toArray($control->getValue()) as $file) {
 			if ($file->getSize() > $limit || $file->getError() === UPLOAD_ERR_INI_SIZE) {
@@ -403,7 +403,7 @@ public static function validateImage(Controls\UploadControl $control): bool
 
 
 	/** @return mixed[] */
-	private static function toArray($value): array
+	private static function toArray(mixed $value): array
 	{
 		return is_object($value) ? [$value] : (array) $value;
 	}