Merge remote-tracking branch 'upstream/2.3-develop' into libs-upgrade

# Conflicts: # app/code/Magento/EavGraphQl/composer.json # app/code/Magento/GroupedProductGraphQl/composer.json # app/code/Magento/SwatchesGraphQl/composer.json
magento · Apr 6, 2018 · 86b9ab7 · 86b9ab7
2 parents 3d8cb58 + 3a8b2d6
commit 86b9ab7
Show file tree

Hide file tree

Showing 398 changed files with 23,686 additions and 7,279 deletions.
diff --git a/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php b/app/code/Magento/AsynchronousOperations/Model/MassSchedule.php
@@ -110,7 +110,7 @@ public function publishMass($topicName, array $entitiesArray, $groupId = null, $
         $requestItems = [];
         $bulkException = new BulkException();
         foreach ($entitiesArray as $key => $entityParams) {
-            /** @var \Magento\WebapiAsync\Api\Data\ItemStatusInterface $requestItem */
+            /** @var \Magento\AsynchronousOperations\Api\Data\ItemStatusInterface $requestItem */
             $requestItem = $this->itemStatusInterfaceFactory->create();
 
             try {

diff --git a/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php b/app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php
@@ -26,6 +26,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
      */
     protected $_selectionsAppended = false;
 
+    /**
+     * @var int[]
+     */
+    private $productIds = [];
+
     /**
      * Init model and resource model
      *
@@ -94,20 +99,34 @@ public function joinValues($storeId)
      */
     public function setProductIdFilter($productId)
     {
+        $this->productIds[] = $productId;
+
         $productTable = $this->getTable('catalog_product_entity');
         $linkField = $this->getConnection()->getAutoIncrementField($productTable);
         $this->getSelect()->join(
             ['cpe' => $productTable],
             'cpe.'.$linkField.' = main_table.parent_id',
             []
         )->where(
-            "cpe.entity_id = ?",
-            $productId
+            "cpe.entity_id = (?)",
+            $this->productIds
         );
 
         return $this;
     }
 
+    /**
+     * Clear product id's after load to insure valid future usage of collection.
+     *
+     * @return $this
+     */
+    protected function _afterLoad()
+    {
+        $this->productIds = [];
+
+        return parent::_afterLoad();
+    }
+
     /**
      * Set product link filter
      *

diff --git a/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php b/app/code/Magento/BundleGraphQl/Model/BundleProductTypeResolver.php
@@ -3,10 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\BundleGraphQl\Model;
 
-use Magento\Framework\GraphQl\Config\Data\TypeResolverInterface;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
  * {@inheritdoc}
@@ -16,10 +17,11 @@ class BundleProductTypeResolver implements TypeResolverInterface
     /**
      * {@inheritdoc}
      */
-    public function resolveType(array $data)
+    public function resolveType(array $data) : string
     {
         if (isset($data['type_id']) && $data['type_id'] == 'bundle') {
             return 'BundleProduct';
         }
+        return '';
     }
 }
diff --git a/...Magento/BundleGraphQl/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php b/...Magento/BundleGraphQl/Model/Plugin/Model/Resolver/Products/DataProvider/ProductPlugin.php
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class BundleItemLinks implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $linkCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @param Collection $linkCollection
+     * @param ValueFactory $valueFactory
+     */
+    public function __construct(
+        Collection $linkCollection,
+        ValueFactory $valueFactory
+    ) {
+        $this->linkCollection = $linkCollection;
+        $this->valueFactory = $valueFactory;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
+    {
+        if (!isset($value['option_id']) || !isset($value['parent_id'])) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+        $this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
+        $result = function () use ($value) {
+            return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}
diff --git a/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php b/app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\BundleGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Bundle\Model\Product\Type;
+use Magento\BundleGraphQl\Model\Resolver\Options\Collection;
+use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+
+/**
+ * {@inheritdoc}
+ */
+class BundleItems implements ResolverInterface
+{
+    /**
+     * @var Collection
+     */
+    private $bundleOptionCollection;
+
+    /**
+     * @var ValueFactory
+     */
+    private $valueFactory;
+
+    /**
+     * @var MetadataPool
+     */
+    private $metdataPool;
+
+    /**
+     * @param Collection $bundleOptionCollection
+     * @param ValueFactory $valueFactory
+     * @param MetadataPool $metdataPool
+     */
+    public function __construct(
+        Collection $bundleOptionCollection,
+        ValueFactory $valueFactory,
+        MetadataPool $metdataPool
+    ) {
+        $this->bundleOptionCollection = $bundleOptionCollection;
+        $this->valueFactory = $valueFactory;
+        $this->metdataPool = $metdataPool;
+    }
+
+    /**
+     * Fetch and format bundle option items.
+     *
+     * {@inheritDoc}
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
+    {
+        $linkField = $this->metdataPool->getMetadata(ProductInterface::class)->getLinkField();
+        if ($value['type_id'] !== Type::TYPE_CODE
+            || !isset($value[$linkField])
+            || !isset($value[ProductInterface::SKU])
+        ) {
+            $result = function () {
+                return null;
+            };
+            return $this->valueFactory->create($result);
+        }
+
+        $this->bundleOptionCollection->addParentFilterData(
+            (int)$value[$linkField],
+            (int)$value['entity_id'],
+            $value[ProductInterface::SKU]
+        );
+
+        $result = function () use ($value, $linkField) {
+            return $this->bundleOptionCollection->getOptionsByParentId((int)$value[$linkField]);
+        };
+
+        return $this->valueFactory->create($result);
+    }
+}