Merge branch '2.3-develop' of github.com:magento/magento2ce into 2.3-develop

Author: okolesnyk

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -234,6 +234,7 @@
                 <field id="destinations" translate="label" type="multiselect" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Top destinations</label>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <can_be_empty>1</can_be_empty>
                 </field>
             </group>
             <group id="locale" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">

app/code/Magento/Catalog/Controller/Adminhtml/Product/Builder.php

@@ -11,6 +11,9 @@
 use Magento\Store\Model\StoreFactory;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Registry;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Type as ProductTypes;
 
 class Builder
 {
@@ -39,6 +42,11 @@ class Builder
      */
     protected $storeFactory;
 
+    /**
+     * @var ProductRepositoryInterface
+     */
+    private $productRepository;
+
     /**
      * Constructor
      *
@@ -47,61 +55,87 @@ class Builder
      * @param Registry $registry
      * @param WysiwygModel\Config $wysiwygConfig
      * @param StoreFactory|null $storeFactory
+     * @param ProductRepositoryInterface|null $productRepository
      */
     public function __construct(
         ProductFactory $productFactory,
         Logger $logger,
         Registry $registry,
         WysiwygModel\Config $wysiwygConfig,
-        StoreFactory $storeFactory = null
+        StoreFactory $storeFactory = null,
+        ProductRepositoryInterface $productRepository = null
     ) {
         $this->productFactory = $productFactory;
         $this->logger = $logger;
         $this->registry = $registry;
         $this->wysiwygConfig = $wysiwygConfig;
         $this->storeFactory = $storeFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Store\Model\StoreFactory::class);
+        $this->productRepository = $productRepository ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(ProductRepositoryInterface::class);
     }
 
     /**
      * Build product based on user request
      *
      * @param RequestInterface $request
      * @return \Magento\Catalog\Model\Product
+     * @throws \RuntimeException
      */
     public function build(RequestInterface $request)
     {
-        $productId = (int)$request->getParam('id');
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = $this->productFactory->create();
-        $product->setStoreId($request->getParam('store', 0));
-        $store = $this->storeFactory->create();
-        $store->load($request->getParam('store', 0));
-
+        $productId = (int) $request->getParam('id');
+        $storeId = $request->getParam('store', 0);
+        $attributeSetId = (int) $request->getParam('set');
         $typeId = $request->getParam('type');
-        if (!$productId && $typeId) {
-            $product->setTypeId($typeId);
-        }
 
-        $product->setData('_edit_mode', true);
         if ($productId) {
             try {
-                $product->load($productId);
+                $product = $this->productRepository->getById($productId, true, $storeId);
             } catch (\Exception $e) {
-                $product->setTypeId(\Magento\Catalog\Model\Product\Type::DEFAULT_TYPE);
+                $product = $this->createEmptyProduct(ProductTypes::DEFAULT_TYPE, $attributeSetId, $storeId);
                 $this->logger->critical($e);
             }
+        } else {
+            $product = $this->createEmptyProduct($typeId, $attributeSetId, $storeId);
         }
 
-        $setId = (int)$request->getParam('set');
-        if ($setId) {
-            $product->setAttributeSetId($setId);
-        }
+        $store = $this->storeFactory->create();
+        $store->load($storeId);
 
         $this->registry->register('product', $product);
         $this->registry->register('current_product', $product);
         $this->registry->register('current_store', $store);
-        $this->wysiwygConfig->setStoreId($request->getParam('store'));
+
+        $this->wysiwygConfig->setStoreId($storeId);
+
+        return $product;
+    }
+
+    /**
+     * @param int $typeId
+     * @param int $attributeSetId
+     * @param int $storeId
+     * @return \Magento\Catalog\Model\Product
+     */
+    private function createEmptyProduct($typeId, $attributeSetId, $storeId): Product
+    {
+        /** @var $product \Magento\Catalog\Model\Product */
+        $product = $this->productFactory->create();
+        $product->setData('_edit_mode', true);
+
+        if ($typeId !== null) {
+            $product->setTypeId($typeId);
+        }
+
+        if ($storeId !== null) {
+            $product->setStoreId($storeId);
+        }
+
+        if ($attributeSetId) {
+            $product->setAttributeSetId($attributeSetId);
+        }
+
         return $product;
     }
 }

app/code/Magento/Catalog/Model/Category.php

@@ -7,11 +7,8 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\Entity\GetCategoryCustomAttributeCodes;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\Eav\Model\Entity\GetCustomAttributeCodesInterface;
 use Magento\Framework\Api\AttributeValueFactory;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Convert\ConvertArray;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Profiler;
@@ -214,11 +211,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $metadataService;
 
-    /**
-     * @var GetCustomAttributeCodesInterface
-     */
-    private $getCustomAttributeCodes;
-
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -241,7 +233,6 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
-     * @param GetCustomAttributeCodesInterface|null $getCustomAttributeCodes
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -265,8 +256,7 @@ public function __construct(
         CategoryRepositoryInterface $categoryRepository,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = [],
-        GetCustomAttributeCodesInterface $getCustomAttributeCodes = null
+        array $data = []
     ) {
         $this->metadataService = $metadataService;
         $this->_treeModel = $categoryTreeResource;
@@ -281,9 +271,6 @@ public function __construct(
         $this->urlFinder = $urlFinder;
         $this->indexerRegistry = $indexerRegistry;
         $this->categoryRepository = $categoryRepository;
-        $this->getCustomAttributeCodes = $getCustomAttributeCodes ?? ObjectManager::getInstance()->get(
-            GetCategoryCustomAttributeCodes::class
-        );
         parent::__construct(
             $context,
             $registry,
@@ -317,7 +304,11 @@ protected function _construct()
      */
     protected function getCustomAttributesCodes()
     {
-        return $this->getCustomAttributeCodes->execute($this->metadataService);
+        if ($this->customAttributesCodes === null) {
+            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
+            $this->customAttributesCodes = array_diff($this->customAttributesCodes, CategoryInterface::ATTRIBUTES);
+        }
+        return $this->customAttributesCodes;
     }
 
     /**

app/code/Magento/Catalog/Model/Entity/GetCategoryCustomAttributeCodes.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model;
+
+/**
+ * Filter custom attributes for product using the blacklist
+ */
+class FilterProductCustomAttribute
+{
+    /**
+     * @var array
+     */
+    private $blackList;
+
+    /**
+     * @param array $blackList
+     */
+    public function __construct(array $blackList = [])
+    {
+        $this->blackList = $blackList;
+    }
+
+    /**
+     * Delete custom attribute
+     * @param array $attributes
+     * @return array
+     */
+    public function execute(array $attributes): array
+    {
+        return array_diff($attributes, $this->blackList);
+    }
+}