Merge branch '2.3-develop' of https://github.com/magento/magento2ce into EPAM-PR-35

Author: rganin

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Collection.php

@@ -61,6 +61,7 @@ public function __construct(
      * Add parent id/sku pair to use for option filter at fetch time.
      *
      * @param int $parentId
+     * @param int $parentEntityId
      * @param string $sku
      */
     public function addParentFilterData(int $parentId, int $parentEntityId, string $sku) : void

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Validate.php

@@ -163,7 +163,7 @@ private function isUniqueAdminValues(array $optionsValues, array $deletedOptions
     {
         $adminValues = [];
         foreach ($optionsValues as $optionKey => $values) {
-            if (!(isset($deletedOptions[$optionKey]) and $deletedOptions[$optionKey] === '1')) {
+            if (!(isset($deletedOptions[$optionKey]) && $deletedOptions[$optionKey] === '1')) {
                 $adminValues[] = reset($values);
             }
         }

app/code/Magento/CatalogGraphQl/Model/Category/LevelCalculator.php

@@ -15,6 +15,16 @@
  */
 class LevelCalculator
 {
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
+    /**
+     * @var Category
+     */
+    private $resourceCategory;
+
     /**
      * @param ResourceConnection $resourceConnection
      * @param Category $resourceCategory
@@ -39,6 +49,7 @@ public function calculate(int $rootCategoryId) : int
         $select = $connection->select()
             ->from($this->resourceConnection->getTableName('catalog_category_entity'), 'level')
             ->where($this->resourceCategory->getLinkField() . " = ?", $rootCategoryId);
+
         return (int) $connection->fetchOne($select);
     }
 }

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml

@@ -36,7 +36,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="CMS Page Link" stepKey="selectCMSPageLink" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml

@@ -42,7 +42,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Catalog Products List" stepKey="selectCatalogProductsList" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml

@@ -41,7 +41,7 @@
         <waitForPageLoad stepKey="wait2"/>
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Compared Products" stepKey="selectRecentlyComparedProducts" />

app/code/Magento/Cms/Test/Mftf/Test/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml

@@ -40,7 +40,7 @@
         <see userInput="Inserting a widget does not create a widget instance." stepKey="seeMessage" />
         <!--see Insert Widget button disabled-->
         <see selector="{{WidgetSection.InsertWidgetBtnDisabled}}" userInput="Insert Widget" stepKey="seeInsertWidgetDisabled" />
-        <!--see Cancel button enabed-->
+        <!--see Cancel button enabled-->
         <see selector="{{WidgetSection.CancelBtnEnabled}}" userInput="Cancel" stepKey="seeCancelBtnEnabled" />
         <!--Select "Widget Type"-->
         <selectOption selector="{{WidgetSection.WidgetType}}" userInput="Recently Viewed Products" stepKey="selectRecentlyViewedProducts" />

app/code/Magento/ConfigurableProductGraphQl/Model/ConfigurableProductTypeResolver.php

@@ -8,19 +8,25 @@
 namespace Magento\ConfigurableProductGraphQl\Model;
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable as Type;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class ConfigurableProductTypeResolver implements TypeResolverInterface
 {
     /**
-     * {@inheritdoc}
+     * Configurable product type resolver code
      */
-    public function resolveType(array $data) : string
+    const TYPE_RESOLVER = 'ConfigurableProduct';
+
+    /**
+     * @inheritdoc
+     */
+    public function resolveType(array $data): string
     {
-        if (isset($data['type_id']) && $data['type_id'] == 'configurable') {
-            return 'ConfigurableProduct';
+        if (isset($data['type_id']) && $data['type_id'] == Type::TYPE_CODE) {
+            return self::TYPE_RESOLVER;
         }
         return '';
     }

app/code/Magento/CustomerGraphQl/Model/Customer/CreateAccount.php

@@ -0,0 +1,85 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\AccountManagementInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Framework\Api\DataObjectHelper;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Class CreateAccount creates new customer account
+ */
+class CreateAccount
+{
+    /**
+     * @var DataObjectHelper
+     */
+    private $dataObjectHelper;
+
+    /**
+     * @var CustomerInterfaceFactory
+     */
+    private $customerFactory;
+
+    /**
+     * @var AccountManagementInterface
+     */
+    private $accountManagement;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param DataObjectHelper $dataObjectHelper
+     * @param CustomerInterfaceFactory $customerFactory
+     * @param StoreManagerInterface $storeManager
+     * @param AccountManagementInterface $accountManagement
+     */
+    public function __construct(
+        DataObjectHelper $dataObjectHelper,
+        CustomerInterfaceFactory $customerFactory,
+        StoreManagerInterface $storeManager,
+        AccountManagementInterface $accountManagement
+    ) {
+        $this->dataObjectHelper = $dataObjectHelper;
+        $this->customerFactory = $customerFactory;
+        $this->accountManagement = $accountManagement;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Creates new customer account
+     *
+     * @param array $args
+     * @return CustomerInterface
+     * @throws LocalizedException
+     * @throws NoSuchEntityException
+     */
+    public function execute(array $args): CustomerInterface
+    {
+        $customerDataObject = $this->customerFactory->create();
+        $this->dataObjectHelper->populateWithArray(
+            $customerDataObject,
+            $args['input'],
+            CustomerInterface::class
+        );
+        $store = $this->storeManager->getStore();
+        $customerDataObject->setWebsiteId($store->getWebsiteId());
+        $customerDataObject->setStoreId($store->getId());
+
+        $password = array_key_exists('password', $args['input']) ? $args['input']['password'] : null;
+
+        return $this->accountManagement->createAccount($customerDataObject, $password);
+    }
+}

app/code/Magento/CustomerGraphQl/Model/Customer/SetUpUserContext.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CustomerGraphQl\Model\Customer;
+
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Authorization\Model\UserContextInterface;
+
+/**
+ * Set up user context after creating new customer account
+ */
+class SetUpUserContext
+{
+    /**
+     * Set up user context after creating new customer account
+     *
+     * @param ContextInterface $context
+     * @param CustomerInterface $customer
+     */
+    public function execute(ContextInterface $context, CustomerInterface $customer)
+    {
+        $context->setUserId((int)$customer->getId());
+        $context->setUserType(UserContextInterface::USER_TYPE_CUSTOMER);
+    }
+}