Merge branch 'release/1.2'

Author: jwillp

src/Application/Shared/Constant.php

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

src/Domain/Definition/ObjectDefinition.php

@@ -3,6 +3,7 @@
 namespace Morebec\ObjectGenerator\Domain\Definition;
 
 use Morebec\ObjectGenerator\Domain\Definition\Schema\SchemaKey;
+use mysql_xdevapi\Schema;
 
 class ObjectDefinition
 {
@@ -231,7 +232,7 @@ public function setUse(array $use): void
         $this->use = $use;
     }
 
-    public function addUse(string $use): void
+    public function addUse(UseDefinition $use): void
     {
         $this->use[] = $use;
     }
@@ -271,11 +272,17 @@ public static function createFromArray(string $objectName, array $data)
         $definition->setImplements($data[SchemaKey::IMPLEMENTS]);
         $definition->setTraits($data[SchemaKey::TRAITS]);
         $definition->setAnnotations($data[SchemaKey::ANNOTATIONS]);
-        $definition->setUse($data[SchemaKey::USE]);
         $definition->setAbstract($data[SchemaKey::ABSTRACT]);
         $definition->setFinal($data[SchemaKey::FINAL]);
         $definition->setType($data[SchemaKey::TYPE]);
 
+        // Use
+        foreach ($data[SchemaKey::USE] as $use) {
+            $definition->addUse(
+                new UseDefinition($use[SchemaKey::CLASS_NAME], $use[SchemaKey::AS])
+            );
+        }
+
         // Properties
         foreach ($data[SchemaKey::PROPERTIES] as $propertyName => $property) {
             $definition->addProperty(

src/Domain/Definition/Schema/CodeDefinitionSchema.php

@@ -15,7 +15,7 @@ public function getConfigTreeBuilder()
         $node = $treeBuilder->getRootNode();
         $node
                 ->info('You can specify some PHP code to be injected here.')
-                ->defaultValue(null)
+                ->defaultNull()
         ->end()
         ;
 

src/Domain/Definition/Schema/ObjectDefinitionSchema.php

@@ -28,7 +28,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         $root
             ->addDefaultsIfNotSet()
             ->children()
-                ->scalarNode('namespace')->defaultValue(null)->end()
+                ->scalarNode('namespace')->defaultNull()->end()
                 ->append(FinalKeywordDefinitionSchema::create())
                 ->append(AbstractKeywordDefinitionSchema::create())
                 ->enumNode(SchemaKey::TYPE)
@@ -38,7 +38,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode(SchemaKey::DESCRIPTION)
                     ->defaultValue('')
                 ->end()
-                ->scalarNode(SchemaKey::EXTENDS)->defaultValue(null)->end()
+                ->scalarNode(SchemaKey::EXTENDS)->defaultNull()->end()
                 ->arrayNode(SchemaKey::IMPLEMENTS)
                     ->beforeNormalization()->castToArray()->end()
                     ->scalarPrototype()->end()
@@ -50,10 +50,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->append(AnnotationsDefinitionSchema::create())
                 ->append(PropertiesDefinitionSchema::create())
                 ->append(MethodsDefinitionSchema::create())
-                ->arrayNode(SchemaKey::USE)
-                    ->beforeNormalization()->castToArray()->end()
-                    ->scalarPrototype()->end()
-                ->end()
+                ->append(UseKeywordDefinitionSchema::create())
             ->end()
         ;
 

src/Domain/Definition/Schema/PropertiesDefinitionSchema.php

@@ -37,7 +37,7 @@ public function getConfigTreeBuilder()
                             ->scalarNode(SchemaKey::NAME)
                                 ->info('You can specify the name of your setter, here.
 If nothing is specified as a name, it will default to getPropertyName.')
-                                ->defaultValue(null)->end()
+                                ->defaultNull()->end()
                             ->scalarNode(SchemaKey::DESCRIPTION)->defaultValue('')->end()
                             ->append(VisibilityKeywordDefinitionSchema::create())
                             ->append(CodeDefinitionSchema::create())

src/Domain/Definition/Schema/SchemaKey.php

@@ -55,4 +55,8 @@ class SchemaKey
     public const CONSTANT = 'constant';
 
     public const NAME = 'name';
+
+    const CLASS_NAME = 'classname';
+
+    const AS = 'as';
 }

src/Domain/Definition/Schema/UseKeywordDefinitionSchema.php

@@ -0,0 +1,42 @@
+<?php
+
+
+namespace Morebec\ObjectGenerator\Domain\Definition\Schema;
+
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use function is_array;
+
+class UseKeywordDefinitionSchema extends AbstractDefinitionSchema
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder(SchemaKey::USE);
+
+
+        $node = $treeBuilder->getRootNode();
+
+        $node
+            ->beforeNormalization()
+                ->ifTrue(static function($v) {
+                    return !is_array($v);
+                })
+            ->then(static function($v){
+                    return [[SchemaKey::CLASS_NAME => $v, SchemaKey::AS => null]];
+                })
+            ->end()
+            ->arrayPrototype()
+                ->children()
+                    ->scalarNode(SchemaKey::CLASS_NAME)->end()
+                    ->scalarNode(SchemaKey::AS)->defaultNull()->end()
+                ->end()
+            ->end()
+        ;
+
+        return $node;
+    }
+}

src/Domain/Definition/UseDefinition.php

@@ -0,0 +1,62 @@
+<?php
+
+
+namespace Morebec\ObjectGenerator\Domain\Definition;
+
+
+class UseDefinition
+{
+    /**
+     * @var string
+     */
+    private $className;
+    /**
+     * @var string|null
+     */
+    private $as;
+
+    public function __construct(string $className, ?string $as = null)
+    {
+        $this->className = $className;
+        $this->as = $as;
+    }
+
+    public function __toString()
+    {
+        $use = $this->className;
+        $as = $this->as;
+        return $as ? "$use as $as" : $use;
+    }
+
+    /**
+     * @return string
+     */
+    public function getClassName(): string
+    {
+        return $this->className;
+    }
+
+    /**
+     * @param string $className
+     */
+    public function setClassName(string $className): void
+    {
+        $this->className = $className;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getAs(): ?string
+    {
+        return $this->as;
+    }
+
+    /**
+     * @param string|null $as
+     */
+    public function setAs(?string $as): void
+    {
+        $this->as = $as;
+    }
+}

src/Domain/ObjectDumper.php

@@ -3,6 +3,7 @@
 namespace Morebec\ObjectGenerator\Domain;
 
 use Morebec\ObjectGenerator\Domain\Definition\ObjectDefinition;
+use Morebec\ObjectGenerator\Domain\Definition\UseDefinition;
 use Nette\PhpGenerator\ClassType;
 
 /**
@@ -22,8 +23,8 @@ public function dump(
         if ($namespace) {
             $namespace = "namespace $namespace;" . PHP_EOL . PHP_EOL;
         }
-        
-        $use = join(PHP_EOL, array_map(static function ($n) {
+
+        $use = join(PHP_EOL, array_map(static function (UseDefinition $n) {
             return "use $n;";
         }, $definition->getUse()));
         if ($use) {