[2.3-develop] Forwardport of #12767

magento · Feb 6, 2018 · 4810755 · 4810755
1 parent c3e1d93
commit 4810755
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -66,7 +66,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac
      *
      * @var array
      */
-    protected $attributesByScope = [];
+    private $attributesByScope = [];
 
     /**
      * Two-dimensional array by table name and attribute name

diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/AttributeLoaderTest.php
@@ -78,7 +78,6 @@ 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('addAttributeByScope')->willReturnSelf();
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }
 
@@ -102,7 +101,6 @@ 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('addAttributeByScope')->willReturnSelf();
         $this->objectManagerMock->expects($this->never())->method('create');
         $this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);
     }