fixed PHPStan errors [WIP]

Author: dg

composer.json

@@ -16,7 +16,7 @@
 	],
 	"require": {
 		"php": "8.1 - 8.5",
-		"nette/component-model": "^3.1",
+		"nette/component-model": "3.1.x-dev",
 		"nette/http": "^3.3",
 		"nette/utils": "^4.0.10"
 	},

phpstan-baseline.neon

@@ -31,26 +31,20 @@ parameters:
 			path: src/Forms/Blueprint.php
 
 		-
-			message: '#^Method Nette\\Forms\\Controls\\BaseControl@anonymous/Forms/Blueprint\.php\:97\:\:getControl\(\) never returns Nette\\Utils\\Html so it can be removed from the return type\.$#'
+			message: '#^Method Nette\\Forms\\Controls\\BaseControl@anonymous/Forms/Blueprint\.php\:94\:\:getLabel\(\) never returns null so it can be removed from the return type\.$#'
 			identifier: return.unusedType
 			count: 1
 			path: src/Forms/Blueprint.php
 
 		-
-			message: '#^Method Nette\\Forms\\Controls\\BaseControl@anonymous/Forms/Blueprint\.php\:97\:\:getLabel\(\) never returns Nette\\Utils\\Html so it can be removed from the return type\.$#'
-			identifier: return.unusedType
-			count: 1
-			path: src/Forms/Blueprint.php
-
-		-
-			message: '#^Method Nette\\Forms\\Form@anonymous/Forms/Blueprint\.php\:89\:\:receiveHttpData\(\) never returns null so it can be removed from the return type\.$#'
-			identifier: return.unusedType
+			message: '#^Property Nette\\Forms\\Controls\\BaseControl@anonymous/Forms/Blueprint\.php\:94\:\:\$inner \(Nette\\Forms\\Controls\\BaseControl\) does not accept Nette\\Forms\\Control\.$#'
+			identifier: assign.propertyType
 			count: 1
 			path: src/Forms/Blueprint.php
 
 		-
-			message: '#^Property Nette\\Forms\\Controls\\BaseControl@anonymous/Forms/Blueprint\.php\:97\:\:\$inner has no type specified\.$#'
-			identifier: missingType.property
+			message: '#^Ternary operator condition is always true\.$#'
+			identifier: ternary.alwaysTrue
 			count: 1
 			path: src/Forms/Blueprint.php
 
@@ -84,12 +78,6 @@ parameters:
 			count: 1
 			path: src/Forms/Container.php
 
-		-
-			message: '#^Unable to resolve the template type T in call to method Nette\\Forms\\Container\:\:getUntrustedValues\(\)$#'
-			identifier: argument.templateType
-			count: 1
-			path: src/Forms/Container.php
-
 		-
 			message: '#^Call to an undefined method Nette\\Forms\\Control\:\:getForm\(\)\.$#'
 			identifier: method.notFound
@@ -150,18 +138,54 @@ parameters:
 			count: 1
 			path: src/Forms/Controls/CheckboxList.php
 
+		-
+			message: '#^Parameter \#1 \$value \(BackedEnum\|int\|string\|null\) of method Nette\\Forms\\Controls\\ChoiceControl\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Control\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/ChoiceControl.php
+
+		-
+			message: '#^Parameter \#1 \$value \(BackedEnum\|int\|string\|null\) of method Nette\\Forms\\Controls\\ChoiceControl\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Controls\\BaseControl\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/ChoiceControl.php
+
 		-
 			message: '#^Call to function is_string\(\) with string will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType
 			count: 1
 			path: src/Forms/Controls/ColorPicker.php
 
+		-
+			message: '#^Parameter \#1 \$value \(string\|null\) of method Nette\\Forms\\Controls\\ColorPicker\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Control\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/ColorPicker.php
+
+		-
+			message: '#^Parameter \#1 \$value \(string\|null\) of method Nette\\Forms\\Controls\\ColorPicker\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Controls\\BaseControl\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/ColorPicker.php
+
 		-
 			message: '#^Match expression does not handle remaining values\: int\<min, 0\>\|int\<4, max\>$#'
 			identifier: match.unhandled
 			count: 4
 			path: src/Forms/Controls/DateTimeControl.php
 
