Merge pull request #11 from yannickl88/master

Fixed issue with duplicate use statements and added return after NS line

src/CompoundGenerator.php

@@ -86,7 +86,7 @@ private function findUseStatementsForOptionalTraits(
                 );
             }
         }
-        return $result;
+        return array_unique($result, SORT_REGULAR); // remove any duplicate use statements
     }
     /**
      * Gives all the entities to be required in the compound interface
@@ -144,7 +144,12 @@ private function generateTrait(PackageClass $package_class, array $traits)
             array(
                 'class_name' => $short_name,
                 'namespace' => $generated_namespace,
-                'use_statements' => $traits
+                'use_statements' => array_filter(
+                    $traits,
+                    function (PackageClass $stmt) {
+                        return $stmt->isTrait();
+                    }
+                )
             )
         );
 

src/Resources/templates/traits.php.twig

@@ -1,7 +1,8 @@
 <?php
 namespace {{ namespace }};
-{%if use_statements | length %}
-{% for use_statement in use_statements if use_statement.isTrait() %}
+{% if use_statements | length %}
+
+{% for use_statement in use_statements %}
 use {{ use_statement.name}} as {{ use_statement.alias }};
 {% endfor %}
 {% endif %}
@@ -13,7 +14,7 @@ use {{ use_statement.name}} as {{ use_statement.alias }};
  */
 trait {{ class_name }}Traits
 {
-{% for use_statement in use_statements if use_statement.isTrait() %}
+{% for use_statement in use_statements %}
     use {{ use_statement.alias }};
 {% endfor %}
 }

test/CompoundEdgeCases/ContractTraits.php

@@ -1,5 +1,6 @@
 <?php
 namespace Hostnet\Contract\Entity\Generated;
+
 use Hostnet\Contract\Entity\ContractWhenClientTrait as HostnetContractEntityBecauseClient;
 
 /**