phpstan level 7

dg · dg · commit d311fdf15523 · 2026-02-10T01:43:25.000+01:00
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -384,12 +384,6 @@ parameters:
 			count: 1
 			path: src/Forms/Rules.php
 
-		-
-			message: '#^Call to function is_callable\(\) with callable\(\)\: mixed will always evaluate to true\.$#'
-			identifier: function.alreadyNarrowedType
-			count: 1
-			path: src/Forms/Rules.php
-
 		-
 			message: '#^Method Nette\\Forms\\Rules\:\:addCondition\(\) has parameter \$validator with no signature specified for callable\.$#'
 			identifier: missingType.callable
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,5 +1,5 @@
 parameters:
-	level: 6
+	level: 7
 
 	paths:
 		- src
diff --git a/src/Bridges/FormsLatte/Runtime.php b/src/Bridges/FormsLatte/Runtime.php
@@ -58,7 +58,8 @@ public static function renderFormEnd(Form $form, bool $withTags = true): string
 	{
 		$s = '';
 		if ($form->isMethod('get')) {
-			foreach (preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY) as $param) {
+			$params = preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY);
+			foreach ($params ?: [] as $param) {
 				$parts = explode('=', $param, 2);
 				$name = urldecode($parts[0]);
 				$prefix = explode('[', $name, 2)[0];
@@ -84,6 +85,7 @@ public static function item(object|string|int $item, object $global): object
 		if (is_object($item)) {
 			return $item;
 		}
+
 		$form = end($global->formsStack) ?: throw new \LogicException('Form declaration is missing, did you use {form} or <form n:name> tag?');
 		return $form[$item];
 	}
diff --git a/src/Forms/Blueprint.php b/src/Forms/Blueprint.php
@@ -156,14 +156,15 @@ public function getOption(mixed $key): mixed
 
 			ob_start();
 			$dummyForm->render('end');
-			$end = ob_get_clean();
+			$end = (string) ob_get_clean();
 		}
 
 		ob_start();
 		$dummyForm->render();
-		$body = ob_get_clean();
+		$body = (string) ob_get_clean();
 
-		$body = str_replace($dummyForm->getElementPrototype()->startTag(), '<form n:name="' . $form->getName() . '">', $body);
+		$startTag = $dummyForm->getElementPrototype()->startTag();
+		$body = str_replace($startTag ?: '', '<form n:name="' . $form->getName() . '">', $body);
 		$body = str_replace($end ?? '', '</form>', $body);
 		return $body;
 	}
