magento/magento2#12767

Author: Stanislav Idolov

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

@@ -463,21 +463,15 @@ public function getAttribute($attribute)
      * Adding attribute to entity
      *
      * @param AbstractAttribute $attribute
-     * @param DataObject|null $object
      * @return $this
      */
-    public function addAttribute(AbstractAttribute $attribute, $object = null)
+    public function addAttribute(AbstractAttribute $attribute)
     {
         $attribute->setEntity($this);
         $attributeCode = $attribute->getAttributeCode();
 
         $this->_attributesByCode[$attributeCode] = $attribute;
 
-        if ($object !== null) {
-            $suffix = $this->getAttributesCacheSuffix($object);
-            $this->attributesByScope[$suffix][$attributeCode] = $attribute;
-        }
-
         if ($attribute->isStatic()) {
             $this->_staticAttributes[$attributeCode] = $attribute;
         } else {
@@ -487,14 +481,29 @@ public function addAttribute(AbstractAttribute $attribute, $object = null)
         return $this;
     }
 
+    /**
+     * Adding attribute to entity by scope.
+     *
+     * @param AbstractAttribute $attribute
+     * @param DataObject|null $entity
+     * @return $this
+     */
+    public function addAttributeByScope(AbstractAttribute $attribute, $entity = null)
+    {
+        $suffix = $entity !== null ? $this->getAttributesCacheSuffix($entity) : '0-0';
+        $attributeCode = $attribute->getAttributeCode();
+        $this->attributesByScope[$suffix][$attributeCode] = $attribute;
+        return $this->addAttribute($attribute);
+    }
+
     /**
      * Get attributes by scope
      *
      * @return array
      */
     private function getAttributesByScope($suffix)
     {
-        return (isset($this->attributesByScope[$suffix]) && !empty($this->attributesByScope[$suffix]))
+        return !empty($this->attributesByScope[$suffix])
             ? $this->attributesByScope[$suffix]
             : $this->getAttributesByCode();
     }

app/code/Magento/Eav/Model/Entity/AttributeLoader.php

@@ -51,13 +51,13 @@ public function __construct(
      * Retrieve configuration for all attributes
      *
      * @param AbstractEntity $resource
-     * @param DataObject|null $object
+     * @param DataObject|null $entity
      * @return AbstractEntity
      * @throws LocalizedException
      */
-    public function loadAllAttributes(AbstractEntity $resource, DataObject $object = null)
+    public function loadAllAttributes(AbstractEntity $resource, DataObject $entity = null)
     {
-        $attributes = $this->config->getEntityAttributes($resource->getEntityType(), $object);
+        $attributes = $this->config->getEntityAttributes($resource->getEntityType(), $entity);
         $attributeCodes = array_keys($attributes);
         /**
          * Check and init default attributes
@@ -67,10 +67,10 @@ public function loadAllAttributes(AbstractEntity $resource, DataObject $object =
         $resource->unsetAttributes();
 
         foreach ($defaultAttributesCodes as $attributeCode) {
-            $resource->addAttribute($this->_getDefaultAttribute($resource, $attributeCode), $object);
+            $resource->addAttributeByScope($this->_getDefaultAttribute($resource, $attributeCode), $entity);
         }
         foreach ($attributes as $attributeCode => $attribute) {
-            $resource->addAttribute($attribute, $object);
+            $resource->addAttributeByScope($attribute, $entity);
         }
         return $resource;
     }

app/code/Magento/Eav/Model/Entity/AttributeLoaderInterface.php

@@ -17,8 +17,8 @@ interface AttributeLoaderInterface
      * Retrieve configuration for all attributes
      *
      * @param AbstractEntity $resource
-     * @param DataObject|null $object
+     * @param DataObject|null $entity
      * @return AbstractEntity
      */
-    public function loadAllAttributes(AbstractEntity $resource, DataObject $object = null);
+    public function loadAllAttributes(AbstractEntity $resource, DataObject $entity = null);
 }

app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php

@@ -78,7 +78,7 @@ public function testLoadAllAttributes()
         $attributeMock->expects($this->once())->method('setIsGlobal')->with(1)->willReturnSelf();
         $attributeMock->expects($this->once())->method('setEntityType')->with($this->entityTypeMock)->willReturnSelf();
         $attributeMock->expects($this->once())->method('setEntityTypeId')->with($entityTypeId)->willReturnSelf();
-        $this->entityMock->expects($this->once())->method('addAttribute')->with($attributeMock)->willReturnSelf();
+        $this->entityMock->expects($this->once())->method('addAttributeByScope')->willReturnSelf();
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }
 
@@ -102,8 +102,7 @@ public function testLoadAllAttributesAttributeCodesPresentInDefaultAttributes()
             ->method('getEntityAttributes')->willReturn($attributeCodes);
         $this->entityMock->expects($this->once())->method('getDefaultAttributes')->willReturn($defaultAttributes);
         $this->entityMock->expects($this->once())->method('unsetAttributes')->willReturnSelf();
-        $this->entityMock->expects($this->atLeastOnce())
-            ->method('addAttribute')->with($attributeMock)->willReturnSelf();
+        $this->entityMock->expects($this->atLeastOnce())->method('addAttributeByScope')->willReturnSelf();
         $this->objectManagerMock->expects($this->never())->method('create');
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }