Add JSONModelInterface to schema instead of adding it in the template

Author: wol-soft

src/Model/Schema.php

@@ -4,6 +4,7 @@
 
 namespace PHPModelGenerator\Model;
 
+use PHPModelGenerator\Interfaces\JSONModelInterface;
 use PHPModelGenerator\Model\Property\PropertyInterface;
 use PHPModelGenerator\Model\SchemaDefinition\SchemaDefinitionDictionary;
 use PHPModelGenerator\Model\Validator\PropertyValidatorInterface;
@@ -55,6 +56,8 @@ public function __construct(string $classPath, string $className, SchemaDefiniti
         $this->className = $className;
         $this->classPath = $classPath;
         $this->schemaDefinitionDictionary = $dictionary ?? new SchemaDefinitionDictionary('');
+
+        $this->addInterface(JSONModelInterface::class);
     }
 
     /**

src/Templates/Model.phptpl

@@ -16,14 +16,9 @@ declare(strict_types = 1);
  * Class {{ class }}
 {% if namespace %} * @package {{ namespace }} {% endif %}
  */
-class {{ class }} implements \PHPModelGenerator\Interfaces\JSONModelInterface
-{% foreach schema.getInterfaces() as interface %}
-    , {{ viewHelper.getSimpleClassName(interface) }}
-{% endforeach %}
+class {{ class }} {% if schema.getInterfaces() %}implements {{ viewHelper.joinClassNames(schema.getInterfaces()) }}{% endif %}
 {
-    {% foreach schema.getTraits() as trait %}
-        use {{ viewHelper.getSimpleClassName(trait) }};
-    {% endforeach %}
+    {% if schema.getTraits() %}use {{ viewHelper.joinClassNames(schema.getTraits()) }};{% endif %}
 
     {% foreach schema.getProperties() as property %}
         /**{% if viewHelper.getTypeHintAnnotation(property, true) %} @var {{ viewHelper.getTypeHintAnnotation(property, true) }}{% endif %}{% if property.getDescription() %} {{ property.getDescription() }}{% endif %} */

src/Utils/RenderHelper.php

@@ -60,6 +60,16 @@ public function getSimpleClassName(string $fqcn): string
         return end($parts);
     }
 
+    /**
+     * @param array $fqcns
+     *
+     * @return string
+     */
+    public function joinClassNames(array $fqcns): string
+    {
+        return join(', ', array_map([$this, 'getSimpleClassName'], $fqcns));
+    }
+
     /**
      * Resolve all associated decorators of a property
      *