Make static analysers happier.

baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.20.0@3f284e96c9d9be6fe6b15c79416e1d1903dcfef4">
+<files psalm-version="5.23.0@005e3184fb6de4350a873b9b8c4dc3cede9db762">
   <file src="src/Contract/Result/OutputResult.php">
     <InvalidReturnStatement>
       <code><![CDATA[array_key_exists($type, $this->rules) ? array_values($this->rules[$type]) : []]]></code>
@@ -10,19 +10,32 @@
   </file>
   <file src="src/Core/Ast/AstMap/ClassLike/ClassLikeToken.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Core/Ast/AstMap/Function/FunctionToken.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
   </file>
-  <file src="src/Core/Ast/Parser/TypeScope.php">
+  <file src="src/Core/Ast/Parser/Extractors/ClassMethodExtractor.php">
+    <RedundantCondition>
+      <code><![CDATA[$resolvedPhpDoc->getThrowsTag()?->getType()->getReferencedClasses()]]></code>
+    </RedundantCondition>
+    <TypeDoesNotContainNull>
+      <code><![CDATA[[]]]></code>
+    </TypeDoesNotContainNull>
+  </file>
+  <file src="src/Core/Ast/Parser/NikicPhpParser/TypeScope.php">
     <RiskyTruthyFalsyComparison>
