wip

Author: dg

phpstan.neon

@@ -84,6 +84,39 @@ parameters:
 		- # template compiled with precise types, is_string always true
 			identifier: function.alreadyNarrowedType
 			path: src/Bridges/DITracy/dist/panel.phtml
+		- # constructor entity param deliberately broad (native array, no value type)
+			identifier: missingType.iterableValue
+			path: src/DI/Definitions/Statement.php
+		- # promoted property stores broad array, getEntity() declares precise tuple
+			identifier: return.type
+			path: src/DI/Definitions/Statement.php
+		- # exhaustive type check after precise getEntity() return type
+			identifier: elseif.alwaysTrue
+			path: src/DI/Config/Adapters/NeonAdapter.php
+		- # array_values after unset not recognized as list
+			identifier: assign.propertyType
+			path: src/DI/Config/Adapters/NeonAdapter.php
+		- # getByType template type unresolvable in closure
+			identifier: argument.templateType
+			path: src/DI/Container.php
+		- # normalizeClass: ReflectionClass->name is string not class-string
+			identifier: return.type
+			path: src/DI/Helpers.php
+		- # normalizeEntity: reference tracking defeats type narrowing
+			identifier: return.type
+			path: src/DI/Resolver.php
+		- # string as class-string for ReflectionClass in canBeLazy
+			identifier: argument.type
+			path: src/DI/Definitions/ServiceDefinition.php
+		- # string as class-string for ReflectionClass in calculateHash
+			identifier: argument.type
+			path: src/DI/DependencyChecker.php
+		- # exportMeta complex return shape with optional keys
+			identifier: return.type
+			path: src/DI/ContainerBuilder.php
+		- # addDefinition template type unresolvable
+			identifier: argument.templateType
+			path: src/DI/Extensions/ServicesExtension.php
 
 includes:
 	- phpstan-baseline.neon

src/DI/CompilerExtension.php

@@ -113,7 +113,7 @@ public function loadFromFile(string $file): array
 	/**
 	 * Loads list of service definitions from configuration.
 	 * Prefixes its names and replaces @extension with name in definition.
-	 * @param  array<string, mixed>  $configList
+	 * @param  array<int|string, mixed>  $configList
 	 */
 	public function loadDefinitionsFromConfig(array $configList): void
 	{

src/DI/Config/Adapters/NeonAdapter.php

@@ -44,7 +44,9 @@ public function load(string $file): array
 		$node = $traverser->traverse($node, $this->convertAtSignVisitor(...));
 		$node = $traverser->traverse($node, $this->deprecatedParametersVisitor(...));
 		$node = $traverser->traverse($node, $this->resolveConstantsVisitor(...));
-		return $this->process((array) $node->toValue());
+		/** @var array<string, mixed> $result */
+		$result = $this->process((array) $node->toValue());
+		return $result;
 	}
 
 

src/DI/Container.php

@@ -359,6 +359,7 @@ public function callInjects(object $service): void
 
 	/**
 	 * Calls the method and passes dependencies to it via autowiring.
+	 * @param  callable(mixed...): mixed  $function
 	 * @param  array<mixed>  $args
 	 */
 	public function callMethod(callable $function, array $args = []): mixed
@@ -369,7 +370,7 @@ public function callMethod(callable $function, array $args = []): mixed
 
 	/**
 	 * @param  array<int|string, mixed>  $args
-	 * @return list<mixed>
+	 * @return array<int|string, mixed>
 	 */
 	private function autowireArguments(\ReflectionFunctionAbstract $function, array $args = []): array
 	{

src/DI/ContainerLoader.php

@@ -42,6 +42,7 @@ public function getClassName(mixed $key): string
 	}
 
 
+	/** @param (\Closure(Compiler): ?string) $generator */
 	private function loadFile(string $class, \Closure $generator): void
 	{
 		$file = "$this->tempDirectory/$class.php";

src/DI/Definitions/AccessorDefinition.php

@@ -102,9 +102,12 @@ public function complete(Nette\DI\Resolver $resolver): void
 			$method = new \ReflectionMethod($type, self::MethodGet);
 			$returnType = Type::fromReflection($method);
 			assert($returnType !== null);
-			$this->setReference($returnType->getSingleName());
+			$name = $returnType->getSingleName();
+			assert($name !== null);
+			$this->setReference($name);
 		}
 
