fixed PHPStan errors

Author: dg

phpstan-baseline.neon

@@ -1,121 +1,115 @@
 parameters:
 	ignoreErrors:
 		-
-			message: '#^Match expression does not handle remaining value\: true$#'
+			message: '#^Parameter \#1 \$class of method Nette\\PhpGenerator\\Printer\:\:printClass\(\) expects Nette\\PhpGenerator\\ClassType\|Nette\\PhpGenerator\\EnumType\|Nette\\PhpGenerator\\InterfaceType\|Nette\\PhpGenerator\\TraitType, \$this\(Nette\\PhpGenerator\\ClassLike\) given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/PhpGenerator/ClassLike.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\ClassType\:\:addTrait\(\) has parameter \$deprecatedParam with no value type specified in iterable type array\.$#'
+			message: '#^Method Nette\\PhpGenerator\\Closure\:\:from\(\) should return Nette\\PhpGenerator\\Closure but returns Nette\\PhpGenerator\\Closure\|Nette\\PhpGenerator\\GlobalFunction\.$#'
+			identifier: return.type
 			count: 1
-			path: src/PhpGenerator/ClassType.php
+			path: src/PhpGenerator/Closure.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\EnumType\:\:addTrait\(\) has parameter \$deprecatedParam with no value type specified in iterable type array\.$#'
+			message: '#^Call to an undefined method object\:\:__unserialize\(\)\.$#'
+			identifier: method.notFound
 			count: 1
-			path: src/PhpGenerator/EnumType.php
-
-		-
-			message: '#^Access to an undefined property PhpParser\\Node\:\:\$attrGroups\.$#'
-			count: 1
-			path: src/PhpGenerator/Extractor.php
-
-		-
-			message: '#^Access to an undefined property PhpParser\\Node\\Expr\:\:\$value\.$#'
-			count: 1
-			path: src/PhpGenerator/Extractor.php
+			path: src/PhpGenerator/Dumper.php
 
 		-
 			message: '#^Call to an undefined method Nette\\PhpGenerator\\ClassLike\:\:addConstant\(\)\.$#'
+			identifier: method.notFound
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
 			message: '#^Call to an undefined method Nette\\PhpGenerator\\ClassLike\:\:addMethod\(\)\.$#'
+			identifier: method.notFound
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
 			message: '#^Call to an undefined method Nette\\PhpGenerator\\ClassLike\:\:addProperty\(\)\.$#'
+			identifier: method.notFound
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
 			message: '#^Call to an undefined method Nette\\PhpGenerator\\ClassLike\:\:addTrait\(\)\.$#'
+			identifier: method.notFound
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Extractor\:\:addCommentAndAttributes\(\) has parameter \$element with no type specified\.$#'
+			message: '#^Call to an undefined method Nette\\PhpGenerator\\ClassLike\|Nette\\PhpGenerator\\Constant\|Nette\\PhpGenerator\\EnumCase\|Nette\\PhpGenerator\\GlobalFunction\|Nette\\PhpGenerator\\Method\|Nette\\PhpGenerator\\Parameter\|Nette\\PhpGenerator\\Property\|Nette\\PhpGenerator\\PropertyHook\|Nette\\PhpGenerator\\TraitUse\:\:addAttribute\(\)\.$#'
+			identifier: method.notFound
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
-			message: '#^Property class@anonymous/PhpGenerator/Extractor\.php\:176\:\:\$callback has no type specified\.$#'
+			message: '#^Parameter \#1 \$class of method Nette\\PhpGenerator\\Extractor\:\:addEnumCaseToClass\(\) expects Nette\\PhpGenerator\\EnumType, Nette\\PhpGenerator\\ClassLike given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/PhpGenerator/Extractor.php
 
 		-
 			message: '#^Variable \$trait might not be defined\.$#'
-			count: 2
-			path: src/PhpGenerator/Extractor.php
-
-		-
-			message: '#^Call to an undefined method ReflectionClass\<object\>\:\:hasCase\(\)\.$#'
+			identifier: variable.undefined
 			count: 1
-			path: src/PhpGenerator/Factory.php
-
-		-
-			message: '#^Elseif branch is unreachable because previous condition is always true\.$#'
-			count: 1
-			path: src/PhpGenerator/Factory.php
-
-		-
-			message: '#^Method Nette\\PhpGenerator\\Factory\:\:getAttributes\(\) has parameter \$from with no type specified\.$#'
-			count: 1
-			path: src/PhpGenerator/Factory.php
+			path: src/PhpGenerator/Extractor.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Factory\:\:getAttributes\(\) return type has no value type specified in iterable type array\.$#'
+			message: '#^Parameter &\$from by\-ref type of method Nette\\PhpGenerator\\Factory\:\:createClassObject\(\) expects ReflectionClass\<object\>, ReflectionEnum\<UnitEnum\> given\.$#'
+			identifier: parameterByRef.type
 			count: 1
 			path: src/PhpGenerator/Factory.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Factory\:\:getExtractor\(\) has parameter \$from with no type specified\.$#'
