Better error detection on GraphQL

gnikyt · Jan 18, 2019 · a94c4cf · a94c4cf
1 parent acb92fb
commit a94c4cf
Show file tree

Hide file tree

Showing 21 changed files with 1 addition and 1 deletion.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/UPGRADING.md b/UPGRADING.md
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
diff --git a/src/OhMyBrew/BasicShopifyAPI.php b/src/OhMyBrew/BasicShopifyAPI.php
@@ -532,7 +532,7 @@ public function graph(string $query, array $variables = [])
         // Return Guzzle response and JSON-decoded body
         return (object) [
             'response'   => $response,
-            'body'       => property_exists($body, 'data') ? $body->data : $body->errors,
+            'body'       => property_exists($body, 'errors') ? $body->errors : $body->data,
             'errors'     => property_exists($body, 'errors'),
             'timestamps' => [$tmpTimestamp, $this->requestTimestamp],
         ];

diff --git a/test/BaseApiTest.php b/test/BaseApiTest.php
diff --git a/test/GraphApiTest.php b/test/GraphApiTest.php
diff --git a/test/RestApiTest.php b/test/RestApiTest.php
diff --git a/test/fixtures/admin__oauth__access_token.json b/test/fixtures/admin__oauth__access_token.json
diff --git a/test/fixtures/graphql/create_collection.json b/test/fixtures/graphql/create_collection.json
diff --git a/test/fixtures/graphql/shop_products.json b/test/fixtures/graphql/shop_products.json
diff --git a/test/fixtures/graphql/shop_products_error.json b/test/fixtures/graphql/shop_products_error.json
diff --git a/test/fixtures/rest/admin__shop.json b/test/fixtures/rest/admin__shop.json