Merge remote-tracking branch 'origin/MC-17878' into 2.3.3-develop-pr58

Author: zakdma

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute.php

@@ -11,7 +11,9 @@
 use Magento\Eav\Model\Entity\Attribute as EntityAttribute;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
 
 /**
  * EAV attribute resource model
@@ -20,7 +22,7 @@
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  * @since 100.0.2
  */
-class Attribute extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
+class Attribute extends AbstractDb
 {
     /**
      * Eav Entity attributes cache
@@ -189,6 +191,23 @@ protected function _beforeSave(AbstractModel $object)
         return parent::_beforeSave($object);
     }
 
+    /**
+     * @inheritdoc
+     *
+     * @param AbstractModel $attribute
+     * @return AbstractDb
+     * @throws CouldNotDeleteException
+     */
+    protected function _beforeDelete(AbstractModel $attribute)
+    {
+        /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+        if ($attribute->getId() && !$attribute->getIsUserDefined()) {
+            throw new CouldNotDeleteException(__("The system attribute can't be deleted."));
+        }
+
+        return parent::_beforeDelete($attribute);
+    }
+
     /**
      * Save additional attribute data after save attribute
      *

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php

@@ -4,12 +4,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Catalog\Api;
 
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
-use Magento\TestFramework\Helper\Bootstrap;
 
+/**
+ * API tests for \Magento\Catalog\Model\Product\Attribute\Repository.
+ */
 class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
     const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
@@ -130,6 +131,7 @@ public function testCreateWithExceptionIfAttributeAlreadyExists()
         try {
             $this->createAttribute($attributeCode);
             $this->fail("Expected exception");
+            // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
         } catch (\SoapFault $e) {
             //Expects soap exception
         } catch (\Exception $e) {
@@ -320,6 +322,20 @@ public function testDeleteById()
         $this->assertTrue($this->deleteAttribute($attributeCode));
     }
 
+    /**
+     * Trying to delete system attribute.
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/product_system_attribute.php
+     * @expectedException \Exception
+     * @expectedExceptionMessage The system attribute can't be deleted.
+     * @return void
+     */
+    public function testDeleteSystemAttributeById(): void
+    {
+        $attributeCode = 'test_attribute_code_333';
+        $this->deleteAttribute($attributeCode);
+    }
+
     /**
      * @return void
      */

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/ProcessorTest.php

@@ -5,8 +5,10 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product\Flat;
 
+use Magento\Catalog\Model\Product\Attribute\Repository;
+
 /**
- * Class FullTest
+ * Integration tests for \Magento\Catalog\Model\Indexer\Product\Flat\Processor.
  */
 class ProcessorTest extends \Magento\TestFramework\Indexer\TestCase
 {
@@ -64,22 +66,23 @@ public function testSaveAttribute()
     }
 
     /**
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoAppArea adminhtml
-     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_custom_attribute_in_flat.php
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */
     public function testDeleteAttribute()
     {
-        /** @var $product \Magento\Catalog\Model\Product */
-        $product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\Product::class
-        );
-
-        /** @var \Magento\Catalog\Model\ResourceModel\Product $productResource */
-        $productResource = $product->getResource();
-        $productResource->getAttribute('media_gallery')->delete();
+        /** @var \Magento\Catalog\Model\ResourceModel\Eav\Attribute $model */
+        $model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
+        /** @var Repository $productAttributeRepository */
+        $productAttributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->get(Repository::class);
+        $productAttrubute = $productAttributeRepository->get('flat_attribute');
+        $productAttributeId = $productAttrubute->getAttributeId();
+        $model->load($productAttributeId)->delete();
 
         $this->assertTrue($this->_processor->getIndexer()->isInvalid());
     }

dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php

@@ -20,6 +20,7 @@
         'is_global' => 1,
         'frontend_input' => 'select',
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'option' => ['value' => ['option_0' => [0 => 'Option Label']]],
         'backend_type' => 'int',
     ]

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Eav/AttributeTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Eav;
 
+/**
+ * Test for \Magento\Catalog\Model\ResourceModel\Eav\Attribute.
+ */
 class AttributeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,6 +22,11 @@ protected function setUp()
         );
     }
 
+    /**
+     * Test Create -> Read -> Update -> Delete attribute operations.
+     *
+     * @return void
+     */
     public function testCRUD()
     {
         $this->_model->setAttributeCode(
@@ -31,7 +39,7 @@ public function testCRUD()
             )->getId()
         )->setFrontendLabel(
             'test'
-        );
+        )->setIsUserDefined(1);
         $crud = new \Magento\TestFramework\Entity($this->_model, ['frontend_label' => uniqid()]);
         $crud->testCrud();
     }

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

@@ -9,5 +9,6 @@
     ->create(\Magento\Catalog\Model\ResourceModel\Eav\Attribute::class);
 $attribute->setAttributeCode('test_attribute_code_666')
     ->setEntityTypeId(3)
-    ->setIsGlobal(1);
+    ->setIsGlobal(1)
+    ->setIsUserDefined(1);
 $attribute->save();

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

@@ -10,5 +10,6 @@
 $attribute->setAttributeCode('test_attribute_code_333')
     ->setEntityTypeId(4)
     ->setIsGlobal(1)
-    ->setPrice(95);
+    ->setPrice(95)
+    ->setIsUserDefined(1);
 $attribute->save();

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

@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+// phpcs:ignore Magento2.Security.IncludeFile
+require __DIR__ . '/product_attribute.php';
+/** @var $attributeRepository \Magento\Catalog\Model\Product\Attribute\Repository */
+$attributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\Product\Attribute\Repository::class);
+/** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+$attribute = $attributeRepository->get('test_attribute_code_333');
+
+$attributeRepository->save($attribute->setIsUserDefined(0));

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

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var $attributeRepository \Magento\Catalog\Model\Product\Attribute\Repository */
+$attributeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+    ->get(\Magento\Catalog\Model\Product\Attribute\Repository::class);
+
+try {
+    /** @var $attribute \Magento\Eav\Api\Data\AttributeInterface */
+    $attribute = $attributeRepository->get('test_attribute_code_333');
+    $attributeRepository->save($attribute->setIsUserDefined(1));
+    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+} catch (NoSuchEntityException $e) {
+}
+/** @var \Magento\Framework\Registry $registry */
+$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+try {
+    $attribute = $attributeRepository->get('test_attribute_code_333');
+    if ($attribute->getId()) {
+        $attribute->delete();
+    }
+    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+} catch (\Exception $e) {
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

dev/tests/integration/testsuite/Magento/Framework/Search/_files/date_attribute.php

@@ -25,6 +25,7 @@
         'entity_type_id' => $installer->getEntityTypeId('catalog_product'),
         'is_global' => 1,
         'is_filterable' => 1,
+        'is_user_defined' => 1,
         'backend_type' => 'datetime',
         'frontend_input' => 'date',
         'frontend_label' => 'Test Date',