phpstan level 6

Author: dg

phpstan-baseline.neon

@@ -11,5 +11,10 @@ parameters:
 
 	checkMissingCallableSignature: true
 
+	ignoreErrors:
+		-   # Latte nodes use new static() by design for extensibility
+			identifier: new.static
+			path: src/Bridges/FormsLatte/Nodes/*
+
 includes:
 	- phpstan-baseline.neon

phpstan.neon

@@ -105,7 +105,7 @@ private function init(Tag $tag): void
 	public static function findUsedAttributes(ElementNode $el): array
 	{
 		$res = [];
-		foreach ($el->attributes?->children as $child) {
+		foreach ($el->attributes->children as $child) {
 			if ($child instanceof AttributeNode && $child->name instanceof TextNode) {
 				$res[] = $child->name->content;
 			} elseif ($child instanceof ExpressionAttributeNode) {

src/Bridges/FormsLatte/Nodes/FieldNNameNode.php

@@ -181,8 +181,12 @@ public function getUntrustedValues(string|object|null $returnType = null, ?array
 	}
 
 
-	/** @deprecated use getUntrustedValues() */
-	public function getUnsafeValues($returnType, ?array $controls = null)
+	/**
+	 * @deprecated use getUntrustedValues()
+	 * @param ?list<Control> $controls
+	 * @return object|array<string, mixed>
+	 */
+	public function getUnsafeValues(string|object|null $returnType, ?array $controls = null): object|array
 	{
 		return $this->getUntrustedValues($returnType, $controls);
 	}
@@ -303,7 +307,52 @@ public function addComponent(
 	 */
 	public function getControls(): \Iterator
 	{
-		return $this->getComponents(true, Control::class);
+		return new class ($this->getComponentTree()) implements \Iterator {
+			/** @var Controls\BaseControl[] */
+			private array $controls = [];
+			private int $position = 0;
+
+
+			/** @param list<Nette\ComponentModel\IComponent> $tree */
+			public function __construct(array $tree)
+			{
+				foreach ($tree as $component) {
+					if ($component instanceof Controls\BaseControl) {
+						$this->controls[] = $component;
+					}
+				}
+			}
+
+
+			public function current(): Controls\BaseControl
+			{
+				return $this->controls[$this->position];
+			}
+
+
+			public function key(): string
+			{
+				return $this->controls[$this->position]->getName();
+			}
+
+
+			public function next(): void
+			{
+				++$this->position;
+			}
+
+
+			public function rewind(): void
+			{
+				$this->position = 0;
+			}
+
+
+			public function valid(): bool
+			{
+				return isset($this->controls[$this->position]);
+			}
+		};
 	}
 
 

src/Forms/Container.php

@@ -8,10 +8,25 @@
 declare(strict_types=1);
 
 namespace Nette\Forms;
+use Nette\Utils\Html;
 
 
 /**
  * Defines method that must be implemented to allow a component to act like a form control.
+ * @method ?Form getForm(bool $throw = true)
+ * @method mixed getOption(string $key)
+ * @method static setOption(string $key, mixed $value)
+ * @method Html|string|null getControl()
+ * @method Html|string|null getLabel()
+ * @method bool isDisabled()
+ * @method bool isRequired()
+ * @method bool hasErrors()
+ * @method string lookupPath(string $type, bool $throw = true)
+ * @method void addError(string|\Stringable $message, bool $translate = true)
+ * @method bool isFilled()
+ * @method ?Nette\ComponentModel\IContainer getParent()
+ * @method ?string getName()
+ * @method string getHtmlName()
  */
 interface Control
 {

src/Forms/Control.php

@@ -10,6 +10,7 @@
 namespace Nette\Forms\Controls;
 
 use Nette;
+use Stringable;
 use function is_array;
 
 

src/Forms/Controls/MultiSelectBox.php

@@ -583,6 +583,7 @@ protected function receiveHttpData(): ?array
 		}
 
 		if ($tracker = $this->getComponent(self::TrackerId, throw: false)) {
+			assert($tracker instanceof Control);
 			if (!isset($data[self::TrackerId]) || $data[self::TrackerId] !== $tracker->getValue()) {
 				return null;
 			}

src/Forms/Form.php

@@ -7,52 +7,11 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Container;
-use Nette\Forms\Controls\BaseControl;
 use Nette\Forms\Form;
 use Nette\Utils\ArrayHash;
 use function PHPStan\Testing\assertType;
 
 
-class FormDto
-{
-	public string $name;
-}
-
-
-function testFormContainerGetValues(Container $container): void
-{
-	$values = $container->getValues();
-	assertType(ArrayHash::class, $values);
-
-	$valuesArray = $container->getValues(asArray: true);
-	assertType('array<string, mixed>', $valuesArray);
-
-	$valuesDto = $container->getValues(FormDto::class);
-	assertType(FormDto::class, $valuesDto);
-}
-
-
-function testFormContainerGetUnsafeValues(Container $container): void
-{
-	$values = $container->getUnsafeValues(null);
-	assertType(ArrayHash::class, $values);
-
-	$valuesArray = $container->getUnsafeValues('array');
-	assertType('array<string, mixed>', $valuesArray);
-
-	$valuesDto = $container->getUnsafeValues(FormDto::class);
-	assertType(FormDto::class, $valuesDto);
-}
-
-
-function testFormContainerArrayAccess(Container $container): void
-{
-	$control = $container['name'];
-	assertType(BaseControl::class, $control);
-}
-
-
 function testFormEvents(Form $form): void
 {
 	$form->onSuccess[] = function (Form $form, ArrayHash $values): void {