Fix merge conflict

zircote · Nov 1, 2022 · c5c0d26 · c5c0d26
1 parent 3b52333
commit c5c0d26
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Processors/ExpandTraits.php b/src/Processors/ExpandTraits.php
@@ -44,7 +44,7 @@ public function __invoke(Analysis $analysis)
         }
 
         foreach ($schemas as $schema) {
-            if ($schema->_context->is('class') && !$schema->_aux) {
+            if ($schema->_context->is('class') && !$schema->_context->is('generated')) {
                 // look at class traits
                 $traits = $analysis->getTraitsOfClass($schema->_context->fullyQualifiedName($schema->_context->class), true);
                 $existing = [];