Refactor scalar types

digiaonline · Feb 13, 2018 · d6706f4 · d6706f4
1 parent 45e368e
commit d6706f4
Show file tree

Hide file tree

Showing 10 changed files with 271 additions and 345 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,8 @@
     },
     "autoload": {
         "files": [
-            "./src/Type/functions.php",
+            "./src/Type/definition.php",
+            "./src/Type/scalars.php",
             "./src/Util/functions.php"
         ],
         "psr-4": {
@@ -26,7 +27,8 @@
     },
     "autoload-dev": {
         "files": [
-            "./src/Type/functions.php",
+            "./src/Type/definition.php",
+            "./src/Type/scalars.php",
             "./src/Util/functions.php"
         ],
         "psr-4": {

diff --git a/src/Type/Definition/Scalar/BooleanType.php b/src/Type/Definition/Scalar/BooleanType.php
diff --git a/src/Type/Definition/Scalar/FloatType.php b/src/Type/Definition/Scalar/FloatType.php
diff --git a/src/Type/Definition/Scalar/IDType.php b/src/Type/Definition/Scalar/IDType.php
diff --git a/src/Type/Definition/Scalar/IntType.php b/src/Type/Definition/Scalar/IntType.php
diff --git a/src/Type/Definition/Scalar/StringType.php b/src/Type/Definition/Scalar/StringType.php
diff --git a/src/Type/Definition/Scalar/ScalarType.php → src/Type/Definition/ScalarType.php b/src/Type/Definition/Scalar/ScalarType.php → src/Type/Definition/ScalarType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Digia\GraphQL\Type\Definition\Scalar;
+namespace Digia\GraphQL\Type\Definition;
 
 use Digia\GraphQL\Behavior\ConfigTrait;
 use Digia\GraphQL\Type\Definition\Behavior\DescriptionTrait;

diff --git a/src/Type/functions.php → src/Type/definition.php b/src/Type/functions.php → src/Type/definition.php
@@ -16,12 +16,7 @@
 use Digia\GraphQL\Type\Definition\ListType;
 use Digia\GraphQL\Type\Definition\NonNullType;
 use Digia\GraphQL\Type\Definition\ObjectType;
-use Digia\GraphQL\Type\Definition\Scalar\ScalarType;
-use Digia\GraphQL\Type\Definition\Scalar\BooleanType;
-use Digia\GraphQL\Type\Definition\Scalar\FloatType;
-use Digia\GraphQL\Type\Definition\Scalar\IDType;
-use Digia\GraphQL\Type\Definition\Scalar\IntType;
-use Digia\GraphQL\Type\Definition\Scalar\StringType;
+use Digia\GraphQL\Type\Definition\ScalarType;
 use Digia\GraphQL\Type\Definition\UnionType;
 use Digia\GraphQL\Type\Directive\Directive;
 use Digia\GraphQL\Type\Directive\DeprecatedDirective;
@@ -299,21 +294,6 @@ function assertNamedType(TypeInterface $type)
     );
 }
 
-/**
- * @param TypeInterface $type
- * @return bool
- */
-function isSpecifiedScalarType(TypeInterface $type): bool
-{
-    return \in_array(get_class($type), [
-        StringType::class,
-        IntType::class,
-        FloatType::class,
-        BooleanType::class,
-        IDType::class,
-    ], true);
-}
-
 /**
  * @param DirectiveInterface $directive
  * @return bool
@@ -327,76 +307,6 @@ function isSpecifiedDirective(DirectiveInterface $directive): bool
     ], true);
 }
 
-/**
- * @return BooleanType
- */
-function GraphQLBoolean(): BooleanType
-{
-    static $instance = null;
-
-    if (!$instance) {
-        $instance = new BooleanType();
-    }
-
-    return $instance;
-}
-
-/**
- * @return FloatType
- */
-function GraphQLFloat(): FloatType
-{
-    static $instance = null;
-
-    if (!$instance) {
-        $instance = new FloatType();
-    }
-
-    return $instance;
-}
-
-/**
- * @return IntType
- */
-function GraphQLInt(): IntType
-{
-    static $instance = null;
-
-    if (!$instance) {
-        $instance = new IntType();
-    }
-
-    return $instance;
-}
-
-/**
- * @return IDType
- */
-function GraphQLID(): IDType
-{
-    static $instance = null;
-
-    if (!$instance) {
-        $instance = new IDType();
-    }
-
-    return $instance;
-}
-
-/**
- * @return StringType
- */
-function GraphQLString(): StringType
-{
-    static $instance = null;
-
-    if (!$instance) {
-        $instance = new StringType();
-    }
-
-    return $instance;
-}
-
 /**
  * @param array $config
  * @return ScalarType