Update to use php-json-schema-model-generator-production

Author: wol-soft

README.md

@@ -36,9 +36,9 @@ Simple example from a PHP application: you define and document an API with swagg
 The recommended way to install php-json-schema-model-generator is through [Composer](http://getcomposer.org):
 ```
 $ composer require --dev wol-soft/php-json-schema-model-generator
-$ composer require wol-soft/php-json-schema-model-generator-exception
+$ composer require wol-soft/php-json-schema-model-generator-production
 ```
-To avoid adding all dependencies of the php-json-schema-model-generator to your production dependencies it's recommended to add the library as a dev-dependency and include the php-json-schema-model-generator-exception library. The exception library provides all classes to run the generated code. Generating the classes should either be a step done in the development environment (if you decide to commit the models) or as a build step of your application.
+To avoid adding all dependencies of the php-json-schema-model-generator to your production dependencies it's recommended to add the library as a dev-dependency and include the php-json-schema-model-generator-production library. The exception library provides all classes to run the generated code. Generating the classes should either be a step done in the development environment (if you decide to commit the models) or as a build step of your application.
 
 ## Basic usage ##
 

composer.json

@@ -12,8 +12,9 @@
     ],
     "require": {
         "symplify/easy-coding-standard": "^6.0.4",
-        "wol-soft/php-json-schema-model-generator-exception": "^0.1.0",
+        "wol-soft/php-json-schema-model-generator-production": "^0.4.0",
         "wol-soft/php-micro-template": "^1.3.1",
+
         "php": ">=7.2",
         "ext-json": "*",
         "ext-mbstring": "*"

docs/source/gettingStarted.rst

@@ -9,7 +9,7 @@ The recommended way to install php-json-model-generator is through `Composer <ht
 .. code-block:: rconsole
 
     composer require --dev wol-soft/php-json-schema-model-generator
-    composer require wol-soft/php-json-schema-model-generator-exception
+    composer require wol-soft/php-json-schema-model-generator-production
 
 To avoid adding all dependencies of the php-json-model-generator to your production dependencies it's recommended to add the library as a dev-dependency and include the php-json-model-generator-exception library. The exception library provides all classes to run the generated code. Generating the classes should either be a step done in the development environment (if you decide to commit the models) or as a build step of your application.
 
@@ -150,10 +150,10 @@ Collect errors vs. early return
 
 By default the complete input is validated and in case of failing validations all error messages will be thrown in a single exception implementing the ErrorRegistryExceptionInterface interface. If set to false the first failing validation will throw an exception.
 
-The exceptions are implemented in the php-json-schema-model-generator-exception repository. Default exceptions:
+The exceptions are implemented in the php-json-schema-model-generator-production repository. Default exceptions:
 
-* Error collection enabled: **PHPModelGeneratorException\ErrorRegistryException**
-* Error collection disabled: **PHPModelGeneratorException\ValidationException**
+* Error collection enabled: **PHPModelGenerator\\Exception\\ErrorRegistryException**
+* Error collection disabled: **PHPModelGenerator\\Exception\\ValidationException**
 
 .. code-block:: php
 
@@ -210,6 +210,8 @@ Generated interface:
     public function toArray(): array;
     public function toJSON(): string;
 
+The generated class will implement the interface **PHPModelGenerator\\Interfaces\\SerializationInterface** implemented in the php-json-schema-model-generator-production repository. This interface can be used to write additional generic modules to handle the generated models.
+
 Output generation process
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 

src/Exception/PHPModelGeneratorException.php

@@ -7,7 +7,7 @@
 use Exception;
 
 /**
- * Class PHPModelGeneratorException
+ * Class PHPModelGenerator\Exception
  *
  * @package PHPModelGenerator\Exception
  */

src/Model/GeneratorConfiguration.php

@@ -6,8 +6,8 @@
 
 use PHPModelGenerator\Utils\ClassNameGenerator;
 use PHPModelGenerator\Utils\ClassNameGeneratorInterface;
-use PHPModelGeneratorException\ErrorRegistryException;
-use PHPModelGeneratorException\ValidationException;
+use PHPModelGenerator\Exception\ErrorRegistryException;
+use PHPModelGenerator\Exception\ValidationException;
 
 /**
  * Class GeneratorConfiguration

src/Model/Schema.php

@@ -81,6 +81,12 @@ public function addProperty(PropertyInterface $property): self
     {
         if (!isset($this->properties[$property->getName()])) {
             $this->properties[$property->getName()] = $property;
+        } else {
+            // TODO tests:
+            // testConditionalObjectProperty
+            // testInvalidConditionalObjectPropertyThrowsAnException
+            // testInvalidValuesForMultipleValuesInCompositionThrowsAnException
+          //  throw new SchemaException("Duplicate attribute name {$property->getName()}");
         }
 
         return $this;

src/Model/SchemaDefinition/SchemaDefinition.php

@@ -4,7 +4,7 @@
 
 namespace PHPModelGenerator\Model\SchemaDefinition;
 
-use PHPModelGenerator\Exception\PHPModelGeneratorException;
+use PHPModelGenerator\Exception\PHPModelGenerator\Exception;
 use PHPModelGenerator\Exception\SchemaException;
 use PHPModelGenerator\Model\Property\PropertyInterface;
 use PHPModelGenerator\Model\Property\PropertyProxy;
@@ -65,7 +65,7 @@ public function getSchema(): Schema
      *
      * @return PropertyInterface
      *
-     * @throws PHPModelGeneratorException
+     * @throws PHPModelGenerator\Exception
      * @throws SchemaException
      */
     public function resolveReference(
@@ -100,7 +100,7 @@ public function resolveReference(
                         $structure
                     )
                 );
-            } catch (PHPModelGeneratorException $exception) {
+            } catch (PHPModelGenerator\Exception $exception) {
                 $this->resolvedPaths->offsetUnset($key);
                 throw $exception;
             }

src/Templates/Exception/ComposedValueException.phptpl

@@ -2,7 +2,7 @@ Invalid value for {{ propertyName }} declined by composition constraint.\n"
   . sprintf('  {{ composedErrorMessage }}', $succeededCompositionElements)
   . array_reduce(
         $compositionErrorCollection,
-        function (string $carry, \PHPModelGeneratorException\ErrorRegistryExceptionInterface $exception) use (&$i) {
+        function (string $carry, \PHPModelGenerator\Exception\ErrorRegistryExceptionInterface $exception) use (&$i) {
             return "$carry\n  - Composition element #" . ++$i . (
                 $exception->getErrors()
                     ? ": Failed\n    * " . implode("\n    * ", $exception->getErrors())

src/Templates/Model.phptpl

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

tests/AbstractPHPModelGeneratorTest.php

@@ -4,11 +4,11 @@
 
 use FilesystemIterator;
 use PHPModelGenerator\Utils\ClassNameGenerator;
-use PHPModelGeneratorException\ErrorRegistryException;
+use PHPModelGenerator\Exception\ErrorRegistryException;
 use PHPModelGenerator\Exception\FileSystemException;
 use PHPModelGenerator\Exception\RenderException;
 use PHPModelGenerator\Exception\SchemaException;
-use PHPModelGeneratorException\ValidationException;
+use PHPModelGenerator\Exception\ValidationException;
 use PHPModelGenerator\ModelGenerator;
 use PHPModelGenerator\Model\GeneratorConfiguration;
 use PHPUnit\Framework\TestCase;