Fix edge cases around merging of attachables (#1366)

zircote · Dec 19, 2022 · 8b55d61 · 8b55d61
1 parent 7bd76a0
commit 8b55d61
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Analysers/AttributeAnnotationFactory.php b/src/Analysers/AttributeAnnotationFactory.php
@@ -96,11 +96,11 @@ public function build(\Reflector $reflector, Context $context): array
         // merge backwards into parents...
         $isParent = function (OA\AbstractAnnotation $annotation, OA\AbstractAnnotation $possibleParent): bool {
             // regular annotation hierarchy
-            $explicitParent = null !== $possibleParent::matchNested(get_class($annotation));
+            $explicitParent = null !== $possibleParent::matchNested(get_class($annotation)) && !$annotation instanceof OA\Attachable;
 
             $isParentAllowed = false;
             // support Attachable subclasses
-            if ($isAttachable = $annotation instanceof OAT\Attachable) {
+            if ($isAttachable = $annotation instanceof OA\Attachable) {
                 if (!$isParentAllowed = (null === $annotation->allowedParents())) {
                     // check for allowed parents
                     foreach ($annotation->allowedParents() as $allowedParent) {