+		assert($this->reference !== null);
 		$this->reference = $resolver->normalizeReference($this->reference);
 	}
 

src/DI/Definitions/Definition.php

@@ -27,7 +27,7 @@ abstract class Definition
 	/** @var bool|class-string[] */
 	private bool|array $autowired = true;
 
-	/** @var ?(Closure(): void) */
+	/** @var (\Closure(): void)|null */
 	private ?\Closure $notifier = null;
 
 
@@ -162,7 +162,7 @@ abstract public function complete(Nette\DI\Resolver $resolver): void;
 	abstract public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGenerator $generator): void;
 
 
-	/** @param ?(Closure(): void) $notifier */
+	/** @param (\Closure(): void)|null $notifier */
 	final public function setNotifier(?\Closure $notifier): void
 	{
 		$this->notifier = $notifier;
@@ -174,6 +174,7 @@ final public function setNotifier(?\Closure $notifier): void
 
 	/**
 	 * @deprecated Use setType()
+	 * @param class-string|null $type
 	 * @return static
 	 */
 	public function setClass(?string $type)

src/DI/Definitions/ServiceDefinition.php

@@ -45,6 +45,7 @@ public function setType(?string $type): static
 
 	/**
 	 * Alias for setCreator()
+	 * @param  string|array{string|Reference|Statement, string}|Definition|Reference|Statement  $factory
 	 * @param  array<int|string, mixed>  $args
 	 */
 	public function setFactory(string|array|Definition|Reference|Statement $factory, array $args = []): static
@@ -62,7 +63,10 @@ public function getFactory(): Statement
 	}
 
 
-	/** @param  array<int|string, mixed>  $args */
+	/**
+	 * @param  string|array{string|Reference|Statement, string}|Definition|Reference|Statement  $creator
+	 * @param  array<int|string, mixed>  $args
+	 */
 	public function setCreator(string|array|Definition|Reference|Statement $creator, array $args = []): static
 	{
 		$this->creator = $creator instanceof Statement
@@ -124,7 +128,10 @@ public function getSetup(): array
 	}
 
 
-	/** @param  array<int|string, mixed>  $args */
+	/**
+	 * @param  string|array{string|Reference|Statement, string}|Definition|Reference|Statement  $entity
+	 * @param  array<int|string, mixed>  $args
+	 */
 	public function addSetup(string|array|Definition|Reference|Statement $entity, array $args = []): static
 	{
 		$entity = $entity instanceof Statement
@@ -151,6 +158,7 @@ public function resolveType(Nette\DI\Resolver $resolver): void
 				throw new ServiceCreationException('Unknown service type, specify it or declare return type of factory method.');
 			}
 
+			/** @var class-string $type */
 			$this->setType($type);
 			$resolver->addDependency(new \ReflectionClass($type));
 		}
@@ -196,6 +204,7 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 		if ($this->canBeLazy() && !preg_grep('#(?:func_get_arg|func_num_args)#i', $lines)) { // latteFactory workaround
 			$class = $this->creator->getEntity();
 			assert(is_string($class));
+			/** @var class-string $class */
 			$lines[0] = (new \ReflectionClass($class))->hasMethod('__construct')
 				? $generator->formatPhp("\$service->__construct(...?:);\n", [$this->creator->arguments])
 				: '';

src/DI/Definitions/Statement.php

@@ -24,6 +24,7 @@ final class Statement implements Nette\Schema\DynamicParameter
 	public array $arguments;
 
 
+	/** @param array<int|string, mixed> $arguments */
 	public function __construct(
 		private string|array|Definition|Reference|null $entity,
 		array $arguments = [],
@@ -59,6 +60,7 @@ public function __construct(
 	}
 
 
+	/** @return string|array{string|Reference|Statement, string}|Definition|Reference|null */
 	public function getEntity(): string|array|Definition|Reference|null
 	{
 		return $this->entity;

src/DI/Extensions/DefinitionSchema.php

@@ -112,7 +112,10 @@ public function completeDefault(Context $context): mixed
 	}
 
 
-	/** @param  string|int  $key */
+	/**
+	 * @param  string|int  $key
+	 * @param  array<string, mixed>  $def
+	 */
 	private function sniffType($key, array $def): string
 	{
 		if (is_string($key)) {