Merge pull request #804 from DerManoMann/traits-inheriting-traits

Allow traits also to inherit traits
zircote · Jul 5, 2020 · b0719f1 · b0719f1
2 parents dc393e7 + 6781d4f
commit b0719f1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/Examples/using-traits/using-traits-inherit.yaml b/Examples/using-traits/using-traits-inherit.yaml
@@ -23,11 +23,16 @@ components:
   schemas:
     BellsAndWhistles:
       title: 'Bells and Whistles trait'
-      properties:
-        plating:
-          description: 'The plating.'
-          example: gold
-      type: object
+      allOf:
+        -
+          $ref: '#/components/schemas/Bells'
+        -
+          $ref: '#/components/schemas/Whistles'
+        -
+          properties:
+            plating:
+              description: 'The plating.'
+              example: gold
     Blink:
       title: 'Blink trait'
       properties:

diff --git a/src/Analysis.php b/src/Analysis.php
@@ -275,22 +275,22 @@ public function getInterfacesOfClass($class, $direct = false)
     }
 
     /**
-     * Get the list of traits used by the given class or by classes which it extends.
+     * Get the list of traits used by the given class/trait or by classes which it extends.
      *
-     * @param string $class The class name.
+     * @param string $source The source name.
      * @param bool   $direct  Flag to find only the actual class traits.
      * @return array Map of class => definition pairs of traits.
      */
-    public function getTraitsOfClass($class, $direct = false)
+    public function getTraitsOfClass($source, $direct = false)
     {
-        $classes = $direct ? [] : array_keys($this->getSuperClasses($class));
+        $sources = $direct ? [] : array_keys($this->getSuperClasses($source));
         // add self
-        $classes[] = $class;
+        $sources[] = $source;
 
         $definitions = [];
-        foreach ($classes as $clazz) {
-            if (isset($this->classes[$clazz])) {
-                $definition = $this->classes[$clazz];
+        foreach ($sources as $sourze) {
+            if (isset($this->classes[$sourze]) || isset($this->traits[$sourze])) {
+                $definition = isset($this->classes[$sourze]) ? $this->classes[$sourze] : $this->traits[$sourze];
                 if (isset($definition['traits'])) {
                     foreach ($definition['traits'] as $trait) {
                         if (array_key_exists($trait, $this->traits)) {

diff --git a/src/Processors/InheritTraits.php b/src/Processors/InheritTraits.php
@@ -12,8 +12,9 @@ public function __invoke(Analysis $analysis)
     {
         $schemas = $analysis->getAnnotationsOfType(Schema::class);
         foreach ($schemas as $schema) {
-            if ($schema->_context->is('class')) {
-                if ($traits = $analysis->getTraitsOfClass($schema->_context->fullyQualifiedName($schema->_context->class), true)) {
+            if ($schema->_context->is('class') || $schema->_context->is('trait')) {
+                $source = $schema->_context->class ?: $schema->_context->trait;
+                if ($traits = $analysis->getTraitsOfClass($schema->_context->fullyQualifiedName($source), true)) {
                     if ($schema->allOf === UNDEFINED) {
                         $schema->allOf = [];
                     }