Merge branch 'MAGETWO-90576' into MPI-PR

Author: YevSent

app/code/Magento/Catalog/Test/Unit/Ui/DataProvider/Product/Form/Modifier/EavTest.php

@@ -8,6 +8,7 @@
 use Magento\Catalog\Model\Product\Type;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\Source\SourceInterface;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\EntityManager\EventManager;
 use Magento\Store\Model\StoreManagerInterface;
@@ -256,7 +257,15 @@ protected function setUp()
         $this->searchResultsMock = $this->getMockBuilder(SearchResultsInterface::class)
             ->getMockForAbstractClass();
         $this->eavAttributeMock = $this->getMockBuilder(Attribute::class)
-            ->setMethods(['load', 'getAttributeGroupCode', 'getApplyTo', 'getFrontendInput', 'getAttributeCode'])
+            ->setMethods([
+                'load',
+                'getAttributeGroupCode',
+                'getApplyTo',
+                'getFrontendInput',
+                'getAttributeCode',
+                'usesSource',
+                'getSource'
+            ])
             ->disableOriginalConstructor()
             ->getMock();
         $this->productAttributeMock = $this->getMockBuilder(ProductAttributeInterface::class)
@@ -450,72 +459,100 @@ public function testModifyData()
     }
 
     /**
-     * @param int $productId
+     * @param int|null $productId
      * @param bool $productRequired
-     * @param string $attrValue
+     * @param string|null $attrValue
      * @param array $expected
      * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::isProductExists
      * @covers \Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav::setupAttributeMeta
      * @dataProvider setupAttributeMetaDataProvider
      */
-    public function testSetupAttributeMetaDefaultAttribute($productId, $productRequired, $attrValue, $expected)
-    {
-        $configPath =  'arguments/data/config';
+    public function testSetupAttributeMetaDefaultAttribute(
+        $productId,
+        $productRequired,
+        $attrValue,
+        $expected
+    ) {
+        $configPath = 'arguments/data/config';
         $groupCode = 'product-details';
         $sortOrder = '0';
+        $attributeOptions = [
+            ['value' => 1, 'label' => 'Int label'],
+            ['value' => 1.5, 'label' => 'Float label'],
+            ['value' => true, 'label' => 'Boolean label'],
+            ['value' => 'string', 'label' => 'String label'],
+            ['value' => ['test1', 'test2'], 'label' => 'Array label']
+        ];
+        $attributeOptionsExpected = [
+            ['value' => '1', 'label' => 'Int label'],
+            ['value' => '1.5', 'label' => 'Float label'],
+            ['value' => '1', 'label' => 'Boolean label'],
+            ['value' => 'string', 'label' => 'String label'],
+            ['value' => ['test1', 'test2'], 'label' => 'Array label']
+        ];
 
-        $this->productMock->expects($this->any())
-            ->method('getId')
+        $this->productMock->method('getId')
             ->willReturn($productId);
 
-        $this->productAttributeMock->expects($this->any())
-            ->method('getIsRequired')
+        $this->productAttributeMock->method('getIsRequired')
             ->willReturn($productRequired);
 
-        $this->productAttributeMock->expects($this->any())
-            ->method('getDefaultValue')
+        $this->productAttributeMock->method('getDefaultValue')
             ->willReturn('required_value');
 
-        $this->productAttributeMock->expects($this->any())
-            ->method('getAttributeCode')
+        $this->productAttributeMock->method('getAttributeCode')
             ->willReturn('code');
 
-        $this->productAttributeMock->expects($this->any())
-            ->method('getValue')
+        $this->productAttributeMock->method('getValue')
             ->willReturn('value');
 
         $attributeMock = $this->getMockBuilder(AttributeInterface::class)
             ->setMethods(['getValue'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $attributeMock->expects($this->any())
-            ->method('getValue')
+        $attributeMock->method('getValue')
             ->willReturn($attrValue);
 
-        $this->productMock->expects($this->any())
-            ->method('getCustomAttribute')
+        $this->productMock->method('getCustomAttribute')
             ->willReturn($attributeMock);
+        $this->eavAttributeMock->method('usesSource')
+            ->willReturn(true);
+
+        $attributeSource = $this->getMockBuilder(SourceInterface::class)
+            ->getMockForAbstractClass();
+        $attributeSource->method('getAllOptions')
+            ->willReturn($attributeOptions);
 
-        $this->arrayManagerMock->expects($this->any())
-            ->method('set')
+        $this->eavAttributeMock->method('getSource')
+            ->willReturn($attributeSource);
+
+        $this->arrayManagerMock->method('set')
             ->with(
                 $configPath,
                 [],
                 $expected
             )
             ->willReturn($expected);
 
-        $this->arrayManagerMock->expects($this->any())
+        $this->arrayManagerMock->expects($this->once())
             ->method('merge')
+            ->with(
+                $this->anything(),
+                $this->anything(),
+                $this->callback(
+                    function ($value) use ($attributeOptionsExpected) {
+                        return $value['options'] === $attributeOptionsExpected;
+                    }
+                )
+            )
             ->willReturn($expected);
 
-        $this->arrayManagerMock->expects($this->any())
-            ->method('get')
+        $this->arrayManagerMock->method('get')
             ->willReturn([]);
 
-        $this->arrayManagerMock->expects($this->any())
-            ->method('exists');
+        $this->arrayManagerMock->method('exists')
+            ->willReturn(true);
 
         $this->assertEquals(
             $expected,

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -591,8 +591,9 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
+            $options = $attributeModel->getSource()->getAllOptions();
             $meta = $this->arrayManager->merge($configPath, $meta, [
-                'options' => $attributeModel->getSource()->getAllOptions(),
+                'options' => $this->convertOptionsValueToString($options),
             ]);
         }
 
@@ -645,6 +646,22 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         return $meta;
     }
 
+    /**
+     * Convert options value to string
+     *
+     * @param array $options
+     * @return array
+     */
+    private function convertOptionsValueToString(array $options): array
+    {
+        array_walk($options, function (&$value) {
+            if (isset($value['value']) && is_scalar($value['value'])) {
+                $value['value'] = (string)$value['value'];
+            }
+        });
+        return $options;
+    }
+
     /**
      * @param ProductAttributeInterface $attribute
      * @param array $meta