Merge branch 'release/1.1'

Author: jwillp

.gitignore

@@ -1 +1,2 @@
 /.idea/
+.phpunit.result.cache

bin/console

@@ -37,7 +37,14 @@ public function exec(InputInterface $input, OutputInterface $output, SymfonyStyl
 
         $io->writeln('Dumping reference ...');
         $outFile = $input->getOption('out-file');
+
+        if(!$outFile) {
+            $io->error('Please specify a value for the out file option');
+            return self::STATUS_ERROR;
+        }
+
         file_put_contents($outFile, $ref);
+
         $io->writeln("<info>Reference dumped successfully to '{$outFile}'</info>");
 
         return parent::STATUS_SUCCESS;

src/Application/Console/ConsoleCommand/DumpObjectReferenceCommand.php

@@ -6,5 +6,5 @@
 
 class Constant
 {
-    public const VERSION = '1.0.0';
+    public const VERSION = '1.1.0';
 }

src/Application/Shared/Constant.php

@@ -4,6 +4,7 @@
 namespace Morebec\ObjectGenerator\Application\Shared\Service;
 
 use Morebec\ObjectGenerator\Domain\Definition\ObjectDefinition;
+use Morebec\ObjectGenerator\Domain\Exception\FileNotFoundException;
 use Morebec\ObjectGenerator\Domain\ObjectDumper;
 use Morebec\ObjectGenerator\Domain\ObjectGenerationResult;
 use Morebec\ObjectGenerator\Domain\ObjectGenerator;
@@ -20,6 +21,7 @@ class ApplicationService
      * Compiles a file and returns an ObjectGenerationResult
      * @param string $pathToFile
      * @return ObjectGenerationResult
+     * @throws FileNotFoundException
      */
     public function compileFile(string $pathToFile): ObjectGenerationResult
     {

src/Application/Shared/Service/ApplicationService.php

@@ -8,7 +8,7 @@
 /**
  * Compiler
  */
-class Compiler
+class PHPObjectCompiler
 {
     /**
      * @var CompilerPassInterface[]

src/Domain/Compiler/Compiler.php src/Domain/Compiler/PHPObjectCompiler.phpsrc/Domain/Compiler/Compiler.php renamed to src/Domain/Compiler/PHPObjectCompiler.php

@@ -3,11 +3,12 @@
 namespace Morebec\ObjectGenerator\Domain;
 
 
-use Morebec\ObjectGenerator\Domain\Compiler\Compiler;
+use Morebec\ObjectGenerator\Domain\Compiler\PHPObjectCompiler;
 use Morebec\ObjectGenerator\Domain\Definition\ObjectDefinition;
 use Morebec\ObjectGenerator\Domain\Definition\Schema\ObjectDefinitionSchema;
 use Morebec\ObjectGenerator\Domain\Loader\DefinitionLoaderInterface;
 use Morebec\ObjectGenerator\Domain\ObjectReferenceDumper\ObjectReferenceDumperInterface;
+use Morebec\ObjectGenerator\Domain\Validation\ObjectSchemaValidator;
 use Morebec\ValueObjects\File\File;
 use Symfony\Component\Config\Definition\Processor;
 
@@ -33,6 +34,11 @@ public function __construct(
         $this->dumper = $dumper;
     }
 
+    /**
+     * @param File $file
+     * @return ObjectGenerationResult
+     * @throws Exception\FileNotFoundException
+     */
     public function generateFile(File $file): ObjectGenerationResult
     {
         // Load definition data schema
@@ -42,34 +48,37 @@ public function generateFile(File $file): ObjectGenerationResult
         $result->setInitialSchema($data);
         return $result;
     }
-    
+
+    /**
+     * @param array $schema
+     * @return ObjectGenerationResult
+     */
     public function generateFromArraySchema(array $schema): ObjectGenerationResult
     {
-        $typeName = array_key_first($schema);
-        $objectSchema = new ObjectDefinitionSchema($typeName);
+        $objectName = array_key_first($schema);
 
-        // Validate schema against schema validator
-        $processor = new Processor();
-        $validatedArraySchema = $processor->processConfiguration(
-            $objectSchema,
-            $schema
-        );
+        $validator = new ObjectSchemaValidator();
+        $validatedArraySchema = $validator->validate($objectName, $schema);
 
         // Create definition object
         $definition = ObjectDefinition::createFromArray(
-            $typeName,
+            $objectName,
             $validatedArraySchema
         );
 
         $result = $this->generateFromObjectDefinition($definition);
         $result->setValidatedSchema($schema);
         return $result;
     }
-    
+
+    /**
+     * @param ObjectDefinition $definition
+     * @return ObjectGenerationResult
+     */
     public function generateFromObjectDefinition(ObjectDefinition $definition): ObjectGenerationResult
     {
         // Compile Schema into class representation
-        $compiler = new Compiler();
+        $compiler = new PHPObjectCompiler();
         $object = $compiler->compile($definition);
 
         // Generate code

src/Domain/ObjectGenerator.php

@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Morebec\ObjectGenerator\Domain\Validation;
+
+use Morebec\ObjectGenerator\Domain\Definition\Schema\ObjectDefinitionSchema;
+use Symfony\Component\Config\Definition\Processor;
+
+/**
+ * Validates the data of a loaded schema
+ * before converting it to a schema
+ */
+class ObjectSchemaValidator
+{
+    /**
+     * Validates the array data of an Object definition loaded from file
+     * and returns a sanitized version of it
+     * @param array $data
+     * @return array
+     */
+    public function validate(string $objectName, array $data): array {
+        $typeName = array_key_first($data);
+        $objectSchema = new ObjectDefinitionSchema($objectName);
+
+        $processor = new Processor();
+        return $processor->processConfiguration(
+            $objectSchema,
+            $data
+        );
+    }
+}

src/Domain/Validation/ObjectSchemaValidator.php

@@ -2,7 +2,7 @@
 
 namespace Morebec\Devtools\ObjectGenerator\Definition;
 
-use Morebec\Devtools\ObjectGenerator\Domain\Definition\VariableType;
+use Morebec\ObjectGenerator\Domain\Definition\VariableType;
 use PHPUnit\Framework\TestCase;
 
 /**