fixed InputFields

youshido-php · May 6, 2016 · dba5eb0 · dba5eb0
1 parent f09720f
commit dba5eb0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/examples/02_blog_inline/index.php b/examples/02_blog_inline/index.php
@@ -13,27 +13,6 @@
 require_once __DIR__ . '/inline-schema.php';
 /** @var ObjectType $rootQueryType */
 
-
-//$rootQueryType = new ObjectType([
-//    'name'   => 'RootQuery',
-//    'fields' => [
-//        'latestPost' => [
-//            'type' => 'Post',
-//            'fields' => [
-//                'title' => new StringType(),
-//                'summary' => new StringType(),
-//            ],
-//            'resolve' => function() {
-//                return [
-//                    'title' => 'hello',
-//                    'summary' => 'this is a post'
-//                ];
-//            }
-//        ]
-//    ]
-//]);
-
-
 $processor = new Processor();
 $processor->setSchema(new Schema([
     'query' => $rootQueryType

diff --git a/src/Introspection/InputValueListType.php b/src/Introspection/InputValueListType.php
@@ -25,6 +25,9 @@ public function resolve($value = null, $args = [], $type = null)
     {
         if ($value instanceof Field) {
             /** @var $value Field */
+            if ($value->getConfig()->hasArguments()) {
+                return $value->getConfig()->getArguments();
+            }
             $valueType = $value->getConfig()->getType();
             if ($valueType instanceof AbstractScalarType) {
                 return [];

diff --git a/src/Introspection/Traits/TypeCollectorTrait.php b/src/Introspection/Traits/TypeCollectorTrait.php
@@ -10,6 +10,7 @@
 use Youshido\GraphQL\Type\AbstractType;
 use Youshido\GraphQL\Type\CompositeTypeInterface;
 use Youshido\GraphQL\Type\Config\Field\FieldConfig;
+use Youshido\GraphQL\Type\Object\AbstractObjectType;
 use Youshido\GraphQL\Type\TypeInterface;
 use Youshido\GraphQL\Type\TypeMap;
 
@@ -26,6 +27,7 @@ protected function collectTypes($type)
         if (!$type) {
             return;
         }
+        if (is_object($type) && array_key_exists($type->getName(), $this->types)) return;
 
         switch ($type->getKind()) {
             case TypeMap::KIND_INTERFACE:
@@ -107,6 +109,11 @@ private function checkAndInsertInterfaces($type)
     private function collectFieldsArgsTypes($type)
     {
         foreach ($type->getConfig()->getFields() as $field) {
+            if ($field->getConfig()->getType() instanceof AbstractObjectType) {
+                foreach($field->getConfig()->getArguments() as $argument) {
+                    $this->collectTypes($argument->getType());
+                }
+            }
             $this->collectTypes($field->getType());
         }
         foreach ($type->getConfig()->getArguments() as $field) {

diff --git a/src/Type/Config/Field/InputFieldConfig.php b/src/Type/Config/Field/InputFieldConfig.php
@@ -20,6 +20,7 @@ public function getRules()
         return [
             'name'        => ['type' => TypeMap::TYPE_STRING, 'required' => true],
             'type'        => ['type' => TypeMap::TYPE_ANY_INPUT, 'required' => true],
+            'resolve'     => ['type' => TypeMap::TYPE_FUNCTION],
             'required'    => ['type' => TypeMap::TYPE_BOOLEAN],
             'default'     => ['type' => TypeMap::TYPE_ANY],
             'description' => ['type' => TypeMap::TYPE_STRING],
@@ -31,4 +32,4 @@ public function getDefaultValue()
         return $this->get('default');
     }
 
-}
+}