Sépare le décorateur inheritance en plusieurs morceaux.

Command/GenerateCommand.php

@@ -15,7 +15,9 @@ use Irstea\PlantUmlBundle\Model\ClassVisitor;
 use Irstea\PlantUmlBundle\Model\Decorator\CompositeDecorator;
 use Irstea\PlantUmlBundle\Model\Decorator\FilteringDecorator;
 use Irstea\PlantUmlBundle\Model\Decorator\InheritanceDecorator;
+use Irstea\PlantUmlBundle\Model\Decorator\InterfaceDecorator;
 use Irstea\PlantUmlBundle\Model\Decorator\NullDecorator;
+use Irstea\PlantUmlBundle\Model\Decorator\TraitDecorator;
 use Irstea\PlantUmlBundle\Model\DecoratorInterface;
 use Irstea\PlantUmlBundle\Model\Filter\AcceptAllFilter;
 use Irstea\PlantUmlBundle\Model\Filter\Composite\AllFilter;
@@ -208,6 +210,12 @@ class GenerateCommand extends ContainerAwareCommand
                 case 'inheritance':
                     $decorators[] = new InheritanceDecorator();
                     break;
+                case 'interfaces':
+                    $decorators[] = new InterfaceDecorator();
+                    break;
+                case 'traits':
+                    $decorators[] = new TraitDecorator();
+                    break;
                 case 'entity':
                     $decorators[] = new EntityDecorator($this->entityManager->getMetadataFactory());
                     break;

DependencyInjection/Configuration.php

@@ -85,9 +85,9 @@ class Configuration implements ConfigurationInterface
                         ->addDefaultsIfNotSet()
                         ->children()
                             ->arrayNode('decorators')
-                                ->defaultValue(['inheritance', 'entity', 'associations', 'properties', 'methods'])
+                                ->defaultValue(['inheritance', 'traits', 'interfaces', 'entity', 'associations', 'properties', 'methods'])
                                 ->prototype('enum')
-                                    ->values(['inheritance', 'entity', 'associations', 'properties', 'methods'])
+                                    ->values(['inheritance', 'traits', 'interfaces', 'entity', 'associations', 'properties', 'methods'])
                                 ->end()
                             ->end()
                             ->append($this->buildFilterNode('include'))

Model/Decorator/AbstractRelationDecorator.php

+<?php
+
+/*
+ * © 2016 IRSTEA
+ * Guillaume Perréal <guillaume.perreal@irstea.fr>
+ * Tous droits réservés.
+ */
+
+namespace Irstea\PlantUmlBundle\Model\Decorator;
+
+use Irstea\PlantUmlBundle\Model\ArrowInterface;
+use Irstea\PlantUmlBundle\Model\ClassVisitorInterface;
+use Irstea\PlantUmlBundle\Model\DecoratorInterface;
+use Irstea\PlantUmlBundle\Model\NodeInterface;
+
+/**
+ * Description of InheritanceDecorator
+ *
+ * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
+ */
+abstract class AbstractRelationDecorator implements DecoratorInterface
+{
+    /**
+     * @param NodeInterface $source
+     * @param array $classNames
+     * @param ClassVisitorInterface $visitor
+     */
+    protected function visitRelations(NodeInterface $source, array $classNames, ClassVisitorInterface $visitor)
+    {
+        foreach ($classNames as $className) {
+            $target = $visitor->visitClass($className);
+            if ($target) {
+                $source->addArrow($this->buildRelation($source, $target));
+            }
+        }
+    }
+
+    /**
+     * @param NodeInterface $source
+     * @param NodeInterface $target
+     * @return ArrowInterface
+     */
+    abstract protected function buildRelation(NodeInterface $source, NodeInterface $target);
+}

Model/Decorator/InheritanceDecorator.php

@@ -8,6 +8,7 @@
 
 namespace Irstea\PlantUmlBundle\Model\Decorator;
 
+use Irstea\PlantUmlBundle\Model\Arrow\ExtendsClass;
 use Irstea\PlantUmlBundle\Model\ClassVisitor;
 use Irstea\PlantUmlBundle\Model\ClassVisitorInterface;
 use Irstea\PlantUmlBundle\Model\DecoratorInterface;
@@ -19,45 +20,18 @@ use ReflectionClass;
  *
  * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
  */
