Fix legacy tests

zircote · May 6, 2022 · d59d1e2 · d59d1e2
1 parent a2605af
commit d59d1e2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/Analysers/ReflectionAnalyser.php b/src/Analysers/ReflectionAnalyser.php
@@ -112,6 +112,10 @@ protected function analyzeFqdn(string $fqdn, Analysis $analysis, array $details)
         $definition[$contextType == 'class' ? 'implements' : 'extends'] = array_map($normaliseClass, $details['interfaces']);
         $definition['traits'] = array_map($normaliseClass, $details['traits']);
 
+        foreach ($this->annotationFactories as $annotationFactory) {
+            $analysis->addAnnotations($annotationFactory->build($rc, $context), $context);
+        }
+
         foreach ($rc->getMethods() as $method) {
             if (in_array($method->name, $details['methods'])) {
                 $definition['methods'][$method->getName()] = $ctx = new Context([
@@ -174,10 +178,6 @@ protected function analyzeFqdn(string $fqdn, Analysis $analysis, array $details)
             }
         }
 
-        foreach ($this->annotationFactories as $annotationFactory) {
-            $analysis->addAnnotations($annotationFactory->build($rc, $context), $context);
-        }
-
         $addDefinition = 'add' . ucfirst($contextType) . 'Definition';
         $analysis->{$addDefinition}($definition);
 

diff --git a/src/Processors/DocBlockDescriptions.php b/src/Processors/DocBlockDescriptions.php
@@ -49,7 +49,7 @@ public function __invoke(Analysis $analysis)
         }
     }
 
-    private function description($annotation): void
+    protected function description($annotation): void
     {
         if (!Generator::isDefault($annotation->description)) {
             if ($annotation->description === null) {
@@ -61,7 +61,7 @@ private function description($annotation): void
         $annotation->description = $annotation->_context->phpdocContent();
     }
 
-    private function summaryAndDescription($annotation): void
+    protected function summaryAndDescription($annotation): void
     {
         $ignoreSummary = !Generator::isDefault($annotation->summary);
         $ignoreDescription = !Generator::isDefault($annotation->description);

diff --git a/tests/Analysers/ReflectionAnalyserTest.php b/tests/Analysers/ReflectionAnalyserTest.php
@@ -53,9 +53,9 @@ public function testClassInheritance(): void
         $analyser->fromFqdn(ExtendsClass::class, new Analysis([], $this->getContext()));
 
         $expected = [
+            'OpenApi\Tests\Fixtures\PHP\Inheritance\ExtendsClass',
             'extendsClassFunc',
             'extendsClassProp',
-            'OpenApi\Tests\Fixtures\PHP\Inheritance\ExtendsClass',
         ];
         $this->assertEquals($expected, array_keys($annotationFactory->reflectors));
     }
@@ -66,9 +66,9 @@ public function testTraitInheritance(): void
         $analyser->fromFqdn(ExtendsTrait::class, new Analysis([], $this->getContext()));
 
         $expected = [
+            'OpenApi\Tests\Fixtures\PHP\Inheritance\ExtendsTrait',
             'extendsTraitFunc',
             'extendsTraitProp',
-            'OpenApi\Tests\Fixtures\PHP\Inheritance\ExtendsTrait',
         ];
         $this->assertEquals($expected, array_keys($annotationFactory->reflectors));
     }

diff --git a/tests/Processors/ExpandClassesTest.php b/tests/Processors/ExpandClassesTest.php
@@ -56,7 +56,7 @@ public function testExpandClasses(): void
         /** @var Schema[] $schemas */
         $schemas = $analysis->getAnnotationsOfType(Schema::class);
         $this->assertCount(4, $schemas);
-        $childSchema = $schemas[1];
+        $childSchema = $schemas[0];
         $this->assertSame('Child', $childSchema->schema);
         $this->assertCount(1, $childSchema->properties);
 
@@ -87,7 +87,7 @@ public function testExpandClassesWithoutDocBlocks(): void
         /** @var Schema[] $schemas */
         $schemas = $analysis->getAnnotationsOfType(Schema::class);
         $this->assertCount(2, $schemas);
-        $childSchema = $schemas[1];
+        $childSchema = $schemas[0];
         $this->assertSame('ChildWithDocBlocks', $childSchema->schema);
         $this->assertCount(1, $childSchema->properties);