Merge remote-tracking branch 'origin/MC-21003' into 2.3-develop-com-pr5

Author: zakdma

dev/tests/integration/framework/Magento/TestFramework/Eav/Model/ResourceModel/GetEntityIdByAttributeId.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Eav\Model\ResourceModel;
+
+use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set as AttributeSetResource;
+
+/**
+ * Search and return attribute data from eav entity attribute table.
+ */
+class GetEntityIdByAttributeId
+{
+    /**
+     * @var AttributeSetResource
+     */
+    private $attributeSetResource;
+
+    /**
+     * @param AttributeSetResource $setResource
+     */
+    public function __construct(
+        AttributeSetResource $setResource
+    ) {
+        $this->attributeSetResource = $setResource;
+    }
+
+    /**
+     * Returns entity attribute by id.
+     *
+     * @param int $setId
+     * @param int $attributeId
+     * @return int|null
+     */
+    public function execute(int $setId, int $attributeId): ?int
+    {
+        $select = $this->attributeSetResource->getConnection()->select()
+            ->from($this->attributeSetResource->getTable('eav_entity_attribute'))
+            ->where('attribute_set_id = ?', $setId)
+            ->where('attribute_id = ?', $attributeId);
+
+        $result = $this->attributeSetResource->getConnection()->fetchOne($select);
+        return $result ? (int)$result : null;
+    }
+}

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/SetTest.php

@@ -16,13 +16,15 @@
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set as AttributeSetResource;
 use Magento\Framework\Api\AttributeInterface;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\Eav\Model\GetAttributeGroupByName;
+use Magento\TestFramework\Eav\Model\ResourceModel\GetEntityIdByAttributeId;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Provides tests for attribute set model saving.
  *
  * @magentoDbIsolation enabled
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SetTest extends \PHPUnit\Framework\TestCase
 {
@@ -66,6 +68,11 @@ class SetTest extends \PHPUnit\Framework\TestCase
      */
     private $attributeGroupByName;
 
+    /**
+     * @var GetEntityIdByAttributeId
+     */
+    private $getEntityIdByAttributeId;
+
     /**
      * @inheritdoc
      */
@@ -80,6 +87,7 @@ protected function setUp()
         $this->attributeSetResource = $this->objectManager->get(AttributeSetResource::class);
         $this->attributeCollectionFactory = $this->objectManager->get(CollectionFactory ::class);
         $this->attributeGroupByName = $this->objectManager->get(GetAttributeGroupByName::class);
+        $this->getEntityIdByAttributeId = $this->objectManager->get(GetEntityIdByAttributeId::class);
     }
 
     /**
@@ -263,11 +271,6 @@ private function getSetExcludedAttributes(int $setId): array
      */
     private function getEntityAttributeId(int $setId, int $attributeId): int
     {
-        $select = $this->attributeSetResource->getConnection()->select()
-            ->from($this->attributeSetResource->getTable('eav_entity_attribute'), ['entity_attribute_id'])
-            ->where('attribute_set_id = ?', $setId)
-            ->where('attribute_id = ?', $attributeId);
-
-        return (int)$this->attributeSetResource->getConnection()->fetchOne($select);
+        return $this->getEntityIdByAttributeId->execute($setId, $attributeId);
     }
 }