-      <code>$alias</code>
+      <code><![CDATA[$alias]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
+  <file src="src/Core/Ast/Parser/PhpStanParser/PhpStanTypeResolver.php">
+    <NamedArgumentNotAllowed>
+      <code><![CDATA[array_map(static fn ($type): array => self::resolveType($type, $scope), $type->types)]]></code>
+    </NamedArgumentNotAllowed>
+  </file>
   <file src="src/Core/Layer/Collector/BoolCollector.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$configuration['must']]]></code>
@@ -31,7 +44,7 @@
   </file>
   <file src="src/Core/Layer/Collector/ComposerFilesParser.php">
     <InvalidReturnStatement>
-      <code>$lockedPackages</code>
+      <code><![CDATA[$lockedPackages]]></code>
     </InvalidReturnStatement>
     <InvalidReturnType>
       <code><![CDATA[array<string, array{
@@ -42,32 +55,32 @@
   </file>
   <file src="src/Core/Layer/Collector/DirectoryCollector.php">
     <ArgumentTypeCoercion>
-      <code>$validatedPattern</code>
+      <code><![CDATA[$validatedPattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Core/Layer/Collector/GlobCollector.php">
     <ArgumentTypeCoercion>
-      <code>$validatedPattern</code>
+      <code><![CDATA[$validatedPattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Core/Layer/Collector/MethodCollector.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Core/Layer/Collector/RegexCollector.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Core/Layer/Collector/TagValueRegexCollector.php">
     <ArgumentTypeCoercion>
-      <code>$pattern</code>
+      <code><![CDATA[$pattern]]></code>
     </ArgumentTypeCoercion>
   </file>
   <file src="src/Supportive/Console/Command/DebugLayerRunner.php">
     <RiskyTruthyFalsyComparison>
-      <code>$layer</code>
+      <code><![CDATA[$layer]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
 </files>

phpstan-baseline.neon

@@ -10,21 +10,6 @@ parameters:
 			count: 1
 			path: src/Contract/Result/OutputResult.php
 
-		-
-			message: "#^Parameter \\#1 \\$array \\(list\\<string\\>\\) of array_values is already a list, call has no effect\\.$#"
-			count: 1
-			path: src/Core/Analyser/LayerForTokenAnalyser.php
-
-		-
-			message: "#^Parameter \\#1 \\$array \\(list\\<string\\>\\) of array_values is already a list, call has no effect\\.$#"
-			count: 1
-			path: src/Core/Analyser/TokenInLayerAnalyser.php
-
-		-
-			message: "#^Parameter \\#1 \\$array \\(list\\<string\\>\\) of array_values is already a list, call has no effect\\.$#"
-			count: 1
-			path: src/Core/Analyser/UnassignedTokenAnalyser.php
-
 		-
 			message: "#^Method Qossmic\\\\Deptrac\\\\Core\\\\Ast\\\\AstMap\\\\ReferenceBuilder\\:\\:superglobal\\(\\) throws checked exception TypeError but it's missing from the PHPDoc @throws tag\\.$#"
 			count: 1

src/Core/Ast/Parser/Extractors/PropertyExtractor.php

@@ -89,11 +89,9 @@ public function processNodeWithPhpStanScope(Node $node, ReferenceBuilder $refere
             $function = $scope->getFunction();
             $resolvedPhpDoc = $fileTypeMapper->getResolvedPhpDoc(
                 $scope->getFile(),
-                $scope->isInClass() ? $scope->getClassReflection()
-                    ->getName() : null,
-                $scope->isInTrait() ? $scope->getTraitReflection()
-                    ->getName() : null,
-                null !== $function ? $function->getName() : null,
+                $scope->getClassReflection()?->getName(),
+                $scope->getTraitReflection()?->getName(),
+                $function?->getName(),
                 $docComment->getText(),
             );
 

src/Core/Ast/Parser/Extractors/VariableExtractor.php

@@ -80,11 +80,9 @@ public function processNodeWithPhpStanScope(Node $node, ReferenceBuilder $refere
             $function = $scope->getFunction();
             $resolvedPhpDoc = $fileTypeMapper->getResolvedPhpDoc(
                 $scope->getFile(),
-                $scope->isInClass() ? $scope->getClassReflection()
-                    ->getName() : null,
-                $scope->isInTrait() ? $scope->getTraitReflection()
-                    ->getName() : null,
-                null !== $function ? $function->getName() : null,
+                $scope->getClassReflection()?->getName(),
+                $scope->getTraitReflection()?->getName(),
+                $function?->getName(),
                 $docComment->getText(),
             );
 

tests/Core/Ast/AstMapFlattenGeneratorTest.php

@@ -18,13 +18,8 @@
 use Qossmic\Deptrac\Core\Ast\AstMap\ClassLike\ClassLikeToken;
 use Qossmic\Deptrac\Core\Ast\Parser\Cache\AstFileReferenceInMemoryCache;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\ClassExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\ClassMethodExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\InterfaceExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\NewExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\PropertyExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\VariableExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\NikicPhpParser\NikicPhpParser;
-use Qossmic\Deptrac\Core\Ast\Parser\NikicPhpParser\NikicTypeResolver;
 use Qossmic\Deptrac\Core\Ast\Parser\ParserInterface;
 use Qossmic\Deptrac\Core\Ast\Parser\PhpStanParser\PhpStanContainerDecorator;
 use Qossmic\Deptrac\Core\Ast\Parser\PhpStanParser\PhpStanParser;
@@ -76,16 +71,16 @@ protected function setUp(): void
     public static function createParser(): array
     {
         $phpStanContainer = new PhpStanContainerDecorator('', []);
-        $extractors       = [
+        $extractors = [
             new ClassExtractor(),
             new InterfaceExtractor(),
         ];
-        $cache            = new AstFileReferenceInMemoryCache();
-        $parser           = new NikicPhpParser(
+        $cache = new AstFileReferenceInMemoryCache();
+        $parser = new NikicPhpParser(
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()), $cache, $extractors
         );
 
-        $phpstanParser    = new PhpStanParser($phpStanContainer, $cache, $extractors);
+        $phpstanParser = new PhpStanParser($phpStanContainer, $cache, $extractors);
 
         return [
             'Nikic Parser' => [$parser],

tests/Core/Ast/AstMapGeneratorTest.php

@@ -16,17 +16,12 @@
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\AnonymousClassExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\ClassConstantExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\ClassExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\ClassMethodExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\GroupUseExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\NewExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\PropertyExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\TraitUseExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\Extractors\UseExtractor;
-use Qossmic\Deptrac\Core\Ast\Parser\Extractors\VariableExtractor;
 use Qossmic\Deptrac\Core\Ast\Parser\NikicPhpParser\NikicPhpParser;
 use Qossmic\Deptrac\Core\Ast\Parser\NikicPhpParser\NikicTypeResolver;
 use Qossmic\Deptrac\Core\Ast\Parser\ParserInterface;
-use Qossmic\Deptrac\Core\Ast\Parser\PhpStanParser\PhpStanContainerDecorator;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Tests\Qossmic\Deptrac\Core\Ast\Fixtures\BasicDependency\BasicDependencyClassB;
 use Tests\Qossmic\Deptrac\Core\Ast\Fixtures\BasicDependency\BasicDependencyClassC;
@@ -56,8 +51,9 @@ public static function createParser(): array
                 new TraitUseExtractor($typeResolver),
             ]
         );
+
         return [
-            'Nikic Parser' => [$parser]
+            'Nikic Parser' => [$parser],
         ];
     }
 
@@ -145,7 +141,7 @@ static function (DependencyToken $dependency) {
 
     private function getAstMap(ParserInterface $parser, string $fixture): AstMap
     {
-        $astRunner    = new AstLoader(
+        $astRunner = new AstLoader(
             $parser,
             new EventDispatcher()
         );

tests/Core/Ast/Parser/AnnotationReferenceExtractorTest.php

@@ -89,19 +89,19 @@ public function testPropertyDependencyResolving(ParserInterface $parser): void
      */
     public static function createParser(): array
     {
-        $typeResolver     = new NikicTypeResolver();
+        $typeResolver = new NikicTypeResolver();
         $phpStanContainer = new PhpStanContainerDecorator('', []);
-        $cache            = new AstFileReferenceInMemoryCache();
-        $extractors       = [
+        $cache = new AstFileReferenceInMemoryCache();
+        $extractors = [
             new PropertyExtractor($phpStanContainer, $typeResolver),
             new VariableExtractor($phpStanContainer, $typeResolver),
             new ClassMethodExtractor($phpStanContainer, $typeResolver),
             new NewExtractor($typeResolver),
         ];
-        $nikicPhpParser   = new NikicPhpParser(
+        $nikicPhpParser = new NikicPhpParser(
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()), $cache, $extractors
         );
-        
+
         $phpstanParser = new PhpStanParser($phpStanContainer, $cache, $extractors);
 
         return [

tests/Core/Ast/Parser/AnonymousClassExtractorTest.php

@@ -22,16 +22,15 @@ final class AnonymousClassExtractorTest extends TestCase
     public static function createParser(): array
     {
         $phpStanContainer = new PhpStanContainerDecorator('', []);
-        $cache      = new AstFileReferenceInMemoryCache();
+        $cache = new AstFileReferenceInMemoryCache();
         $extractors = [
             new AnonymousClassExtractor(),
         ];
-        $nikicPhpParser     = new NikicPhpParser(
+        $nikicPhpParser = new NikicPhpParser(
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()), $cache, $extractors
         );
         $phpstanParser = new PhpStanParser($phpStanContainer, $cache, $extractors);
 
-
         return [
             'Nikic Parser' => [$nikicPhpParser],
             'PHPStan Parser' => [$phpstanParser],

tests/Core/Ast/Parser/ClassConstantExtractorTest.php

@@ -46,14 +46,14 @@ public function testPropertyDependencyResolving(ParserInterface $parser): void
     public static function createParser(): array
     {
         $phpStanContainer = new PhpStanContainerDecorator('', []);
-        $extractors       = [
+        $extractors = [
             new ClassConstantExtractor(),
         ];
-        $cache            = new AstFileReferenceInMemoryCache();
-        $parser           = new NikicPhpParser(
+        $cache = new AstFileReferenceInMemoryCache();
+        $parser = new NikicPhpParser(
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()), $cache, $extractors
         );
-        $phpstanParser    = new PhpStanParser($phpStanContainer, $cache, $extractors);
+        $phpstanParser = new PhpStanParser($phpStanContainer, $cache, $extractors);
 
         return [
             'Nikic Parser' => [$parser],

tests/Core/Ast/Parser/ClassDocBlockExtractorTest.php

@@ -51,11 +51,11 @@ public static function createParser(): array
     {
         $typeResolver = new NikicTypeResolver();
         $phpStanContainer = new PhpStanContainerDecorator('', []);
-        $extractors   = [
+        $extractors = [
             new ClassLikeExtractor($typeResolver),
         ];
-        $cache        = new AstFileReferenceInMemoryCache();
-        $parser       = new NikicPhpParser(
+        $cache = new AstFileReferenceInMemoryCache();
+        $parser = new NikicPhpParser(
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()), $cache, $extractors
         );
         $phpstanParser = new PhpStanParser($phpStanContainer, $cache, $extractors);

tests/Core/Ast/Parser/ParserTest.php

@@ -123,13 +123,13 @@ public static function createParser(): array
         $typeResolver = new NikicTypeResolver();
         $phpStanContainer = new PhpStanContainerDecorator('', []);
 
-        $cache          = new AstFileReferenceInMemoryCache();
-        $extractors     = [
+        $cache = new AstFileReferenceInMemoryCache();
+        $extractors = [
             new UseExtractor(),
             new ClassLikeExtractor($typeResolver),
         ];
         $nikicPhpParser = new NikicPhpParser(
-               (new ParserFactory())->create(
+            (new ParserFactory())->create(
                 ParserFactory::ONLY_PHP7,
                 new Lexer()
             ), $cache, $extractors