+			message: '#^Variable \$bodies on left side of \?\?\= always exists and is not nullable\.$#'
+			identifier: nullCoalesce.variable
 			count: 1
 			path: src/PhpGenerator/Factory.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Factory\:\:getVisibility\(\) has parameter \$from with no type specified\.$#'
+			message: '#^Variable \$cache on left side of \?\?\= always exists and is not nullable\.$#'
+			identifier: nullCoalesce.variable
 			count: 1
 			path: src/PhpGenerator/Factory.php
 
 		-
-			message: '#^Parameter \#1 \$name of method Nette\\PhpGenerator\\ClassType\:\:setExtends\(\) expects string\|null, array\<int, string\> given\.$#'
+			message: '#^Method Nette\\PhpGenerator\\GlobalFunction\:\:from\(\) should return Nette\\PhpGenerator\\GlobalFunction but returns Nette\\PhpGenerator\\Closure\|Nette\\PhpGenerator\\GlobalFunction\.$#'
+			identifier: return.type
 			count: 1
-			path: src/PhpGenerator/Factory.php
+			path: src/PhpGenerator/GlobalFunction.php
 
 		-
-			message: '#^Unreachable statement \- code above always terminates\.$#'
+			message: '#^Parameter \#1 \$callable of static method Nette\\Utils\\Callback\:\:toReflection\(\) expects callable\(\)\: mixed, \(Closure\(\)\: mixed\)\|string given\.$#'
+			identifier: argument.type
 			count: 1
-			path: src/PhpGenerator/Factory.php
+			path: src/PhpGenerator/GlobalFunction.php
 
 		-
-			message: '#^Variable \$bodies on left side of \?\?\= always exists and is not nullable\.$#'
+			message: '#^Parameter \#1 \$from of method Nette\\PhpGenerator\\Factory\:\:fromFunctionReflection\(\) expects ReflectionFunction, ReflectionFunction\|ReflectionMethod given\.$#'
+			identifier: argument.type
 			count: 1
-			path: src/PhpGenerator/Factory.php
+			path: src/PhpGenerator/GlobalFunction.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Helpers\:\:formatArgs\(\) has parameter \$args with no value type specified in iterable type array\.$#'
+			message: '#^Method Nette\\PhpGenerator\\Helpers\:\:unindent\(\) should return string but returns string\|null\.$#'
+			identifier: return.type
 			count: 1
 			path: src/PhpGenerator/Helpers.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\Method\:\:from\(\) has parameter \$method with no value type specified in iterable type array\.$#'
+			message: '#^Parameter \#1 \$callable of static method Nette\\Utils\\Callback\:\:toReflection\(\) expects callable\(\)\: mixed, array\{object\|string, string\}\|\(Closure\(\)\: mixed\)\|string given\.$#'
+			identifier: argument.type
 			count: 1
 			path: src/PhpGenerator/Method.php
 
 		-
-			message: '#^Method Nette\\PhpGenerator\\TraitType\:\:addTrait\(\) has parameter \$deprecatedParam with no value type specified in iterable type array\.$#'
+			message: '#^Parameter \#1 \$from of method Nette\\PhpGenerator\\Factory\:\:fromMethodReflection\(\) expects ReflectionMethod, ReflectionFunction\|ReflectionMethod given\.$#'
+			identifier: argument.type
 			count: 1
-			path: src/PhpGenerator/TraitType.php
+			path: src/PhpGenerator/Method.php

phpstan.neon

@@ -1,8 +1,28 @@
-includes:
-	- phpstan-baseline.neon
-
 parameters:
-	level: 6
+	level: 8
 
 	paths:
 		- src
+
+	ignoreErrors:
+		# addMember() uses dynamic property assignment through match expression — type-safe by design
+		-
+			identifier: assign.propertyType
+			paths:
+				- src/PhpGenerator/ClassType.php
+				- src/PhpGenerator/TraitType.php
+				- src/PhpGenerator/InterfaceType.php
+				- src/PhpGenerator/EnumType.php
+
+		# Exhaustive match arms — last branch is always true by definition
+		-
+			identifier: instanceof.alwaysTrue
+			paths:
+				- src/PhpGenerator/ClassType.php
+				- src/PhpGenerator/TraitType.php
+				- src/PhpGenerator/InterfaceType.php
+				- src/PhpGenerator/EnumType.php
+				- src/PhpGenerator/Printer.php
+
+includes:
+	- phpstan-baseline.neon

