fixed PHPStan errors

Author: dg

.github/workflows/coding-style.yml

@@ -14,7 +14,7 @@ jobs:
                   coverage: none
 
             - run: composer create-project nette/code-checker temp/code-checker ^3 --no-progress
-            - run: php temp/code-checker/code-checker --strict-types --no-progress --ignore "tests/*/fixtures" --ignore expected
+            - run: php temp/code-checker/code-checker --strict-types --no-progress --ignore "tests/*/fixtures" --ignore expected --ignore src/Bridges/DITracy/*.latte
 
 
     nette_cs:

phpstan.neon

@@ -1,5 +1,122 @@
 parameters:
-	level: 5
+	level: 8
 
 	paths:
 		- src
+
+	excludePaths:
+		- src/compatibility.php
+
+	fileExtensions:
+		- php
+		- phtml
+
+	ignoreErrors:
+		-
+			identifier: return.type
+			path: src/DI/Definitions/FactoryDefinition.php
+		-
+			identifier: instanceof.alwaysTrue
+			path: src/DI/Definitions/ServiceDefinition.php
+		-
+			identifier: function.alreadyNarrowedType
+			path: src/DI/Definitions/Statement.php
+		-
+			identifier: function.impossibleType
+			path: src/DI/ContainerBuilder.php
+		-
+			identifier: argument.type
+			path: src/DI/Extensions/ServicesExtension.php
+		-
+			identifier: identical.alwaysFalse
+			path: src/DI/Helpers.php
+		-
+			identifier: property.notFound
+			path: src/Bridges/DITracy/ContainerPanel.php
+		-
+			identifier: closure.unusedUse
+			path: src/Bridges/DITracy/ContainerPanel.php
+		-
+			identifier: argument.type
+			path: src/DI/Config/Adapters/NeonAdapter.php
+		-
+			identifier: instanceof.alwaysTrue
+			path: src/DI/Extensions/ParametersExtension.php
+		-
+			identifier: identical.alwaysFalse
+			path: src/DI/Autowiring.php
+		-
+			identifier: isset.offset
+			path: src/DI/Autowiring.php
+		-
+			identifier: booleanAnd.alwaysFalse
+			path: src/DI/Autowiring.php
+		-
+			identifier: nullCoalesce.offset
+			path: src/DI/Autowiring.php
+		-
+			identifier: function.impossibleType
+			path: src/Bridges/DITracy/dist/panel.phtml
+		- # getByType() generic template limitation
+			identifier: return.type
+			path: src/DI/Container.php
+		- # closure passes string to class-string params
+			identifier: argument.type
+			path: src/DI/Container.php
+		- # callInjects passes array as callable
+			identifier: argument.type
+			path: src/DI/Extensions/InjectExtension.php
+		- # string as class-string in various places
+			identifier: argument.type
+			path: src/DI/Resolver.php
+		- # class_parents/class_implements key type
+			identifier: offsetAccess.invalidOffset
+			path: src/DI/Autowiring.php
+		- # $this->$list assignment
+			identifier: assign.propertyType
+			path: src/DI/Autowiring.php
+		- # string from array key used as class-string
+			identifier: argument.type
+			path: src/DI/Extensions/SearchExtension.php
+		- # string from array key used as class-string
+			identifier: argument.type
+			path: src/DI/Extensions/DefinitionSchema.php
+		- # 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/Bridges/DITracy/dist/panel.phtml

@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<?php use Tracy\Dumper ?>
+<?php use Tracy\Dumper ?><?php /** @var array<string, string> $services */ ?><?php /** @var array<string, array<int, list<string>>> $wiring */ ?><?php /** @var array<string, object> $instances */ ?><?php /** @var array<string, array<string, mixed>> $tags */ ?><?php /** @var array<string, mixed>|null $parameters */ ?><?php /** @var string $file */ ?>
 <style class="tracy-debug">
 	#tracy-debug .nette-ContainerPanel table {
 		width: 100%;
@@ -41,17 +41,16 @@
 		</thead>
 		<tbody>
 <?php foreach ($services as $name => $type): ?><?php $name = (string) $name ?><?php $autowired = in_array($name, array_merge($wiring[$type][0] ?? [], $wiring[$type][1] ?? []), strict: true) ?>				<tr>