+		-
+			message: '#^Parameter \#1 \$value \(DateTimeInterface\|int\|string\|null\) of method Nette\\Forms\\Controls\\DateTimeControl\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Control\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/DateTimeControl.php
+
+		-
+			message: '#^Parameter \#1 \$value \(DateTimeInterface\|int\|string\|null\) of method Nette\\Forms\\Controls\\DateTimeControl\:\:setValue\(\) should be contravariant with parameter \$value \(mixed\) of method Nette\\Forms\\Controls\\BaseControl\:\:setValue\(\)$#'
+			identifier: method.childParameterType
+			count: 1
+			path: src/Forms/Controls/DateTimeControl.php
+
 		-
 			message: '#^Method Nette\\Forms\\Controls\\HiddenField\:\:getLabel\(\) has parameter \$caption with no type specified\.$#'
 			identifier: missingType.parameter
@@ -192,12 +216,6 @@ parameters:
 			count: 1
 			path: src/Forms/Controls/SubmitButton.php
 
-		-
-			message: '#^Call to an undefined method Nette\\ComponentModel\\IComponent\:\:getValue\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: src/Forms/Form.php
-
 		-
 			message: '#^Call to an undefined method Nette\\Forms\\Control\:\:getParent\(\)\.$#'
 			identifier: method.notFound
@@ -216,6 +234,12 @@ parameters:
 			count: 1
 			path: src/Forms/Form.php
 
+		-
+			message: '#^Return type \(static\(Nette\\Forms\\Form\)\) of method Nette\\Forms\\Form\:\:getForm\(\) should be covariant with return type \(\(\$throw is true \? Nette\\Forms\\Form \: Nette\\Forms\\Form\|null\)\) of method Nette\\Forms\\Container\:\:getForm\(\)$#'
+			identifier: method.childReturnType
+			count: 1
+			path: src/Forms/Form.php
+
 		-
 			message: '#^Call to an undefined method Nette\\Forms\\Control\:\:getHtmlName\(\)\.$#'
 			identifier: method.notFound
@@ -228,12 +252,6 @@ parameters:
 			count: 1
 			path: src/Forms/Helpers.php
 
-		-
-			message: '#^Parameter \#1 \$callback of function array_map expects \(callable\(Nette\\Utils\\ImageType\)\: mixed\)\|null, Closure\(1\|2\|3\|6\|18\|19\)\: string given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Forms/Helpers.php
-
 		-
 			message: '#^Strict comparison using \=\=\= between '''' and '''' will always evaluate to true\.$#'
 			identifier: identical.alwaysTrue

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-	level: 6
+	level: 8
 
 	paths:
 		- src
