uses nette/phpstan-rules

Author: dg

composer.json

@@ -26,7 +26,9 @@
 		"nette/tester": "^2.6",
 		"latte/latte": "^2.10.2 || ^3.0.12",
 		"tracy/tracy": "^2.9",
-		"phpstan/phpstan-nette": "^2.0@stable"
+		"phpstan/phpstan": "^2.1@stable",
+		"phpstan/extension-installer": "^1.4@stable",
+		"nette/phpstan-rules": "^1.0"
 	},
 	"conflict": {
 		"latte/latte": ">=3.0.0 <3.0.12 || >=3.2"
@@ -49,5 +51,10 @@
 		"branch-alias": {
 			"dev-master": "3.2-dev"
 		}
+	},
+	"config": {
+		"allow-plugins": {
+			"phpstan/extension-installer": true
+		}
 	}
 }

phpstan.neon

@@ -3,9 +3,3 @@ parameters:
 
 	paths:
 		- src
-
-	treatPhpDocTypesAsCertain: false
-
-
-includes:
-	- vendor/phpstan/phpstan-nette/extension.neon

src/Bridges/FormsDI/FormsExtension.php

@@ -8,7 +8,7 @@
 namespace Nette\Bridges\FormsDI;
 
 use Nette;
-use function defined;
+use function defined, is_object;
 
 
 /**
@@ -31,6 +31,7 @@ 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) {
 			if (defined('Nette\Forms\Form::' . $name)) {
 				$initialize->addBody('Nette\Forms\Validator::$messages[Nette\Forms\Form::?] = ?;', [$name, $text]);

tests/types/TypesTest.phpt

@@ -0,0 +1,7 @@
+<?php declare(strict_types=1);
+
+require __DIR__ . '/../bootstrap.php';
+
+use Nette\PHPStan\Tester\TypeAssert;
+
+TypeAssert::assertTypes(__DIR__ . '/forms-types.php');

tests/types/forms-types.php

@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+
+/**
+ * PHPStan type tests for Forms.
+ * Run: vendor/bin/phpstan analyse tests/types
+ */
+
+use Nette\Forms\Container;
+use Nette\Forms\Form;
+use Nette\Utils\ArrayHash;
+use function PHPStan\Testing\assertType;
+
+
+class FormDto
+{
+	public string $name;
+}
+
+
+function testFormContainerGetValues(Container $container): void
+{
+	assertType('Nette\Utils\ArrayHash<mixed>', $container->getValues());
+	assertType('array|array<mixed>', $container->getValues('array'));
+	assertType(FormDto::class, $container->getValues(FormDto::class));
+}
+
+
+function testFormContainerGetUntrustedValues(Container $container): void
+{
+	assertType('Nette\Utils\ArrayHash<mixed>', $container->getUntrustedValues(null));
+	assertType('array|array<mixed>', $container->getUntrustedValues('array'));
+	assertType(FormDto::class, $container->getUntrustedValues(FormDto::class));
+}
+
+
+function testFormContainerArrayAccess(Container $container): void
+{
+	assertType('Nette\Forms\Controls\BaseControl', $container['name']);
+}
+
+
+function testFormEvents(Form $form): void
+{
+	$form->onSuccess[] = function (Form $form, ArrayHash $values): void {
+		assertType(Form::class, $form);
+		assertType(ArrayHash::class, $values);
+	};
+
+	$form->onError[] = function (Form $form): void {
+		assertType(Form::class, $form);
+	};
+}