Merge remote-tracking branch 'origin/imported-magento-magento2-31998' into 2.4-develop-pr127

Author: zakdma

app/code/Magento/Catalog/Model/Product/Authorization.php

@@ -129,7 +129,7 @@ private function hasProductChanged(ProductModel $product, ?array $oldProduct = n
                 //No new value
                 continue;
             }
-            if (!in_array($newValue, $oldValues, true)) {
+            if ($newValue !== null && !in_array($newValue, $oldValues, true)) {
                 return true;
             }
         }

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php

@@ -58,7 +58,7 @@ protected function setUp(): void
     /**
      * Verify AuthorizedSavingOf
      *
-     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_design_attributes.php
      * @param array $data
      *
      * @dataProvider postRequestData
@@ -68,7 +68,7 @@ public function testAuthorizedSavingOf(array $data): void
         $this->request->setPost(new Parameters($data));
 
         /** @var Product $product */
-        $product = $this->productRepository->get('simple');
+        $product = $this->productRepository->get('simple_design_attribute');
 
         $product = $this->initializationHelper->initialize($product);
         $this->assertEquals('simple_new', $product->getName());
@@ -88,12 +88,12 @@ public function postRequestData(): array
                 [
                     'product' => [
                         'name' => 'simple_new',
-                        'custom_design' => '',
-                        'page_layout' => '',
+                        'custom_design' => '3',
+                        'page_layout' => '1column',
                         'options_container' => 'container2',
                         'custom_layout_update' => '',
-                        'custom_design_from' => '',
-                        'custom_design_to' => '',
+                        'custom_design_from' => '2021-02-19 00:00:00',
+                        'custom_design_to' => '2021-02-09 00:00:00',
                         'custom_layout_update_file' => '',
                     ],
                     'use_default' => [
@@ -114,8 +114,8 @@ public function postRequestData(): array
                         'page_layout' => '',
                         'options_container' => 'container2',
                         'custom_design' => '',
-                        'custom_design_from' => '',
-                        'custom_design_to' => '',
+                        'custom_design_from' => '2020-01-02',
+                        'custom_design_to' => '2020-01-03',
                         'custom_layout' => '',
                         'custom_layout_update_file' => '__no_update__',
                     ],

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_design_attributes.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$defaultWebsiteId = $websiteRepository->get('base')->getId();
+$product = $productFactory->create();
+$product->isObjectNew(true);
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$defaultWebsiteId])
+    ->setName('Simple with design attribute')
+    ->setSku('simple_design_attribute')
+    ->setPrice(10)
+    ->setWeight(1)
+    ->setShortDescription('Short description')
+    ->setTaxClassId(0)
+    ->setDescription('Description with <b>html tag</b>')
+    ->setMetaTitle('meta title')
+    ->setMetaKeyword('meta keyword')
+    ->setMetaDescription('meta description')
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(['use_config_manage_stock' => 0])
+    ->setCanSaveCustomOptions(true)
+    ->setCustomDesignFrom('2020-01-02')
+    ->setCustomDesignTo('2020-01-03')
+    ->setHasOptions(true);
+/** @var ProductRepositoryInterface $productRepositoryFactory */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_design_attributes_rollback.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+\Magento\TestFramework\Helper\Bootstrap::getInstance()->getInstance()->reinitialize();
+
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+try {
+    $product = $productRepository->get('simple_design_attribute', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $e) {
+}
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);