-					<td class="<?= Tracy\Helpers::escapeHtml(isset($instances[$name]) ? 'created' : '') ?>
-">
+					<td class=<?= Tracy\Helpers::escapeHtml(isset($instances[$name]) ? 'created' : '') ?>
+>
 <?php if (is_numeric($name)): ?>
 						<small><?= Tracy\Helpers::escapeHtml($name) ?>
 </small><?php else: ?>
 <?= Tracy\Helpers::escapeHtml($name) ?>
 
 <?php endif ?>
 					</td>
-					<td class="<?= Tracy\Helpers::escapeHtml($autowired ? 'yes' : '') ?>
-">
+					<td<?php if ($ʟ_tmp = $autowired ? 'yes' : '') echo ' class', is_bool($ʟ_tmp) ? '' : '="'  . Tracy\Helpers::escapeHtml($ʟ_tmp) . '"' ?>>
 						<?= Tracy\Helpers::escapeHtml($autowired ? 'yes' : (isset($wiring[$type]) ? 'no' : '?')) ?>
 
 					</td>

src/Bridges/DITracy/dist/tab.phtml

@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-<span title="Nette DI Container">
+<?php /** @var ?float $elapsedTime */ ?><span title="Nette DI Container">
 	<svg viewBox="0 0 2048 2048">
 		<path fill="#ae7c21" d="m1675 690.55v-125c0-36-4-60-13-71-9-12-26-18-52-18s-43 6-52 17c-8 11-12 36-12 72v910.62c0 37 4 61 12 72 9 11 26 17 52 17s44-6 52-17c9-12 13-36 13-72v-207h243v165c0 86-4 148-12 187-8 38-21 70-39 96-20 28-45 48-77 59-31 11-87 16-170 16-96 0-161-5-196-16-34-11-63-31-86-59-21-26-36-59-45-97-9-39-14-101-14-186v-826.62c0-85 4-147 13-185s25-71 46-97c23-29 54-49 92-60s102-17 189-17c75 0 130 6 164 17s61 30 81 59c19 26 33 59 41 99 8 39 12 101 12 185v84zm-524 1086.6h-254v-1514.6h254zm-1025 0v-1514.6h316c127 0 212 27 257 81 44 53 66 159 66 316v721.62c0 157-22 263-66 317-44 53-130 80-257 80zm388-314v-884.62c0-35-4-58-13-70-9-11-26-17-53-17h-66v1058.6h66c26 0 44-6 53-17 9-12 14-35 14-70z"/>
 	</svg

src/Bridges/DITracy/panel.latte

@@ -1,4 +1,10 @@
 {use Tracy\Dumper}
+{varType array<string, string> $services}
+{varType array<string, array<int, list<string>>> $wiring}
+{varType array<string, object> $instances}
+{varType array<string, array<string, mixed>> $tags}
+{varType array<string, mixed>|null $parameters}
+{varType string $file}
 
 <style class="tracy-debug">
 	#tracy-debug .nette-ContainerPanel table {
@@ -43,10 +49,10 @@
 				{do $name = (string) $name}
 				{do $autowired = in_array($name, array_merge($wiring[$type][0] ?? [], $wiring[$type][1] ?? []), strict: true)}
 				<tr>
-					<td class="{isset($instances[$name]) ? created : ''}">
+					<td class={isset($instances[$name]) ? created : ''}>
 						{if is_numeric($name)}<small>{$name}</small>{else}{$name}{/if}
 					</td>
-					<td class="{$autowired ? yes : ''}">
+					<td class={$autowired ? yes : ''}>
 						{$autowired ? yes : (isset($wiring[$type]) ? no : '?')}
 					</td>
 					<td>

src/Bridges/DITracy/tab.latte

