[2.3-develop] Forwardport of magento/magento2#12767

magento-engcom-team · magento-engcom-team · commit 4810755a4751 · 2018-02-06T16:46:50.000+02:00
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);
     }

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ abstract class AbstractEntity extends AbstractResource implements EntityInterfac`
`66`	`66`	`*`
`67`	`67`	`* @var array`
`68`	`68`	`*/`
`69`		`- protected $attributesByScope = [];`
	`69`	`+ private $attributesByScope = [];`
`70`	`70`
`71`	`71`	`/**`
`72`	`72`	`* Two-dimensional array by table name and attribute name`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ public function testLoadAllAttributes()`
`78`	`78`	`$attributeMock->expects($this->once())->method('setIsGlobal')->with(1)->willReturnSelf();`
`79`	`79`	`$attributeMock->expects($this->once())->method('setEntityType')->with($this->entityTypeMock)->willReturnSelf();`
`80`	`80`	`$attributeMock->expects($this->once())->method('setEntityTypeId')->with($entityTypeId)->willReturnSelf();`
`81`		`- $this->entityMock->expects($this->once())->method('addAttributeByScope')->willReturnSelf();`
`82`	`81`	`$this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);`
`83`	`82`	`}`
`84`	`83`
`@@ -102,7 +101,6 @@ public function testLoadAllAttributesAttributeCodesPresentInDefaultAttributes()`
`102`	`101`	`->method('getEntityAttributes')->willReturn($attributeCodes);`
`103`	`102`	`$this->entityMock->expects($this->once())->method('getDefaultAttributes')->willReturn($defaultAttributes);`
`104`	`103`	`$this->entityMock->expects($this->once())->method('unsetAttributes')->willReturnSelf();`
`105`		`- $this->entityMock->expects($this->atLeastOnce())->method('addAttributeByScope')->willReturnSelf();`
`106`	`104`	`$this->objectManagerMock->expects($this->never())->method('create');`
`107`	`105`	`$this->attributeLoader->loadAllAttributes($this->entityMock, $dataObject);`
`108`	`106`	`}`