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/ProductPlugin.php

@@ -11,6 +11,9 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product;
 use Magento\Bundle\Model\Product\OptionList;
 
+/**
+ * Fetch bundle product object and set necessary extension attributes for search result
+ */
 class ProductPlugin
 {
     /**

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

@@ -11,7 +11,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\FormatterInterface;
 
 /**
- * Post formatting plugin to continue formatting data for bundle type products
+ * Post formatting data to set option for bundle product
  */
 class BundleOptions implements FormatterInterface
 {

app/code/Magento/BundleGraphQl/Model/Resolver/Products/Query/BundleProductPostProcessor.php

@@ -87,7 +87,7 @@ public function process(array $resultData)
                     $bundleMap[$product['sku']] = [];
                     foreach ($product['bundle_product_options'] as $optionKey => $option) {
                         $resultData[$productKey]['items'][$optionKey]
-                            = $this->formatProductOptions($option);
+                            = $option->getData();
                         /** @var Link $link */
                         foreach ($option['product_links'] as $link) {
                             $bundleMap[$product['sku']][] = $link['sku'];
@@ -186,15 +186,4 @@ private function formatBundleAttributes(array $product)
         }
         return $product;
     }
-
-    /**
-     * Format bundle option
-     *
-     * @param Option $option
-     * @return array
-     */
-    private function formatProductOptions(Option $option)
-    {
-        return $option->getData();
-    }
 }

app/code/Magento/DownloadableGraphQl/Model/Resolver/Products/DataProvider/Product/Formatter/DownloadableOptions.php

@@ -16,7 +16,7 @@
 use Magento\Downloadable\Model\ResourceModel\Link\Collection as LinkCollection;
 
 /**
- * Post formatting plugin to continue formatting data for downloadable type products
+ * Format for downloadable product types
  */
 class DownloadableOptions implements FormatterInterface
 {
@@ -59,7 +59,7 @@ public function __construct(
     }
 
     /**
-     * Add downloadable options and options to configurable types
+     * Add downloadable options to configurable types
      *
      * {@inheritdoc}
      */
@@ -85,10 +85,10 @@ public function format(Product $product, array $productData = [])
     /**
      * Format links from collection as array
      *
-     * @param \Magento\Downloadable\Api\Data\LinkInterface[] $links
+     * @param LinkCollection $links
      * @return array
      */
-    private function formatLinks($links)
+    private function formatLinks(LinkCollection $links)
     {
         $resultData = [];
         foreach ($links as $linkKey => $link) {