-class InheritanceDecorator implements DecoratorInterface
+class InheritanceDecorator extends AbstractRelationDecorator
 {
     public function decorate(ReflectionClass $class, NodeInterface $node, ClassVisitorInterface $visitor)
     {
         $parent = $class->getParentClass();
-        $traits = $class->getTraitNames();
-        $interfaces = $class->getInterfaceNames();
-
-        $indirectInterfaces = array_filter(
-            array_map(
-                function ($i) { return $i->getInterfaceNames(); },
-                $class->getInterfaces()
-            )
-        );
-
-        if (!empty($indirectInterfaces)) {
-            $indirectInterfaces = call_user_func_array('array_merge', $indirectInterfaces);
-            $interfaces = array_diff($interfaces, $indirectInterfaces);
-        }
-
         if ($parent) {
-            $traits = array_diff($traits, $parent->getTraitNames());
-            $interfaces = array_diff($interfaces, $parent->getInterfaceNames());
-            $this->visitRelations($node, [$parent->getName()], 'Irstea\PlantUmlBundle\Model\Arrow\ExtendsClass', $visitor);
+            $this->visitRelations($node, [$parent->getName()], $visitor);
         }
-
-        $this->visitRelations($node, $interfaces, 'Irstea\PlantUmlBundle\Model\Arrow\ImplementsInterface', $visitor);
-        $this->visitRelations($node, $traits, 'Irstea\PlantUmlBundle\Model\Arrow\UsesTrait', $visitor);
-
-        return $this;
     }
 
-    protected function visitRelations(NodeInterface $source, array $classNames, $relationClass, ClassVisitorInterface $visitor)
+    protected function buildRelation(NodeInterface $source, NodeInterface $target)
     {
-        foreach ($classNames as $className) {
-            $target = $visitor->visitClass($className);
-            if ($target) {
-                $source->addArrow(new $relationClass($source, $target));
-            }
-        }
+        return new ExtendsClass($source, $target);
     }
 }

Model/Decorator/InterfaceDecorator.php

+<?php
+
+/*
+ * © 2016 IRSTEA
+ * Guillaume Perréal <guillaume.perreal@irstea.fr>
+ * Tous droits réservés.
+ */
+
+namespace Irstea\PlantUmlBundle\Model\Decorator;
+
+use Irstea\PlantUmlBundle\Model\Arrow\ImplementsInterface;
+use Irstea\PlantUmlBundle\Model\ClassVisitorInterface;
+use Irstea\PlantUmlBundle\Model\DecoratorInterface;
+use Irstea\PlantUmlBundle\Model\NodeInterface;
+use ReflectionClass;
+
+/**
+ * Description of InheritanceDecorator
+ *
+ * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
+ */
+class InterfaceDecorator extends AbstractRelationDecorator
+{
+    public function decorate(ReflectionClass $class, NodeInterface $node, ClassVisitorInterface $visitor)
+    {
+        $interfaces = $class->getInterfaceNames();
+
+        $indirectInterfaces = array_filter(
+            array_map(
+                function ($i) { return $i->getInterfaceNames(); },
+                $class->getInterfaces()
+            )
+        );
+
+        if (!empty($indirectInterfaces)) {
+            $indirectInterfaces = call_user_func_array('array_merge', $indirectInterfaces);
+            $interfaces = array_diff($interfaces, $indirectInterfaces);
+        }
+
+        $parent = $class->getParentClass();
+        if ($parent) {
+            $interfaces = array_diff($interfaces, $parent->getInterfaceNames());
+        }
+
+        $this->visitRelations($node, $interfaces, $visitor);
+
+        return $this;
+    }
+
+    protected function buildRelation(NodeInterface $source, NodeInterface $target)
+    {
+        return new ImplementsInterface($source, $target);
+    }
+}

Model/Decorator/TraitDecorator.php

+<?php
+
+/*
+ * © 2016 IRSTEA
+ * Guillaume Perréal <guillaume.perreal@irstea.fr>
+ * Tous droits réservés.
+ */
+
+namespace Irstea\PlantUmlBundle\Model\Decorator;
+
+use Irstea\PlantUmlBundle\Model\Arrow\UsesTrait;
+use Irstea\PlantUmlBundle\Model\ClassVisitorInterface;
+use Irstea\PlantUmlBundle\Model\DecoratorInterface;
+use Irstea\PlantUmlBundle\Model\NodeInterface;
+use ReflectionClass;
+
+/**
+ * Description of InheritanceDecorator
+ *
+ * @author Guillaume Perréal <guillaume.perreal@irstea.fr>
+ */
+class TraitDecorator extends AbstractRelationDecorator
+{
+    public function decorate(ReflectionClass $class, NodeInterface $node, ClassVisitorInterface $visitor)
+    {
+        $traits = $class->getTraitNames();
+
+        $parent = $class->getParentClass();
+        if ($parent) {
+            $traits = array_diff($traits, $parent->getTraitNames());
+        }
+
+        $this->visitRelations($node, $traits, $visitor);
+
+        return $this;
+    }
+
+    protected function buildRelation(NodeInterface $source, NodeInterface $target)
+    {
+        return new UsesTrait($source, $target);
+    }
+}