Merge branch 'master' into develop

Mikk Mihkel Nurges · Mikk Mihkel Nurges · commit 242ef96359cd · 2018-11-26T15:30:13.000+02:00
diff --git a/docs/advanced.md b/docs/advanced.md
@@ -919,7 +919,6 @@ class UserType extends GraphQLType
     public function fields()
     {
         return [
-            
             // ...
             
             // JSON column containing all posts made by this user
@@ -935,6 +934,5 @@ class UserType extends GraphQLType
     }
 
     // ...
-
 }
 ```
diff --git a/src/Rebing/GraphQL/Support/SelectFields.php b/src/Rebing/GraphQL/Support/SelectFields.php
@@ -139,7 +139,7 @@ protected static function handleFields(array $requestedFields, $parentType, arra
                 $customQuery = array_get($fieldObject->config, 'query');
 
                 // Check if the field is a relation that needs to be requested from the DB
-                $queryable = self::isQueryable($fieldObject);
+                $queryable = self::isQueryable($fieldObject->config);
 
                 // Pagination
                 if(is_a($parentType, PaginationType::class))

Original file line number	Diff line number	Diff line change
`@@ -919,7 +919,6 @@ class UserType extends GraphQLType`
`919`	`919`	`public function fields()`
`920`	`920`	`{`
`921`	`921`	`return [`
`922`		`-`
`923`	`922`	`// ...`
`924`	`923`
`925`	`924`	`// JSON column containing all posts made by this user`
`@@ -935,6 +934,5 @@ class UserType extends GraphQLType`
`935`	`934`	`}`
`936`	`935`
`937`	`936`	`// ...`
`938`		`-`
`939`	`937`	`}`
`940`	`938`	```