AC-1214 Fixed static tests

Author: mahesh-singh-rajawat

app/code/Magento/Catalog/Model/ResourceModel/Collection/AbstractCollection.php

@@ -255,20 +255,15 @@ protected function _setItemAttributeValue($valueInfo)
             $this->getEntity()->getType(),
             $valueInfo['attribute_id']
         );
-        $attributeCode = $attribute->getAttributeCode();
         if ((int)$attribute->getIsGlobal() === ScopedAttributeInterface::SCOPE_GLOBAL) {
-            $entityLinkField = $this->getEntity()->getLinkField();
-            $attributeTable = $attribute->getBackend()->getTable();
-            $linkField = $attribute->getEntity()->getLinkField();
-
             $select = $this->getConnection()->select()
                 ->from(
                     ['e' => $this->getEntity()->getEntityTable()],
                     ['entity_id']
                 )
                 ->join(
-                    ['t_d' => $attributeTable],
-                    "e.{$entityLinkField} = t_d.{$linkField}",
+                    ['t_d' => $attribute->getBackend()->getTable()],
+                    "e.{$this->getEntity()->getLinkField()} = t_d.{$attribute->getEntity()->getLinkField()}",
                     ['t_d.value']
                 )->where(
                     " e.entity_id = ?",
@@ -290,7 +285,7 @@ protected function _setItemAttributeValue($valueInfo)
         }
 
         foreach ($this->_itemsById[$entityId] as $object) {
-            $object->setData($attributeCode, $valueInfo['value']);
+            $object->setData($attribute->getAttributeCode(), $valueInfo['value']);
         }
 
         return $this;

app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php

@@ -19,6 +19,7 @@
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\Entity\ScopeInterface;
 use Magento\Framework\Model\Entity\ScopeResolver;
+use Magento\Store\Model\Store;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -180,12 +181,9 @@ public function execute($entityType, $entityData, $arguments = [])
             foreach ($attributes as $attributeValue) {
                 if (isset($attributesMap[$attributeValue['attribute_id']])) {
                     if (isset($attributeScopeGlobal[$attributeValue['attribute_id']]) &&
-                        $attributeScopeGlobal[$attributeValue['attribute_id']]
+                        (int)$attributeValue['store_id'] !== Store::DEFAULT_STORE_ID
                     ) {
-                        if ((int)$attributeValue['store_id'] !== \Magento\Store\Model\Store::DEFAULT_STORE_ID) {
-                            continue;
-                        }
-                        $entityData[$attributesMap[$attributeValue['attribute_id']]] =  $attributeValue['value'];
+                        continue;
                     }
                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
                 } else {

app/code/Magento/Eav/Test/Unit/Model/ResourceModel/ReadHandlerTest.php

@@ -15,6 +15,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Model\Entity\ScopeInterface;
 use Magento\Framework\Model\Entity\ScopeResolver;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -66,7 +67,7 @@ protected function setUp(): void
         $this->configMock = $args['config'];
         $this->scopeResolverMock = $args['scopeResolver'];
 
-        $scopeMock = $this->getMockBuilder(\Magento\Framework\Model\Entity\ScopeInterface::class)
+        $scopeMock = $this->getMockBuilder(ScopeInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
         $fallback = clone $scopeMock;