diff --git a/src/GraphQLController.php b/src/GraphQLController.php index 4a28a6c..7375c1b 100644 --- a/src/GraphQLController.php +++ b/src/GraphQLController.php @@ -22,7 +22,6 @@ class GraphQLController extends Controller { * @return \Illuminate\Http\JsonResponse */ public function query(Request $request, $schema = null) { - $inputs = $request->all(); $data = []; @@ -48,7 +47,6 @@ public function query(Request $request, $schema = null) { else { $data = $this->executeQuery($schema, $inputs); } - } catch (\Exception $exception) { $data = GraphQL::formatGraphQLException($exception); Log::debug($exception); diff --git a/src/Support/Definition/Definition.php b/src/Support/Definition/Definition.php index 84553f5..0499416 100644 --- a/src/Support/Definition/Definition.php +++ b/src/Support/Definition/Definition.php @@ -118,7 +118,7 @@ public function resolveInputType() { 'fields' => function () { return array_merge([ 'id' => Type::id(), - '__typename' => Type::string(), + '_morphType' => Type::string(), ], $this->getMutable()); } ])); diff --git a/src/Support/Transformer/Eloquent/Relation/MorphToRelationTransformer.php b/src/Support/Transformer/Eloquent/Relation/MorphToRelationTransformer.php index f449d69..74be8f0 100644 --- a/src/Support/Transformer/Eloquent/Relation/MorphToRelationTransformer.php +++ b/src/Support/Transformer/Eloquent/Relation/MorphToRelationTransformer.php @@ -11,7 +11,7 @@ class MorphToRelationTransformer extends AbstractRelationTransformer { */ protected function hydrate() { $id = array_get($this->values, 'id', null); - $type = array_get($this->values, '__typename', null); + $type = array_get($this->values, '_morphType', null); if (is_null($type)) { throw new \Exception(