Merge remote-tracking branch 'remotes/origin/MAGETWO-81530-support-all-product-types' into MAGETWO-81530-support-all-product-types

Author: Eric Bohanon

app/code/Magento/BundleGraphQl/Model/Plugin/Model/Resolver/Products/DataProvider/Product/Formatter/BundleOptions.php renamed to app/code/Magento/BundleGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/BundleOptions.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\BundleGraphQl\Model\Plugin\Model\Resolver\Products\DataProvider\Product\Formatter;
+namespace Magento\BundleGraphQl\Model\Resolver\Products\DataProvider\Product\Formatter;
 
 use Magento\Catalog\Model\Product;
 use Magento\Bundle\Model\Product\Type as Bundle;

app/code/Magento/BundleGraphQl/etc/graphql/di.xml

@@ -9,7 +9,7 @@
     <type name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterComposite">
         <arguments>
             <argument name="formatterInstances" xsi:type="array">
-                <item name="add_bundle_data" xsi:type="object">Magento\BundleGraphQl\Model\Plugin\Model\Resolver\Products\DataProvider\Product\Formatter\BundleOptions</item>
+                <item name="add_bundle_data" xsi:type="object">Magento\BundleGraphQl\Model\Resolver\Products\DataProvider\Product\Formatter\BundleOptions</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/ConfigurableProductGraphQl/Model/Plugin/Model/Resolver/Products/DataProvider/Product/Formatter/ConfigurableOptions.php renamed to app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/ConfigurableOptions.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\ConfigurableProductGraphQl\Model\Plugin\Model\Resolver\Products\DataProvider\Product\Formatter;
+namespace Magento\ConfigurableProductGraphQl\Model\Resolver\Products\DataProvider\Product\Formatter;
 
 use Magento\Catalog\Model\Product;
 use Magento\ConfigurableProduct\Model\Product\Type\Configurable;

app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml

@@ -9,7 +9,7 @@
     <type name="Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterComposite">
         <arguments>
             <argument name="formatterInstances" xsi:type="array">
-                <item name="add_configurable_data" xsi:type="object">Magento\ConfigurableProductGraphQl\Model\Plugin\Model\Resolver\Products\DataProvider\Product\Formatter\ConfigurableOptions</item>
+                <item name="add_configurable_data" xsi:type="object">Magento\ConfigurableProductGraphQl\Model\Resolver\Products\DataProvider\Product\Formatter\ConfigurableOptions</item>
             </argument>
         </arguments>
     </type>

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/GraphQl/Client.php

@@ -67,6 +67,25 @@ public function postQuery(string $query, array $variables = [], string $operatio
         $responseBody = $this->curlClient->post($url, $postData, $headers);
         $responseBodyArray = $this->json->jsonDecode($responseBody);
 
+        if (!is_array($responseBodyArray)) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        }
+
+        $this->processErrors($responseBodyArray);
+
+        if (!isset($responseBodyArray['data'])) {
+            throw new \Exception('Unknown GraphQL response body: ' . json_encode($responseBodyArray));
+        } else {
+            return $responseBodyArray['data'];
+        }
+    }
+
+    /**
+     * @param array $responseBodyArray
+     * @throws \Exception
+     */
+    private function processErrors($responseBodyArray)
+    {
         if (isset($responseBodyArray['errors'])) {
             $errorMessage = '';
             if (is_array($responseBodyArray['errors'])) {
@@ -85,12 +104,8 @@ public function postQuery(string $query, array $variables = [], string $operatio
 
                 throw new \Exception('GraphQL response contains errors: ' . $errorMessage);
             }
-            throw new \Exception('GraphQL responded with an unknown error: ' . $responseBody);
-        } elseif (!isset($responseBodyArray['data'])) {
-            throw new \Exception('Unknown GraphQL response body: ' . $responseBody);
+            throw new \Exception('GraphQL responded with an unknown error: ' . json_encode($responseBodyArray));
         }
-
-        return $responseBodyArray['data'];
     }
 
     /**
@@ -99,6 +114,6 @@ public function postQuery(string $query, array $variables = [], string $operatio
      */
     public function getEndpointUrl()
     {
-        return rtrim(TESTS_BASE_URL, '/') . '/graphql';
+        return rtrim(TESTS_BASE_URL, '/') . '/graphql5';
     }
 }

lib/internal/Magento/Framework/GraphQl/Config/Data/TypeResolverInterface.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\GraphQl\Config\Data;
 
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 /**
  * Determines a concrete GraphQL type for data returned that implements an interface type.
  */
@@ -16,6 +17,7 @@ interface TypeResolverInterface
      *
      * @param array $data
      * @return string|null
+     * @throws GraphQlInputException
      */
     public function resolveType(array $data);
 }