VectorGenerator

SergeyBel · May 7, 2023 · 82eb28b · 82eb28b
1 parent 5c77aff
commit 82eb28b
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/...enerator/Generator/FromArrayGenerator.php → ...r/Generator/Arrays/FromArrayGenerator.php b/...enerator/Generator/FromArrayGenerator.php → ...r/Generator/Arrays/FromArrayGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Arrays;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Arrays\FromArrayType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;

diff --git a/src/Generator/Generator/VectorGenerator.php → ...ator/Generator/Arrays/VectorGenerator.php b/src/Generator/Generator/VectorGenerator.php → ...ator/Generator/Arrays/VectorGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Arrays;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\GeneratorFactory;
 use PhpInvariant\Generator\Type\Arrays\VectorType;
 use PhpInvariant\Generator\TypeInterface;

diff --git a/...Generator/Generator/DateTimeGenerator.php → .../Generator/DateTime/DateTimeGenerator.php b/...Generator/Generator/DateTimeGenerator.php → .../Generator/DateTime/DateTimeGenerator.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\DateTime;
 
+use DateTimeImmutable;
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\DateTime\DateTimeType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;
-use DateTimeImmutable;
 
 class DateTimeGenerator implements GeneratorInterface
 {

diff --git a/src/Generator/Generator/BooleanGenerator.php → ...tor/Generator/Scalar/BooleanGenerator.php b/src/Generator/Generator/BooleanGenerator.php → ...tor/Generator/Scalar/BooleanGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\BooleanType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;

diff --git a/src/Generator/Generator/FloatGenerator.php → ...rator/Generator/Scalar/FloatGenerator.php b/src/Generator/Generator/FloatGenerator.php → ...rator/Generator/Scalar/FloatGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\FloatType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;

diff --git a/src/Generator/Generator/IntegerGenerator.php → ...tor/Generator/Scalar/IntegerGenerator.php b/src/Generator/Generator/IntegerGenerator.php → ...tor/Generator/Scalar/IntegerGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\IntegerType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;

diff --git a/src/Generator/Generator/StringGenerator.php → ...ator/Generator/Scalar/StringGenerator.php b/src/Generator/Generator/StringGenerator.php → ...ator/Generator/Scalar/StringGenerator.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace PhpInvariant\Generator\Generator;
+namespace PhpInvariant\Generator\Generator\Scalar;
 
+use PhpInvariant\Generator\Generator\GeneratorInterface;
 use PhpInvariant\Generator\Type\Scalar\StringType;
 use PhpInvariant\Generator\TypeInterface;
 use PhpInvariant\Random\Random;

diff --git a/src/Generator/GeneratorFactory.php b/src/Generator/GeneratorFactory.php
@@ -3,14 +3,10 @@
 namespace PhpInvariant\Generator;
 
 use PhpInvariant\Exception\PhpInvariantException;
-use PhpInvariant\Generator\Generator\FromArrayGenerator;
-use PhpInvariant\Generator\Generator\BooleanGenerator;
-use PhpInvariant\Generator\Generator\DateTimeGenerator;
-use PhpInvariant\Generator\Generator\FloatGenerator;
+use PhpInvariant\Generator\Generator\Arrays\FromArrayGenerator;
+use PhpInvariant\Generator\Generator\DateTime\DateTimeGenerator;
 use PhpInvariant\Generator\Generator\GeneratorInterface;
-use PhpInvariant\Generator\Generator\IntegerGenerator;
-use PhpInvariant\Generator\Generator\StringGenerator;
-use PhpInvariant\Generator\Generator\VectorGenerator;
+use PhpInvariant\Generator\Generator\Scalar\IntegerGenerator;
 use PhpInvariant\Generator\Type\Arrays\FromArrayType;
 use PhpInvariant\Generator\Type\Arrays\VectorType;
 use PhpInvariant\Generator\Type\DateTime\DateTimeType;
@@ -27,12 +23,12 @@ class GeneratorFactory
      */
     private array $mapping = [
         IntegerType::class => IntegerGenerator::class,
-        FloatType::class => FloatGenerator::class,
-        BooleanType::class => BooleanGenerator::class,
-        StringType::class => StringGenerator::class,
+        FloatType::class => Generator\Scalar\FloatGenerator::class,
+        BooleanType::class => Generator\Scalar\BooleanGenerator::class,
+        StringType::class => Generator\Scalar\StringGenerator::class,
         DateTimeType::class => DateTimeGenerator::class,
         FromArrayType::class => FromArrayGenerator::class,
-        VectorType::class => VectorGenerator::class
+        VectorType::class => Generator\Arrays\VectorGenerator::class
 
     ];