@@ -1,3 +1,4 @@
+{varType ?float $elapsedTime}
 <span title="Nette DI Container">
 	<svg viewBox="0 0 2048 2048">
 		<path fill="#ae7c21" d="m1675 690.55v-125c0-36-4-60-13-71-9-12-26-18-52-18s-43 6-52 17c-8 11-12 36-12 72v910.62c0 37 4 61 12 72 9 11 26 17 52 17s44-6 52-17c9-12 13-36 13-72v-207h243v165c0 86-4 148-12 187-8 38-21 70-39 96-20 28-45 48-77 59-31 11-87 16-170 16-96 0-161-5-196-16-34-11-63-31-86-59-21-26-36-59-45-97-9-39-14-101-14-186v-826.62c0-85 4-147 13-185s25-71 46-97c23-29 54-49 92-60s102-17 189-17c75 0 130 6 164 17s61 30 81 59c19 26 33 59 41 99 8 39 12 101 12 185v84zm-524 1086.6h-254v-1514.6h254zm-1025 0v-1514.6h316c127 0 212 27 257 81 44 53 66 159 66 316v721.62c0 157-22 263-66 317-44 53-130 80-257 80zm388-314v-884.62c0-35-4-58-13-70-9-11-26-17-53-17h-66v1058.6h66c26 0 44-6 53-17 9-12 14-35 14-70z"/>

src/DI/Compiler.php

@@ -9,7 +9,7 @@
 
 use Nette;
 use Nette\Schema;
-use function array_diff_key, array_filter, array_keys, array_merge, assert, count, implode, key, sprintf, strtolower;
+use function array_diff_key, array_filter, array_keys, array_merge, array_values, assert, count, implode, key, sprintf, strtolower;
 
 
 /**
@@ -268,7 +268,9 @@ private function processBeforeCompile(): void
 
 		foreach ($this->extensions as $extension) {
 			$extension->beforeCompile();
-			$this->dependencies->add([(new \ReflectionClass($extension))->getFileName()]);
+			if ($file = (new \ReflectionClass($extension))->getFileName()) {
+				$this->dependencies->add([$file]);
+			}
 		}
 
 		$this->builder->complete();
@@ -288,7 +290,7 @@ private function processSchema(Schema\Schema $schema, array $configs, ?string $n
 			$context->dynamics = &$this->extensions[self::Parameters]->dynamicValidators;
 		};
 		try {
-			$res = $processor->processMultiple($schema, $configs);
+			$res = $processor->processMultiple($schema, array_values($configs));
 		} catch (Schema\ValidationException $e) {
 			throw new Nette\DI\InvalidConfigurationException($e->getMessage());
 		}
@@ -326,7 +328,7 @@ public function loadDefinitionsFromConfig(array $configList): void
 		$configList = Helpers::expand($configList, $this->builder->parameters);
 		$extension = $this->extensions[self::Services];
 		assert($extension instanceof Extensions\ServicesExtension);
-		$extension->loadDefinitions($this->processSchema($extension->getConfigSchema(), [$configList]));
+		$extension->loadDefinitions((array) $this->processSchema($extension->getConfigSchema(), [$configList]));
 	}
 
 

src/DI/CompilerExtension.php

@@ -74,7 +74,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 	public function validateConfig(array $expected, ?array $config = null, ?string $name = null): array
 	{
 		if (func_num_args() === 1) {
-			return $this->config = $this->validateConfig($expected, $this->config);
+			return $this->config = $this->validateConfig($expected, (array) $this->config);
 		}
 
 		if ($extra = array_diff_key((array) $config, $expected)) {

src/DI/Config/Adapters/NeonAdapter.php

@@ -13,7 +13,7 @@
 use Nette\DI\Definitions\Statement;
 use Nette\Neon;
 use Nette\Neon\Node;
-use function array_walk_recursive, constant, count, defined, implode, is_array, is_string, ltrim, preg_match, preg_replace, sprintf, str_contains, str_ends_with, str_starts_with, substr;
+use function array_values, array_walk_recursive, constant, count, defined, implode, is_array, is_string, ltrim, preg_match, preg_replace, sprintf, str_contains, str_ends_with, str_starts_with, substr;
 
 
 /**
@@ -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;
 	}
 
 
@@ -192,6 +194,8 @@ private function removeUnderscoreVisitor(Node $node): void
 				$index = true;
 			}
 		}
+
+		$node->attributes = array_values($node->attributes);
 	}
 
 

src/DI/Config/Loader.php

@@ -116,9 +116,12 @@ private function getAdapter(string $file): Adapter
 			throw new Nette\InvalidArgumentException(sprintf("Unknown file extension '%s'.", $file));
 		}
 
-		return is_object($this->adapters[$extension])
-			? $this->adapters[$extension]
-			: new $this->adapters[$extension];
+		$adapter = $this->adapters[$extension];
+		if ($adapter instanceof Adapter) {
+			return $adapter;
+		}
+
+		return new $adapter;
 	}