Fix tests to accommodate internal_tag option

- fix construction of NikicPhpParser to include the new $config param - fix assertions of config handling to account for the new option
qossmic · Dec 14, 2023 · c905ffd · c905ffd
1 parent 524582e
commit c905ffd
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 23 deletions.
diff --git a/src/Core/Ast/Parser/NikicPhpParser/FileReferenceVisitor.php b/src/Core/Ast/Parser/NikicPhpParser/FileReferenceVisitor.php
@@ -54,7 +54,7 @@ public function __construct(
         $this->dependencyResolvers = $dependencyResolvers;
         $this->currentReference = $fileReferenceBuilder;
 
-        $this->internalTag = $config['internal_tag'] ?: null;
+        $this->internalTag = $config['internal_tag'] ?? null;
     }
 
     /**

diff --git a/tests/Core/Ast/AstMapFlattenGeneratorTest.php b/tests/Core/Ast/AstMapFlattenGeneratorTest.php
@@ -62,6 +62,7 @@ protected function setUp(): void
                 (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()),
                 new AstFileReferenceInMemoryCache(),
                 new TypeResolver(),
+                [],
                 []
             ),
             $this->eventDispatcher

diff --git a/tests/Core/Ast/AstMapGeneratorTest.php b/tests/Core/Ast/AstMapGeneratorTest.php
@@ -45,7 +45,8 @@ private function getAstMap(string $fixture): AstMap
                     new AnonymousClassExtractor(),
                     new ClassConstantExtractor(),
                     new KeywordExtractor($typeResolver),
-                ]
+                ],
+                []
             ),
             new EventDispatcher()
         );

diff --git a/tests/Core/Ast/Parser/AnnotationReferenceExtractorTest.php b/tests/Core/Ast/Parser/AnnotationReferenceExtractorTest.php
@@ -25,7 +25,8 @@ public function testPropertyDependencyResolving(): void
             [
                 new AnnotationReferenceExtractor($typeResolver),
                 new KeywordExtractor($typeResolver),
-            ]
+            ],
+            []
         );
 
         $filePath = __DIR__.'/Fixtures/AnnotationDependency.php';

diff --git a/tests/Core/Ast/Parser/AnonymousClassExtractorTest.php b/tests/Core/Ast/Parser/AnonymousClassExtractorTest.php
@@ -22,7 +22,8 @@ public function testPropertyDependencyResolving(): void
             new TypeResolver(),
             [
                 new AnonymousClassExtractor(),
-            ]
+            ],
+            []
         );
 
         $filePath = __DIR__.'/Fixtures/AnonymousClass.php';

diff --git a/tests/Core/Ast/Parser/ClassConstantExtractorTest.php b/tests/Core/Ast/Parser/ClassConstantExtractorTest.php
@@ -22,7 +22,8 @@ public function testPropertyDependencyResolving(): void
             new TypeResolver(),
             [
                 new ClassConstantExtractor(),
-            ]
+            ],
+            []
         );
 
         $filePath = __DIR__.'/Fixtures/ClassConst.php';

diff --git a/tests/Core/Ast/Parser/ClassDocBlockExtractorTest.php b/tests/Core/Ast/Parser/ClassDocBlockExtractorTest.php
@@ -32,7 +32,8 @@ public function testMethodResolving(): void
             $typeResolver,
             [
                 new KeywordExtractor($typeResolver),
-            ]
+            ],
+            []
         );
 
         $filePath = __DIR__.'/Fixtures/ClassDocBlockDependency.php';

diff --git a/tests/Core/Ast/Parser/NikicPhpParser/NikicPhpParserTest.php b/tests/Core/Ast/Parser/NikicPhpParser/NikicPhpParserTest.php
@@ -25,6 +25,7 @@ protected function setUp(): void
             $this->createMock(Parser::class),
             new AstFileReferenceInMemoryCache(),
             $this->createMock(TypeResolver::class),
+            [],
             []
         );
     }
@@ -42,6 +43,7 @@ public function testParseDoesNotIgnoreUsesByDefault(): void
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()),
             new AstFileReferenceInMemoryCache(),
             $typeResolver,
+            [],
             []
         );
 
@@ -59,6 +61,7 @@ public function testParseAttributes(): void
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()),
             new AstFileReferenceInMemoryCache(),
             $typeResolver,
+            [],
             []
         );
 
@@ -77,7 +80,8 @@ public function testParseTemplateTypes(): void
             (new ParserFactory())->create(ParserFactory::ONLY_PHP7, new Lexer()),
             new AstFileReferenceInMemoryCache(),
             $typeResolver,
-            [new AnnotationReferenceExtractor($typeResolver)]
+            [new AnnotationReferenceExtractor($typeResolver)],
+            []
         );
 
         $filePath = __DIR__.'/Fixtures/TemplateTypes.php';

diff --git a/tests/Core/Dependency/Emitter/EmitterTrait.php b/tests/Core/Dependency/Emitter/EmitterTrait.php
@@ -44,7 +44,8 @@ public function getEmittedDependencies(DependencyEmitterInterface $emitter, $fil
                 new StaticExtractor($typeResolver),
                 new FunctionCallResolver($typeResolver),
                 new VariableExtractor(),
-            ]
+            ],
+            []
         );
         $astMap = (new AstLoader($parser, new EventDispatcher()))->createAstMap($files);
         $result = new DependencyList();

diff --git a/tests/Supportive/DependencyInjection/DeptracExtensionTest.php b/tests/Supportive/DependencyInjection/DeptracExtensionTest.php
@@ -32,6 +32,14 @@ final class DeptracExtensionTest extends TestCase
         ],
     ];
 
+    private array $analyserDefaults = [
+        'internal_tag' => '@internal',
+        'types' => [
+            'class',
+            'function'
+        ],
+    ];
+
     protected function setUp(): void
     {
         parent::setUp();
@@ -52,7 +60,7 @@ public function testDefaults(): void
         self::assertSame([], $this->container->getParameter('ruleset'));
         self::assertSame([], $this->container->getParameter('skip_violations'));
         self::assertSame($this->formatterDefaults, $this->container->getParameter('formatters'));
-        self::assertSame(['types' => [EmitterType::CLASS_TOKEN->value, EmitterType::FUNCTION_TOKEN->value]], $this->container->getParameter('analyser'));
+        self::assertSame($this->analyserDefaults, $this->container->getParameter('analyser'));
         self::assertSame(true, $this->container->getParameter('ignore_uncovered_internal_classes'));
     }
 
@@ -70,7 +78,7 @@ public function testDefaultsWithEmptyRoot(): void
         self::assertSame([], $this->container->getParameter('ruleset'));
         self::assertSame([], $this->container->getParameter('skip_violations'));
         self::assertSame($this->formatterDefaults, $this->container->getParameter('formatters'));
-        self::assertSame(['types' => [EmitterType::CLASS_TOKEN->value, EmitterType::FUNCTION_TOKEN->value]], $this->container->getParameter('analyser'));
+        self::assertSame($this->analyserDefaults, $this->container->getParameter('analyser'));
         self::assertSame(true, $this->container->getParameter('ignore_uncovered_internal_classes'));
     }
 
@@ -307,10 +315,12 @@ public function testNullAnalyser(): void
             ],
         ];
 
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('The child config "types" under "deptrac.analyser" must be configured.');
-
         $this->extension->load($configs, $this->container);
+
+        self::assertSame(
+            $this->analyserDefaults,
+            $this->container->getParameter('analyser')
+        );
     }
 
     public function testEmptyAnalyser(): void
@@ -321,10 +331,12 @@ public function testEmptyAnalyser(): void
             ],
         ];
 
-        $this->expectException(InvalidConfigurationException::class);
-        $this->expectExceptionMessage('The child config "types" under "deptrac.analyser" must be configured.');
-
         $this->extension->load($configs, $this->container);
+
+        self::assertSame(
+            $this->analyserDefaults,
+            $this->container->getParameter('analyser')
+        );
     }
 
     public function testInvalidAnalyserTypes(): void
@@ -333,7 +345,7 @@ public function testInvalidAnalyserTypes(): void
             'deptrac' => [
                 'analyser' => [
                     'types' => ['invalid'],
-                ],
+                ] + $this->analyserDefaults,
             ],
         ];
 
@@ -349,14 +361,14 @@ public function testNullAnalyserTypes(): void
             'deptrac' => [
                 'analyser' => [
                     'types' => null,
-                ],
+                ] + $this->analyserDefaults,
             ],
         ];
 
         $this->extension->load($configs, $this->container);
 
         self::assertSame(
-            ['types' => []],
+            ['types' => []] + $this->analyserDefaults,
             $this->container->getParameter('analyser')
         );
     }
@@ -367,14 +379,14 @@ public function testEmptyAnalyserTypes(): void
             'deptrac' => [
                 'analyser' => [
                     'types' => [],
-                ],
+                ] + $this->analyserDefaults,
             ],
         ];
 
         $this->extension->load($configs, $this->container);
 
         self::assertSame(
-            ['types' => []],
+            ['types' => []] + $this->analyserDefaults,
             $this->container->getParameter('analyser')
         );
     }
@@ -385,14 +397,15 @@ public function testAnalyserWithDuplicateTypes(): void
             'deptrac' => [
                 'analyser' => [
                     'types' => [EmitterType::CLASS_TOKEN->value, EmitterType::CLASS_TOKEN->value],
-                ],
+                ] + $this->analyserDefaults,
             ],
         ];
 
         $this->extension->load($configs, $this->container);
 
         self::assertSame(
-            ['types' => [EmitterType::CLASS_TOKEN->value, EmitterType::CLASS_TOKEN->value]],
+            ['types' => [EmitterType::CLASS_TOKEN->value, EmitterType::CLASS_TOKEN->value]]
+                + $this->analyserDefaults,
             $this->container->getParameter('analyser')
         );
     }
@@ -527,4 +540,5 @@ public function testCodeclimateFormatterRequiresValidSeverity(): void
 
         $this->extension->load($configs, $this->container);
     }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,8 @@ public function testPropertyDependencyResolving(): void @@
                 [
                     new AnnotationReferenceExtractor($typeResolver),
                     new KeywordExtractor($typeResolver),
-                ]
+                ],
+                []
             );
             $filePath = __DIR__.'/Fixtures/AnnotationDependency.php';
@@ Expand Down @@