Each generated class implements the JSONModelInterface

Author: wol-soft

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 wol-soft
+Copyright (c) 2020 wol-soft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -12,7 +12,7 @@
     ],
     "require": {
         "symplify/easy-coding-standard": "^6.0.4",
-        "wol-soft/php-json-schema-model-generator-production": "^0.5.0",
+        "wol-soft/php-json-schema-model-generator-production": "^0.6.0",
         "wol-soft/php-micro-template": "^1.3.1",
 
         "php": ">=7.2",

docs/source/gettingStarted.rst

@@ -107,6 +107,8 @@ Now let's have a look at the behaviour of the generated model:
     // Exception: 'Value for age must not be smaller than 0'
     $person->setAge(-10);
 
+Each generated class will implement the interface **PHPModelGenerator\\Interfaces\\JSONModelInterface** implemented in the php-json-schema-model-generator-production repository and thus provide the method *getRawModelDataInput*.
+
 Configuring the generator
 -------------------------
 

src/Model/Validator/FilterValidator.php

@@ -40,6 +40,7 @@ public function __construct(FilterInterface $filter, PropertyInterface $property
                 ? '($value !== null && (!is_' . implode('($value) && !is_', $filter->getAcceptedTypes()) . '($value)))'
                 : ''
             ) . sprintf(
+                // Call the filter, afterwards make sure the condition is false so no exception will be thrown
                 ' || (($value = call_user_func([\%s::class, "%s"], $value)) && false)',
                 $filter->getFilter()[0],
                 $filter->getFilter()[1]

src/Templates/Model.phptpl

@@ -16,8 +16,8 @@ declare(strict_types = 1);
  * Class {{ class }}
 {% if namespace %} * @package {{ namespace }} {% endif %}
  */
-class {{ class }}
-{% if generatorConfiguration.hasSerializationEnabled() %}implements PHPModelGenerator\Interfaces\SerializationInterface{% endif %}
+class {{ class }} implements \PHPModelGenerator\Interfaces\JSONModelInterface
+{% if generatorConfiguration.hasSerializationEnabled() %}, \PHPModelGenerator\Interfaces\SerializationInterface{% endif %}
 {
     {% foreach properties as property %}
         /** @var {{ property.getTypeHint() }}{% if property.getDescription() %} {{ property.getDescription() }}{% endif %} */

tests/Basic/BasicSchemaGenerationTest.php

@@ -4,6 +4,7 @@
 
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\SchemaException;
+use PHPModelGenerator\Interfaces\JSONModelInterface;
 use PHPModelGenerator\Interfaces\SerializationInterface;
 use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTest;
@@ -69,21 +70,25 @@ public function testSetterChangeTheInternalState(): void
 
     public function testSerializationFunctionsAreNotGeneratedByDefault(): void
     {
-        $className = $this->generateClassFromFile('BasicSchema.json');
+        $className = '\\MyApp\\' . $this->generateClassFromFile(
+            'BasicSchema.json',
+            (new GeneratorConfiguration())->setNamespacePrefix('\\MyApp\\')
+        );
 
         $object = new $className(['property' => 'Hello']);
 
         $this->assertFalse(is_callable([$object, 'toArray']));
         $this->assertFalse(is_callable([$object, 'toJSON']));
 
         $this->assertFalse($object instanceof SerializationInterface);
+        $this->assertTrue($object instanceof JSONModelInterface);
     }
 
     public function testSerializationFunctionsAreGeneratedWithEnabledSerialization(): void
     {
-        $className = $this->generateClassFromFile(
+        $className = '\\MyApp\\' . $this->generateClassFromFile(
             'BasicSchema.json',
-            (new GeneratorConfiguration())->setSerialization(true)
+            (new GeneratorConfiguration())->setSerialization(true)->setNamespacePrefix('\\MyApp\\')
         );
 
         $object = new $className(['property' => 'Hello']);
@@ -92,6 +97,7 @@ public function testSerializationFunctionsAreGeneratedWithEnabledSerialization()
         $this->assertEquals('{"property":"Hello"}', $object->toJSON());
 
         $this->assertTrue($object instanceof SerializationInterface);
+        $this->assertTrue($object instanceof JSONModelInterface);
     }
 
     /**