@@ -175,7 +176,7 @@ public function generateDataClass(
 		?string $baseName = null,
 	): string
 	{
-		$baseName ??= preg_replace('~Form$~', '', ucwords((string) $container->getName()));
+		$baseName ??= preg_replace('~Form$~', '', ucwords((string) $container->getName())) ?: '';
 		$nextCode = '';
 		$props = [];
 		foreach ($container->getComponents() as $name => $input) {
@@ -208,7 +209,7 @@ public function generateDataClass(
 					$type = '?' . $type;
 				}
 			} elseif ($input instanceof Container) {
-				$type = $baseName . ucwords($name);
+				$type = $baseName . ucwords((string) $name);
 				$nextCode .= $this->generateDataClass($input, $propertyPromotion, $type);
 				$type .= self::ClassNameSuffix;
 			} else {
diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -121,6 +121,7 @@ public function getValues(string|object|bool|null $returnType = null, ?array $co
 			$returnType = self::Array;
 		}
 
+		/** @var list<Control>|null $controls */
 		return $this->getUntrustedValues($returnType, $controls);
 	}
 
@@ -140,7 +141,9 @@ public function getUntrustedValues(string|object|null $returnType = null, ?array
 
 		} else {
 			$returnType ??= $this->mappedType ?? ArrayHash::class;
-			$rc = new \ReflectionClass($returnType === self::Array ? \stdClass::class : $returnType);
+			/** @var class-string $rcClass */
+			$rcClass = $returnType === self::Array ? \stdClass::class : $returnType;
+			$rc = new \ReflectionClass($rcClass);
 			$constructor = $rc->hasMethod('__construct') ? $rc->getMethod('__construct') : null;
 			if ($constructor?->getNumberOfRequiredParameters()) {
 				$resultObj = new \stdClass;
@@ -166,23 +169,28 @@ public function getUntrustedValues(string|object|null $returnType = null, ?array
 				$resultObj->$name = Helpers::tryEnumConversion($control->getValue(), $property);
 
 			} elseif ($control instanceof self) {
+				/** @var class-string|'array'|null $type */
 				$type = $returnType === self::Array && !$control->mappedType
 					? self::Array
 					: ($property ? Helpers::getSingleType($property) : null);
 				$resultObj->$name = $control->getUntrustedValues($type, $allowed ? null : $controls);
 			}
 		}
 
-		return match (true) {
-			isset($constructor) => new $returnType(...(array) $resultObj),
-			$returnType === self::Array => (array) $resultObj,
-			default => $resultObj,
-		};
+		if ($returnType === self::Array) {
+			return (array) $resultObj;
+		} elseif (isset($constructor)) {
+			/** @var class-string $returnType */
+			return new $returnType(...(array) $resultObj);
+		}
+
+		return $resultObj;
 	}
 
 
 	/**
 	 * @deprecated use getUntrustedValues()
+	 * @param class-string|'array'|object|null $returnType
 	 * @param ?list<Control> $controls
 	 * @return object|array<string, mixed>
 	 */
@@ -242,6 +250,7 @@ public function validate(?array $controls = null): void
 
 		foreach ($this->onValidate as $handler) {
 			$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
+			/** @var list<?class-string> $types */
 			$types = array_map(Helpers::getSingleType(...), $params);
 			$args = isset($types[0]) && !$this instanceof $types[0]
 				? [$this->getUntrustedValues($types[0])]
diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -256,7 +256,8 @@ public function getControl()
 	public function getLabel(string|Stringable|null $caption = null)
 	{
 		$label = clone $this->label;
-		$label->for = $this->getHtmlId();
+		$htmlId = $this->getHtmlId();
+		$label->for = is_string($htmlId) ? $htmlId : null;
 		$caption ??= $this->caption;
 		$translator = $this->getForm()->getTranslator();
 		$label->setText($translator && !$caption instanceof Nette\HtmlStringable ? $translator->translate($caption) : $caption);
@@ -266,13 +267,15 @@ public function getLabel(string|Stringable|null $caption = null)
 
 	public function getControlPart(): ?Html
 	{
-		return $this->getControl();
+		$control = $this->getControl();
+		return $control instanceof Html ? $control : null;
 	}
 
 
 	public function getLabelPart(): ?Html
 	{
-		return $this->getLabel();
+		$label = $this->getLabel();
+		return $label instanceof Html ? $label : null;
 	}
 
 
@@ -299,7 +302,7 @@ public function getLabelPrototype(): Html
 	 */
 	public function setHtmlId(string|bool|null $id): static
 	{
-		$this->control->id = $id;
+		$this->control->id = is_string($id) ? $id : null;
 		return $this;
 	}
 
@@ -374,7 +377,7 @@ public function getTranslator(): ?Nette\Localization\Translator
 				: null;
 		}
 
-		return $this->translator;
+		return $this->translator ?: null;
 	}
 
 
@@ -486,7 +489,9 @@ public function validate(): void
 	 */
 	public function addError(string|Stringable $message, bool $translate = true): void
 	{
-		$this->errors[] = $translate ? $this->translate($message) : $message;
+		$translated = $translate ? $this->translate($message) : $message;
+		assert(is_string($translated) || $translated instanceof Stringable);
+		$this->errors[] = (string) $translated;
 	}
 
 
diff --git a/src/Forms/Controls/Checkbox.php b/src/Forms/Controls/Checkbox.php
@@ -71,13 +71,17 @@ public function getLabel(string|Stringable|null $caption = null): Html|string|nu
 
 	public function getControlPart(): Html
 	{
-		return parent::getControl()->checked($this->value);
+		$control = parent::getControl();
+		assert($control instanceof Html);
+		return $control->checked($this->value);
 	}
 
 
 	public function getLabelPart(): Html
 	{
-		return parent::getLabel();
+		$label = parent::getLabel();
+		assert($label instanceof Html);
+		return $label;
 	}
 
 
diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
@@ -45,14 +45,15 @@ public function loadHttpData(): void
 		$data = $this->getForm()->getHttpData(Nette\Forms\Form::DataText, substr($this->getHtmlName(), 0, -2));
 		$data = $data === null
 			? $this->getHttpData(Nette\Forms\Form::DataText)
-			: explode(',', $data);
-		$this->value = array_keys(array_flip($data));
+			: (is_string($data) ? explode(',', $data) : []);
+		$this->value = array_keys(array_flip((array) $data));
 	}
 
 
 	public function getControl(): Html
 	{
 		$input = parent::getControl();
+		assert($input instanceof Html);
 		$items = $this->getItems();
 		if (!$items) {
 			return Html::el();
@@ -76,14 +77,18 @@ public function getControl(): Html
 
 	public function getLabel(string|Stringable|null $caption = null): Html
 	{
-		return parent::getLabel($caption)->for(null);
+		$label = parent::getLabel($caption);
+		assert($label instanceof Html);
+		return $label->for(null);
 	}
 
 
 	public function getControlPart(int|string|null $key = null): Html
 	{
 		$key = key([(string) $key => null]);
-		return parent::getControl()->addAttributes([
+		$control = parent::getControl();
+		assert($control instanceof Html);
+		return $control->addAttributes([
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, strict: true),
 			'disabled' => is_array($this->disabled) ? isset($this->disabled[$key]) : $this->disabled,
diff --git a/src/Forms/Controls/ColorPicker.php b/src/Forms/Controls/ColorPicker.php
@@ -53,7 +53,9 @@ public function loadHttpData(): void
 
 	public function getControl(): Nette\Utils\Html
 	{
-		return parent::getControl()->addAttributes([
+		$control = parent::getControl();
+		assert($control instanceof Nette\Utils\Html);
+		return $control->addAttributes([
 			'type' => 'color',
 			'value' => $this->value,
 		]);
diff --git a/src/Forms/Controls/CsrfProtection.php b/src/Forms/Controls/CsrfProtection.php
@@ -37,7 +37,9 @@ public function __construct(string|Stringable|null $errorMessage = null)
 
 		$this->monitor(Presenter::class, function (Presenter $presenter): void {
 			if (!$this->session) {
-				$this->session = $presenter->getSession();
+				$session = $presenter->getSession();
+				assert($session instanceof Nette\Http\Session);
+				$this->session = $session;
 				$this->session->start();
 			}
 		});
diff --git a/src/Forms/Controls/DateTimeControl.php b/src/Forms/Controls/DateTimeControl.php
@@ -12,7 +12,7 @@
 use Nette;
 use Nette\Forms\Form;
 use Stringable;
-use function get_debug_type, is_numeric, is_scalar, is_string;
+use function get_debug_type, is_int, is_numeric, is_string;
 
 
 /**
@@ -107,7 +107,9 @@ public function loadHttpData(): void
 
 	public function getControl(): Nette\Utils\Html
 	{
-		return parent::getControl()->addAttributes([
+		$control = parent::getControl();
+		assert($control instanceof Nette\Utils\Html);
+		return $control->addAttributes([
 			...$this->getAttributesFromRules(),
 			'value' => $this->value ? $this->formatHtmlValue($this->value) : null,
 			'type' => match ($this->type) {
@@ -139,14 +141,14 @@ public function formatLocaleText(\DateTimeInterface|string|int $value): string
 			self::TypeDate => [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE],
 			self::TypeTime => [\IntlDateFormatter::NONE, $this->withSeconds ? \IntlDateFormatter::MEDIUM : \IntlDateFormatter::SHORT],
 			self::TypeDateTime => [\IntlDateFormatter::MEDIUM, $this->withSeconds ? \IntlDateFormatter::MEDIUM : \IntlDateFormatter::SHORT],
-		});
+		}) ?: '';
 	}
 
 
 	private function getAttributesFromRules(): array
 	{
 		$attrs = [];
-		$format = fn($val) => is_scalar($val) || $val instanceof \DateTimeInterface
+		$format = fn($val) => is_string($val) || is_int($val) || $val instanceof \DateTimeInterface
 				? $this->formatHtmlValue($val)
 				: null;
 		foreach ($this->getRules() as $rule) {
diff --git a/src/Forms/Controls/MultiSelectBox.php b/src/Forms/Controls/MultiSelectBox.php
@@ -67,13 +67,15 @@ public function getControl(): Nette\Utils\Html
 			$items[is_array($value) ? $this->translate($key) : $key] = $this->translate($value);
 		}
 
+		$control = parent::getControl();
+		assert($control instanceof Nette\Utils\Html);
 		return Nette\Forms\Helpers::createSelectBox(
 			$items,
 			[
 				'disabled:' => is_array($this->disabled) ? $this->disabled : null,
 			] + $this->optionAttributes,
 			$this->value,
-		)->addAttributes(parent::getControl()->attrs)->multiple(true);
+		)->addAttributes($control->attrs)->multiple(true);
 	}
 
 
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -44,6 +44,7 @@ public function __construct(string|Stringable|null $label = null, ?array $items
 	public function getControl(): Html
 	{
 		$input = parent::getControl();
+		assert($input instanceof Html);
 		$items = $this->getItems();
 		if (!$items) {
 			return Html::el();
@@ -73,14 +74,18 @@ public function getControl(): Html
 
 	public function getLabel(string|\Stringable|null $caption = null): Html
 	{
-		return parent::getLabel($caption)->for(null);
+		$label = parent::getLabel($caption);
+		assert($label instanceof Html);
+		return $label->for(null);
 	}
 
 
 	public function getControlPart(int|string|null $key = null): Html
 	{
 		$key = key([(string) $key => null]);
-		return parent::getControl()->addAttributes([
+		$control = parent::getControl();
+		assert($control instanceof Html);
+		return $control->addAttributes([
 			'id' => $this->getHtmlId() . '-' . $key,
 			'checked' => in_array($key, (array) $this->value, strict: true),
 			'disabled' => is_array($this->disabled) ? isset($this->disabled[$key]) : $this->disabled,
diff --git a/src/Forms/Controls/SelectBox.php b/src/Forms/Controls/SelectBox.php
@@ -115,8 +115,10 @@ public function getControl(): Nette\Utils\Html
 			}
 		}
 
+		$control = parent::getControl();
+		assert($control instanceof Nette\Utils\Html);
 		return Nette\Forms\Helpers::createSelectBox($items, $attrs, $selected)
-			->addAttributes(parent::getControl()->attrs);
+			->addAttributes($control->attrs);
 	}
 
 
diff --git a/src/Forms/Controls/TextBase.php b/src/Forms/Controls/TextBase.php
@@ -106,6 +106,7 @@ public function setMaxLength(?int $length): static
 	public function getControl(): Nette\Utils\Html
 	{
 		$el = parent::getControl();
+		assert($el instanceof Nette\Utils\Html);
 		if ($this->emptyValue !== '') {
 			$el->attrs['data-nette-empty-value'] = Strings::trim($this->translate($this->emptyValue));
 		}
@@ -140,7 +141,7 @@ public function addRule(
 
 		if ($validator === Form::Length || $validator === Form::MaxLength) {
 			$tmp = is_array($arg) ? $arg[1] : $arg;
-			if (is_scalar($tmp)) {
+			if (is_int($tmp)) {
 				$this->control->maxlength = isset($this->control->maxlength)
 					? min($this->control->maxlength, $tmp)
 					: $tmp;
diff --git a/src/Forms/Controls/TextInput.php b/src/Forms/Controls/TextInput.php
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
diff --git a/src/Forms/Rules.php b/src/Forms/Rules.php
diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
diff --git a/tests/types/forms-types.php b/tests/types/forms-types.php

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,8 @@ public static function renderFormEnd(Form $form, bool $withTags = true): string`
`58`	`58`	`{`
`59`	`59`	`$s = '';`
`60`	`60`	`if ($form->isMethod('get')) {`
`61`		`- foreach (preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY) as $param) {`
	`61`	`+ $params = preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY);`
	`62`	`+ foreach ($params ?: [] as $param) {`
`62`	`63`	`$parts = explode('=', $param, 2);`
`63`	`64`	`$name = urldecode($parts[0]);`
`64`	`65`	`$prefix = explode('[', $name, 2)[0];`
`@@ -84,6 +85,7 @@ public static function item(object\|string\|int $item, object $global): object`
`84`	`85`	`if (is_object($item)) {`
`85`	`86`	`return $item;`
`86`	`87`	`}`
	`88`	`+`
`87`	`89`	`$form = end($global->formsStack) ?: throw new \LogicException('Form declaration is missing, did you use {form} or <form n:name> tag?');`
`88`	`90`	`return $form[$item];`
`89`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,8 @@ public function getControl()`
`256`	`256`	`public function getLabel(string\|Stringable\|null $caption = null)`
`257`	`257`	`{`
`258`	`258`	`$label = clone $this->label;`
`259`		`- $label->for = $this->getHtmlId();`
	`259`	`+ $htmlId = $this->getHtmlId();`
	`260`	`+ $label->for = is_string($htmlId) ? $htmlId : null;`
`260`	`261`	`$caption ??= $this->caption;`
`261`	`262`	`$translator = $this->getForm()->getTranslator();`
`262`	`263`	`$label->setText($translator && !$caption instanceof Nette\HtmlStringable ? $translator->translate($caption) : $caption);`
`@@ -266,13 +267,15 @@ public function getLabel(string\|Stringable\|null $caption = null)`
`266`	`267`
`267`	`268`	`public function getControlPart(): ?Html`
`268`	`269`	`{`
`269`		`- return $this->getControl();`
	`270`	`+ $control = $this->getControl();`
	`271`	`+ return $control instanceof Html ? $control : null;`
`270`	`272`	`}`
`271`	`273`
`272`	`274`
`273`	`275`	`public function getLabelPart(): ?Html`
`274`	`276`	`{`
`275`		`- return $this->getLabel();`
	`277`	`+ $label = $this->getLabel();`
	`278`	`+ return $label instanceof Html ? $label : null;`
`276`	`279`	`}`
`277`	`280`
`278`	`281`
`@@ -299,7 +302,7 @@ public function getLabelPrototype(): Html`
`299`	`302`	`*/`
`300`	`303`	`public function setHtmlId(string\|bool\|null $id): static`
`301`	`304`	`{`
`302`		`- $this->control->id = $id;`
	`305`	`+ $this->control->id = is_string($id) ? $id : null;`
`303`	`306`	`return $this;`
`304`	`307`	`}`
`305`	`308`
`@@ -374,7 +377,7 @@ public function getTranslator(): ?Nette\Localization\Translator`
`374`	`377`	`: null;`
`375`	`378`	`}`
`376`	`379`
`377`		`- return $this->translator;`
	`380`	`+ return $this->translator ?: null;`
`378`	`381`	`}`
`379`	`382`
`380`	`383`
`@@ -486,7 +489,9 @@ public function validate(): void`
`486`	`489`	`*/`
`487`	`490`	`public function addError(string\|Stringable $message, bool $translate = true): void`
`488`	`491`	`{`
`489`		`- $this->errors[] = $translate ? $this->translate($message) : $message;`
	`492`	`+ $translated = $translate ? $this->translate($message) : $message;`
	`493`	`+ assert(is_string($translated) \|\| $translated instanceof Stringable);`
	`494`	`+ $this->errors[] = (string) $translated;`
`490`	`495`	`}`
`491`	`496`
`492`	`497`
Original file line number	Diff line number	Diff line change
`@@ -71,13 +71,17 @@ public function getLabel(string\|Stringable\|null $caption = null): Html\|string\|nu`
`71`	`71`
`72`	`72`	`public function getControlPart(): Html`
`73`	`73`	`{`
`74`		`- return parent::getControl()->checked($this->value);`
	`74`	`+ $control = parent::getControl();`
	`75`	`+ assert($control instanceof Html);`
	`76`	`+ return $control->checked($this->value);`
`75`	`77`	`}`
`76`	`78`
`77`	`79`
`78`	`80`	`public function getLabelPart(): Html`
`79`	`81`	`{`
`80`		`- return parent::getLabel();`
	`82`	`+ $label = parent::getLabel();`
	`83`	`+ assert($label instanceof Html);`
	`84`	`+ return $label;`
`81`	`85`	`}`
`82`	`86`
`83`	`87`