Move generator's Collection to the Model namespace

a-melnikov · a-melnikov · commit e1dc5a10cb67 · 2022-07-28T15:43:41.000+03:00
For further simplifying of dependency injection
diff --git a/src/Generator/ConfigBuilder.php b/src/Generator/ConfigBuilder.php
@@ -6,6 +6,7 @@
 
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Overblog\GraphQLBundle\Generator\ConfigBuilder\ConfigBuilderInterface;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class ConfigBuilder
diff --git a/src/Generator/ConfigBuilder/ConfigBuilderInterface.php b/src/Generator/ConfigBuilder/ConfigBuilderInterface.php
@@ -5,7 +5,7 @@
 namespace Overblog\GraphQLBundle\Generator\ConfigBuilder;
 
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 interface ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/CustomScalarTypeFieldsBuilder.php b/src/Generator/ConfigBuilder/CustomScalarTypeFieldsBuilder.php
@@ -8,8 +8,8 @@
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Murtukov\PHPCodeGenerator\Utils;
-use Overblog\GraphQLBundle\Generator\Collection;
 use Overblog\GraphQLBundle\Generator\Exception\GeneratorException;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class CustomScalarTypeFieldsBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/DescriptionBuilder.php b/src/Generator/ConfigBuilder/DescriptionBuilder.php
@@ -5,7 +5,7 @@
 namespace Overblog\GraphQLBundle\Generator\ConfigBuilder;
 
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class DescriptionBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/FieldsBuilder.php b/src/Generator/ConfigBuilder/FieldsBuilder.php
@@ -15,10 +15,10 @@
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage as EL;
-use Overblog\GraphQLBundle\Generator\Collection;
 use Overblog\GraphQLBundle\Generator\Converter\ExpressionConverter;
 use Overblog\GraphQLBundle\Generator\Exception\GeneratorException;
 use Overblog\GraphQLBundle\Generator\Model\ArgumentConfig;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\FieldConfig;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 use Overblog\GraphQLBundle\Generator\ResolveInstructionBuilder;
diff --git a/src/Generator/ConfigBuilder/InterfacesBuilder.php b/src/Generator/ConfigBuilder/InterfacesBuilder.php
@@ -6,7 +6,7 @@
 
 use Murtukov\PHPCodeGenerator\ArrowFunction;
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
diff --git a/src/Generator/ConfigBuilder/IsTypeOfBuilder.php b/src/Generator/ConfigBuilder/IsTypeOfBuilder.php
@@ -9,8 +9,8 @@
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage as EL;
-use Overblog\GraphQLBundle\Generator\Collection;
 use Overblog\GraphQLBundle\Generator\Converter\ExpressionConverter;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class IsTypeOfBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/NameBuilder.php b/src/Generator/ConfigBuilder/NameBuilder.php
@@ -6,7 +6,7 @@
 
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class NameBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/ResolveFieldBuilder.php b/src/Generator/ConfigBuilder/ResolveFieldBuilder.php
@@ -5,7 +5,7 @@
 namespace Overblog\GraphQLBundle\Generator\ConfigBuilder;
 
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 use Overblog\GraphQLBundle\Generator\ResolveInstructionBuilder;
 
diff --git a/src/Generator/ConfigBuilder/ResolveTypeBuilder.php b/src/Generator/ConfigBuilder/ResolveTypeBuilder.php
@@ -8,8 +8,8 @@
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage as EL;
-use Overblog\GraphQLBundle\Generator\Collection;
 use Overblog\GraphQLBundle\Generator\Converter\ExpressionConverter;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class ResolveTypeBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/ConfigBuilder/TypesBuilder.php b/src/Generator/ConfigBuilder/TypesBuilder.php
@@ -6,7 +6,7 @@
 
 use Murtukov\PHPCodeGenerator\ArrowFunction;
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 use Overblog\GraphQLBundle\Generator\TypeGenerator;
 
diff --git a/src/Generator/ConfigBuilder/ValidationBuilder.php b/src/Generator/ConfigBuilder/ValidationBuilder.php
@@ -5,7 +5,7 @@
 namespace Overblog\GraphQLBundle\Generator\ConfigBuilder;
 
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 use Overblog\GraphQLBundle\Generator\ValidationRulesBuilder;
 
diff --git a/src/Generator/ConfigBuilder/ValuesBuilder.php b/src/Generator/ConfigBuilder/ValuesBuilder.php
@@ -5,7 +5,7 @@
 namespace Overblog\GraphQLBundle\Generator\ConfigBuilder;
 
 use Murtukov\PHPCodeGenerator\PhpFile;
-use Overblog\GraphQLBundle\Generator\Collection;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class ValuesBuilder implements ConfigBuilderInterface
diff --git a/src/Generator/Model/Collection.php b/src/Generator/Model/Collection.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Overblog\GraphQLBundle\Generator;
+namespace Overblog\GraphQLBundle\Generator\Model;
 
 use Murtukov\PHPCodeGenerator\Collection as BaseCollection;
 use Overblog\GraphQLBundle\Generator\Converter\ExpressionConverter;
diff --git a/src/Generator/ResolveInstructionBuilder.php b/src/Generator/ResolveInstructionBuilder.php
@@ -12,6 +12,7 @@
 use Overblog\GraphQLBundle\ExpressionLanguage\ExpressionLanguage as EL;
 use Overblog\GraphQLBundle\Generator\Converter\ExpressionConverter;
 use Overblog\GraphQLBundle\Generator\Exception\GeneratorException;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\TypeConfig;
 
 class ResolveInstructionBuilder
diff --git a/src/Generator/ValidationRulesBuilder.php b/src/Generator/ValidationRulesBuilder.php
@@ -10,6 +10,7 @@
 use Murtukov\PHPCodeGenerator\Literal;
 use Murtukov\PHPCodeGenerator\PhpFile;
 use Overblog\GraphQLBundle\Generator\Exception\GeneratorException;
+use Overblog\GraphQLBundle\Generator\Model\Collection;
 use Overblog\GraphQLBundle\Generator\Model\ValidationConfig;
 use Overblog\GraphQLBundle\Validator\InputValidator;
 
