Skip to content

Solving issue #31 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Solving issue #31 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82432e6
fix tests - there were wrong assertions
lorado Dec 13, 2018
8fd00b0
rename __typename to _morphType
lorado Dec 13, 2018
6e86475
fix code-style
lorado Dec 13, 2018
726466d
Revert "fix tests - there were wrong assertions"
lorado Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/GraphQLController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class GraphQLController extends Controller {
* @return \Illuminate\Http\JsonResponse
*/
public function query(Request $request, $schema = null) {

$inputs = $request->all();
$data = [];

Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Support/Definition/Definition.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function resolveInputType() {
'fields' => function () {
return array_merge([
'id' => Type::id(),
'__typename' => Type::string(),
'_morphType' => Type::string(),
], $this->getMutable());
}
]));
Expand Down
2 changes: 1 addition & 1 deletion src/Support/Transformer/Eloquent/Relation/MorphToRelationTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down