@@ -13,5 +13,56 @@ parameters:
 			identifier: new.static
 			path: src/Bridges/FormsLatte/Nodes/*
 
+		-   # Html properties accept broader types (bool for attribute removal, mixed for flexibility)
+			identifier: assign.propertyType
+			paths:
+				- src/Forms/Controls/BaseControl.php
+				- src/Forms/Controls/TextBase.php
+				- src/Forms/Controls/TextInput.php
+				- src/Forms/Form.php
+
+		-   # Control interface intentionally minimal; BaseControl provides full implementation
+			identifier: method.notFound
+			reportUnmatched: false
+			paths:
+				- src/Forms/Controls/SubmitButton.php
+
+		-   # getLabel() returns Html in base but children legitimately widen to Html|string|null
+			identifier: method.childReturnType
+			reportUnmatched: false
+			paths:
+				- src/Forms/Controls/Button.php
+				- src/Forms/Controls/Checkbox.php
+				- src/Forms/Controls/HiddenField.php
+				- src/Forms/Blueprint.php
+
+		-   # DateTimeControl formatHtmlValue accepts broader types from rule args
+			message: '#^Parameter \#1 \$value of method Nette\\Forms\\Controls\\DateTimeControl\:\:formatHtmlValue\(\)#'
+			path: src/Forms/Controls/DateTimeControl.php
+
+		-   # getSingleType() returns ?string, template T cannot be resolved from plain string
+			identifier: argument.templateType
+			reportUnmatched: false
+			paths:
+				- src/Forms/Container.php
+				- src/Forms/Form.php
+
+		-   # getSingleType() returns ?string which is not class-string<T> but is correct at runtime
+			message: '#^Parameter \#1 \$returnType of method Nette\\Forms\\Container\:\:(getValues|getUntrustedValues)\(\) expects#'
+			reportUnmatched: false
+			paths:
+				- src/Forms/Container.php
+				- src/Forms/Form.php
+
+		-   # Deprecated method with untyped parameters
+			message: '#^Parameter \#2 \$controls of method Nette\\Forms\\Container\:\:getUntrustedValues\(\) expects#'
+			path: src/Forms/Container.php
+			count: 1
+
+		-   # Complex generic return types not fully expressible
+			identifier: return.type
+			paths:
+				- src/Forms/Container.php
+
 includes:
 	- phpstan-baseline.neon

src/Bridges/FormsDI/FormsExtension.php

@@ -8,7 +8,7 @@
 namespace Nette\Bridges\FormsDI;
 
 use Nette;
-use function defined, is_object;
+use function defined;
 
 
 /**
@@ -29,8 +29,9 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class): void
 	{
 		$initialize = $this->initialization ?? $class->getMethod('initialize');
 
-		assert(is_object($this->config));
-		foreach ($this->config->messages as $name => $text) {
+		/** @var object{messages: array<string, string>} $config */
+		$config = $this->config;
+		foreach ($config->messages as $name => $text) {
 			if (defined('Nette\Forms\Form::' . $name)) {
 				$initialize->addBody('Nette\Forms\Validator::$messages[Nette\Forms\Form::?] = ?;', [$name, $text]);
 			} elseif (defined($name)) {

src/Bridges/FormsLatte/FormsExtension.php

@@ -27,9 +27,12 @@ public function getTags(): array
 			'inputError' => Nodes\InputErrorNode::create(...),
 			'formPrint' => Nodes\FormPrintNode::create(...),
 			'formClassPrint' => Nodes\FormPrintNode::create(...),
-			'n:name' => fn(Latte\Compiler\Tag $tag) => yield from strtolower($tag->htmlElement->name) === 'form'
-				? Nodes\FormNNameNode::create($tag)
-				: Nodes\FieldNNameNode::create($tag),
+			'n:name' => function (Latte\Compiler\Tag $tag) {
+				assert($tag->htmlElement !== null);
+				return yield from strtolower($tag->htmlElement->name) === 'form'
+					? Nodes\FormNNameNode::create($tag)
+					: Nodes\FieldNNameNode::create($tag);
+			},
 		];
 	}
 

src/Bridges/FormsLatte/Nodes/FieldNNameNode.php

