Refactoring && improving && added new field type "Enum"

Author: Maksym Mykhailenko

composer.json

@@ -11,7 +11,7 @@
         ]
     },
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.6"

src/Core/TypeBuilder.php

@@ -2,8 +2,13 @@
 
 namespace MaxGraphQL\Core;
 
+use MaxGraphQL\Interfaces\FieldType;
+
 abstract class TypeBuilder
 {
+    /**
+     * @return string
+     */
     protected function convert()
     {
         $str = $this->getType() . '{' . $this->getName();
@@ -61,10 +66,10 @@ private function checkArgumentsString($string)
             $str .= $string . ',';
         } elseif (is_bool($string)) {
             $str .= $string ? 'true,' : 'false,';
-        } elseif (ctype_upper($string)) {
-            $str .= $string . ',';
+        } elseif (is_object($string) && is_subclass_of($string, FieldType::class)) {
+            $str .= $string->getValue() . ',';
         } else {
-            $str .= '"' . $string .'",';
+            $str .= '"' . $string . '",';
         }
 
         return $str;
@@ -123,6 +128,10 @@ private function isArrayAssociative($array)
         return array_keys($array) !== range(0, count($array) - 1);
     }
 
+    /**
+     * @param $field
+     * @return bool
+     */
     protected function isDuplicate($field)
     {
         foreach ($this->getSelect() as $item) {

src/FieldTypes/Enum.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace MaxGraphQL\FieldTypes;
+
+use MaxGraphQL\Interfaces\FieldType;
+
+class Enum implements FieldType
+{
+    /** @var string $value */
+    private $value;
+
+    /**
+     * @param string $value
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+}

src/Interfaces/FieldType.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace MaxGraphQL\Interfaces;
+
+interface FieldType
+{
+    /**
+     * @return string
+     */
+    public function getValue();
+}

src/Types/Mutation.php

@@ -12,16 +12,26 @@ class Mutation extends TypeBuilder implements Type
     private $select = [];
     private $arguments = [];
 
+    /**
+     * @param string $name
+     */
     public function __construct($name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         return $this->convert();
     }
 
+    /**
+     * @param string|array $field
+     * @return self
+     */
     public function addSelect($field)
     {
         if (is_array($field)) {
@@ -38,37 +48,62 @@ public function addSelect($field)
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getPreparedQuery()
     {
         return $this->convert();
     }
 
+    /**
+     * @param string $name
+     * @param string|array $select
+     * @param array $arguments
+     * @return string
+     */
     public static function getPreparedQueryFrom($name, $select, $arguments = [])
     {
         return (new self($name))->addSelect($select)->addArguments($arguments)->convert();
     }
 
+    /**
+     * @param array $arguments
+     * @return self
+     */
     public function addArguments($arguments)
     {
         $this->arguments = $arguments;
         return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getSelect()
     {
         return $this->select;
     }
 
+    /**
+     * @return array
+     */
     public function getArguments()
     {
         return $this->arguments;
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return self::TYPE;
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;

src/Types/Query.php

@@ -12,16 +12,26 @@ class Query extends TypeBuilder implements Type
     private $select = [];
     private $arguments = [];
 
+    /**
+     * @param $name
+     */
     public function __construct($name)
     {
         $this->name = $name;
     }
 
+    /**
+     * @return string
+     */
     public function __toString()
     {
         return $this->convert();
     }
 
+    /**
+     * @param string|array $field
+     * @return self
+     */
     public function addSelect($field)
     {
         if (is_array($field)) {
@@ -38,37 +48,62 @@ public function addSelect($field)
         return $this;
     }
 
+    /**
+     * @return string
+     */
     public function getPreparedQuery()
     {
         return $this->convert();
     }
 
+    /**
+     * @param string $name
+     * @param string|array $select
+     * @param array $arguments
+     * @return string
+     */
     public static function getPreparedQueryFrom($name, $select, $arguments = [])
     {
         return (new self($name))->addSelect($select)->addArguments($arguments)->getPreparedQuery();
     }
 
+    /**
+     * @param array $arguments
+     * @return $this
+     */
     public function addArguments($arguments)
     {
         $this->arguments = $arguments;
         return $this;
     }
 
+    /**
+     * @return array
+     */
     public function getSelect()
     {
         return $this->select;
     }
 
+    /**
+     * @return array
+     */
     public function getArguments()
     {
         return $this->arguments;
     }
 
+    /**
+     * @return string
+     */
     public function getType()
     {
         return self::TYPE;
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;

tests/MutationTest.php

@@ -2,6 +2,7 @@
 
 use PHPUnit\Framework\TestCase;
 use MaxGraphQL\Types\Mutation;
+use \MaxGraphQL\FieldTypes\Enum;
 
 class MutationTest extends TestCase
 {
@@ -36,7 +37,7 @@ public function testMutation3()
         $mutation = new Mutation('testing');
         $mutation
             ->addSelect(['test3' => ['test4']])
-            ->addArguments(['id' => ['user_id' => '5', 'user_type' => 'ACCOUNT'], 'test' => ['test2' => 5]]);
+            ->addArguments(['id' => ['user_id' => '5', 'user_type' => new Enum('ACCOUNT')], 'test' => ['test2' => 5]]);
 
         $this->assertSame($string, $mutation->getPreparedQuery());
     }

tests/QueryTest.php

@@ -2,6 +2,7 @@
 
 use PHPUnit\Framework\TestCase;
 use MaxGraphQL\Types\Query;
+use \MaxGraphQL\FieldTypes\Enum;
 
 class QueryTest extends TestCase
 {
@@ -24,7 +25,7 @@ public function testQuery2()
         $query = new Query('testing');
         $query
             ->addSelect(['test3' => ['test4']])
-            ->addArguments(['id' => '5', 'user_type' => 'ACCOUNT', 'test' => ['test2' => 5]]);
+            ->addArguments(['id' => '5', 'user_type' => new Enum('ACCOUNT'), 'test' => ['test2' => 5]]);
 
         $this->assertSame($string, $query->getPreparedQuery());
     }