src/PhpGenerator/ClassManipulator.php

@@ -34,6 +34,7 @@ public function inheritProperty(string $name, bool $returnIfExists = false): Pro
 			?: throw new Nette\InvalidStateException("Class '{$this->class->getName()}' has neither setExtends() nor setImplements() set.");
 
 		foreach ($parents as $parent) {
+			/** @var class-string $parent */
 			try {
 				$rp = new \ReflectionProperty($parent, $name);
 			} catch (\ReflectionException) {

src/PhpGenerator/ClassType.php

@@ -127,7 +127,7 @@ public function addImplement(string $name): static
 
 	public function removeImplement(string $name): static
 	{
-		$this->implements = array_diff($this->implements, [$name]);
+		$this->implements = array_values(array_diff($this->implements, [$name]));
 		return $this;
 	}
 
@@ -183,10 +183,9 @@ public function validate(): void
 	public function __clone(): void
 	{
 		parent::__clone();
-		$clone = fn($item) => clone $item;
-		$this->consts = array_map($clone, $this->consts);
-		$this->methods = array_map($clone, $this->methods);
-		$this->properties = array_map($clone, $this->properties);
-		$this->traits = array_map($clone, $this->traits);
+		$this->consts = array_map(fn(Constant $c) => clone $c, $this->consts);
+		$this->methods = array_map(fn(Method $m) => clone $m, $this->methods);
+		$this->properties = array_map(fn(Property $p) => clone $p, $this->properties);
+		$this->traits = array_map(fn(TraitUse $t) => clone $t, $this->traits);
 	}
 }

src/PhpGenerator/Dumper.php

@@ -146,6 +146,7 @@ private function dumpObject(object $var, array $parents, int $level, int $column
 			return '(object) ' . $this->dumpArray($var, $parents, $level, $column + 10);
 
 		} elseif ($class === \DateTime::class || $class === \DateTimeImmutable::class) {
+			assert($var instanceof \DateTimeInterface);
 			return $this->format(
 				"new \\$class(?, new \\DateTimeZone(?))",
 				$var->format('Y-m-d H:i:s.u'),

src/PhpGenerator/EnumType.php

@@ -66,7 +66,7 @@ public function addImplement(string $name): static
 
 	public function removeImplement(string $name): static
 	{
-		$this->implements = array_diff($this->implements, [$name]);
+		$this->implements = array_values(array_diff($this->implements, [$name]));
 		return $this;
 	}
 
@@ -135,10 +135,9 @@ public function addMember(Method|Constant|EnumCase|TraitUse $member, bool $overw
 	public function __clone(): void
 	{
 		parent::__clone();
-		$clone = fn($item) => clone $item;
-		$this->consts = array_map($clone, $this->consts);
-		$this->methods = array_map($clone, $this->methods);
-		$this->traits = array_map($clone, $this->traits);
-		$this->cases = array_map($clone, $this->cases);
+		$this->consts = array_map(fn(Constant $c) => clone $c, $this->consts);
+		$this->methods = array_map(fn(Method $m) => clone $m, $this->methods);
+		$this->traits = array_map(fn(TraitUse $t) => clone $t, $this->traits);
+		$this->cases = array_map(fn(EnumCase $c) => clone $c, $this->cases);
 	}
 }

src/PhpGenerator/Extractor.php

@@ -13,7 +13,7 @@
 use PhpParser\Node;
 use PhpParser\NodeFinder;
 use PhpParser\ParserFactory;
-use function addcslashes, array_map, assert, class_exists, end, in_array, is_array, rtrim, str_contains, str_repeat, str_replace, str_starts_with, strlen, substr, substr_replace, usort;
+use function addcslashes, array_map, assert, class_exists, end, in_array, is_array, is_string, rtrim, str_contains, str_repeat, str_replace, str_starts_with, strlen, substr, substr_replace, usort;
 
 
 /**
@@ -49,6 +49,7 @@ private function parseCode(string $code): void
 		$this->code = Nette\Utils\Strings::unixNewLines($code);
 		$parser = (new ParserFactory)->createForNewestSupportedVersion();
 		$stmts = $parser->parse($this->code);
+		assert($stmts !== null);
 
 		$traverser = new PhpParser\NodeTraverser;
 		$traverser->addVisitor(new PhpParser\NodeVisitor\ParentConnectingVisitor);
@@ -63,8 +64,11 @@ public function extractMethodBodies(string $className): array
 		$nodeFinder = new NodeFinder;
 		$classNode = $nodeFinder->findFirst(
 			$this->statements,
-			fn(Node $node) => $node instanceof Node\Stmt\ClassLike && $node->namespacedName->toString() === $className,
+			fn(Node $node) => $node instanceof Node\Stmt\ClassLike && $node->namespacedName !== null && $node->namespacedName->toString() === $className,
 		);
+		if (!$classNode) {
+			return [];
+		}
 
 		$res = [];
 		foreach ($nodeFinder->findInstanceOf($classNode, Node\Stmt\ClassMethod::class) as $methodNode) {
@@ -87,8 +91,11 @@ public function extractPropertyHookBodies(string $className): array
 		$nodeFinder = new NodeFinder;
 		$classNode = $nodeFinder->findFirst(
 			$this->statements,
-			fn(Node $node) => $node instanceof Node\Stmt\ClassLike && $node->namespacedName->toString() === $className,
+			fn(Node $node) => $node instanceof Node\Stmt\ClassLike && $node->namespacedName !== null && $node->namespacedName->toString() === $className,
 		);
+		if (!$classNode) {
+			return [];
+		}
 
 		$res = [];
 		foreach ($nodeFinder->findInstanceOf($classNode, Node\Stmt\Property::class) as $propertyNode) {
@@ -111,7 +118,7 @@ public function extractFunctionBody(string $name): string
 	{
 		$functionNode = (new NodeFinder)->findFirst(
 			$this->statements,
-			fn(Node $node) => $node instanceof Node\Stmt\Function_ && $node->namespacedName->toString() === $name,
+			fn(Node $node) => $node instanceof Node\Stmt\Function_ && $node->namespacedName !== null && $node->namespacedName->toString() === $name,
 		);
 		assert($functionNode instanceof Node\Stmt\Function_);
 
@@ -260,7 +267,7 @@ public function extractAll(): PhpFile
 				$phpFile->setStrictTypes((bool) $node->declares[0]->value->value);
 
 			} elseif ($node instanceof Node\Stmt\Namespace_) {
-				$namespaces[$node->name->toString()] = $node->stmts;
+				$namespaces[$node->name?->toString() ?? ''] = $node->stmts;
 			}
 		}
 
@@ -294,6 +301,7 @@ private function addUseToNamespace(PhpNamespace $namespace, Node\Stmt\Use_ $node
 
 	private function addClassLikeToFile(PhpFile $phpFile, Node\Stmt\ClassLike $node): ClassLike
 	{
+		assert($node->namespacedName !== null);
 		if ($node instanceof Node\Stmt\Class_) {
 			$class = $phpFile->addClass($node->namespacedName->toString());
 			$class->setFinal($node->isFinal());
@@ -387,7 +395,9 @@ private function addHooksToProperty(Property|PromotedParameter $prop, Node\Stmt\
 		}
 
 		foreach ($node->hooks as $hookNode) {
-			$hook = $prop->addHook($hookNode->name->toString());
+			/** @var 'set'|'get' $hookType */
+			$hookType = $hookNode->name->toString();
+			$hook = $prop->addHook($hookType);
 			$hook->setFinal((bool) ($hookNode->flags & Modifiers::FINAL));
 			$this->setupFunction($hook, $hookNode);
 			if ($hookNode->body === null) {
@@ -438,6 +448,7 @@ private function addEnumCaseToClass(EnumType $class, Node\Stmt\EnumCase $node):
 
 	private function addFunctionToFile(PhpFile $phpFile, Node\Stmt\Function_ $node): void
 	{
+		assert($node->namespacedName !== null);
 		$function = $phpFile->addFunction($node->namespacedName->toString());
 		$this->setupFunction($function, $node);
 	}
@@ -480,13 +491,15 @@ private function setupFunction(GlobalFunction|Method|PropertyHook $function, Nod
 		}
 
 		foreach ($node->getParams() as $item) {
+			assert($item->var instanceof Node\Expr\Variable && is_string($item->var->name));
 			$getVisibility = $this->toVisibility($item->flags);
 			$setVisibility = $this->toSetterVisibility($item->flags);
 			$final = (bool) ($item->flags & Modifiers::FINAL);
 			if ($getVisibility || $setVisibility || $final) {
+				assert($function instanceof Method);
 				$param = $function->addPromotedParameter($item->var->name)
 					->setVisibility($getVisibility, $setVisibility)
-					->setReadonly($item->isReadonly())
+					->setReadOnly($item->isReadonly())
 					->setFinal($final);
 				$this->addHooksToProperty($param, $item);
 			} else {
@@ -587,7 +600,9 @@ private function toPhp(Node $value): string
 	private function getNodeContents(Node ...$nodes): string
 	{
 		$start = $this->getNodeStartPos($nodes[0]);
-		return substr($this->code, $start, end($nodes)->getEndFilePos() - $start + 1);
+		$last = end($nodes);
+		assert($last !== false);
+		return substr($this->code, $start, $last->getEndFilePos() - $start + 1);
 	}