Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-91529

Joan He · Joan He · commit ab33715de07b · 2018-06-11T10:07:13.000-05:00
# Conflicts:
#	app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
diff --git a/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php b/app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php
@@ -522,14 +522,14 @@ public function testSetupAttributeMetaDefaultAttribute(
             )
             ->willReturn($expected);
 
-        $this->arrayManagerMock->expects($this->once())
+        $this->arrayManagerMock->expects($this->any())
             ->method('merge')
             ->with(
                 $this->anything(),
                 $this->anything(),
                 $this->callback(
                     function ($value) use ($attributeOptionsExpected) {
-                        return $value['options'] === $attributeOptionsExpected;
+                        return isset($value['options']) ? $value['options'] === $attributeOptionsExpected : true;
                     }
                 )
             )

Original file line number	Diff line number	Diff line change
`@@ -522,14 +522,14 @@ public function testSetupAttributeMetaDefaultAttribute(`
`522`	`522`	`)`
`523`	`523`	`->willReturn($expected);`
`524`	`524`
`525`		`- $this->arrayManagerMock->expects($this->once())`
	`525`	`+ $this->arrayManagerMock->expects($this->any())`
`526`	`526`	`->method('merge')`
`527`	`527`	`->with(`
`528`	`528`	`$this->anything(),`
`529`	`529`	`$this->anything(),`
`530`	`530`	`$this->callback(`
`531`	`531`	`function ($value) use ($attributeOptionsExpected) {`
`532`		`- return $value['options'] === $attributeOptionsExpected;`
	`532`	`+ return isset($value['options']) ? $value['options'] === $attributeOptionsExpected : true;`
`533`	`533`	`}`
`534`	`534`	`)`
`535`	`535`	`)`