@@ -60,6 +60,7 @@ public function print(PrintContext $context): string
 	private function init(Tag $tag): void
 	{
 		$el = $tag->htmlElement;
+		assert($el !== null);
 		$usedAttributes = self::findUsedAttributes($el);
 		$elName = strtolower($el->name);
 

src/Bridges/FormsLatte/Nodes/FormNNameNode.php

@@ -59,13 +59,15 @@ public function print(PrintContext $context): string
 	private function init(Tag $tag): void
 	{
 		$el = $tag->htmlElement;
+		assert($el !== null);
 
 		$tag->replaceNAttribute(new AuxiliaryNode(fn(PrintContext $context) => $context->format(
 			'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), %dump, false) %line;',
 			array_fill_keys(FieldNNameNode::findUsedAttributes($el), null),
 			$this->position,
 		)));
 
+		assert($el->content !== null);
 		$el->content = new Latte\Compiler\Nodes\FragmentNode([
 			$el->content,
 			new AuxiliaryNode(fn(PrintContext $context) => $context->format(

src/Bridges/FormsLatte/Runtime.php

@@ -44,7 +44,7 @@ public static function renderFormBegin(Form $form, array $attrs, bool $withTags
 		$el->action = (string) $el->action;
 		$el = clone $el;
 		if ($form->isMethod('get')) {
-			$el->action = preg_replace('~\?[^#]*~', '', $el->action, 1);
+			$el->action = preg_replace('~\?[^#]*~', '', (string) $el->action, 1);
 		}
 
 		$el->addAttributes($attrs);
@@ -59,7 +59,7 @@ 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) {
+			foreach (preg_split('#[;&]#', (string) parse_url((string) $form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY) as $param) {
 				$parts = explode('=', $param, 2);
 				$name = urldecode($parts[0]);
 				$prefix = explode('[', $name, 2)[0];

src/Forms/Blueprint.php

@@ -7,7 +7,6 @@
 
 namespace Nette\Forms;
 
-use Nette\Utils\Html;
 
 
 /**
@@ -85,26 +84,26 @@ public function generateLatte(Form $form): string
 	{
 		$dict = new \SplObjectStorage;
 		$dummyForm = new class extends Form {
-			protected function receiveHttpData(): ?array
+			protected function receiveHttpData(): array
 			{
 				return [];
 			}
 		};
 
 		foreach ($form->getControls() as $input) {
 			$dict[$input] = $dummyInput = new class extends Controls\BaseControl {
-				public $inner;
+				public Controls\BaseControl $inner;
 
 
-				public function getLabel(string|\Stringable|null $caption = null): Html|string|null
+				public function getLabel(string|\Stringable|null $caption = null): string|null
 				{
 					return $this->inner->getLabel()
 						? '{label ' . $this->inner->lookupPath(Form::class) . '/}'
 						: null;
 				}
 
 
-				public function getControl(): Html|string
+				public function getControl(): string
 				{
 					return '{input ' . $this->inner->lookupPath(Form::class) . '}';
 				}
@@ -206,7 +205,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 {

src/Forms/Container.php

@@ -86,7 +86,7 @@ public function setValues(array|object $values, bool $erase = false, bool $onlyD
 	 * Returns the values submitted by the form.
 	 * @template T of object
 	 * @param  class-string<T>|T|'array'|true|null  $returnType
-	 * @param  ?list<Control>  $controls
+	 * @param  ?list<Control|self>  $controls
 	 * @return ($returnType is class-string<T>|T ? T : ($returnType is 'array'|true ? mixed[] : ArrayHash<mixed>))
 	 */
 	public function getValues(string|object|bool|null $returnType = null, ?array $controls = null): object|array
@@ -127,7 +127,7 @@ public function getValues(string|object|bool|null $returnType = null, ?array $co
 	 * Returns the potentially unvalidated values submitted by the form.
 	 * @template T of object
 	 * @param  class-string<T>|T|'array'|null  $returnType
-	 * @param  ?list<Control>  $controls
+	 * @param  ?list<Control|self>  $controls
 	 * @return ($returnType is class-string<T>|T ? T : ($returnType is 'array' ? mixed[] : ArrayHash<mixed>))
 	 */
 	public function getUntrustedValues(string|object|null $returnType = null, ?array $controls = null): object|array
@@ -138,6 +138,7 @@ public function getUntrustedValues(string|object|null $returnType = null, ?array
 
 		} else {
 			$returnType ??= $this->mappedType ?? ArrayHash::class;
+			/** @var class-string|'array' $returnType */
 			$rc = new \ReflectionClass($returnType === self::Array ? \stdClass::class : $returnType);
 			$constructor = $rc->hasMethod('__construct') ? $rc->getMethod('__construct') : null;
 			if ($constructor?->getNumberOfRequiredParameters()) {
@@ -257,7 +258,7 @@ public function getErrors(): array
 			$errors = array_merge($errors, $control->getErrors());
 		}
 
-		return array_unique($errors);
+		return array_values(array_unique($errors));
 	}