Merge remote-tracking branch 'mainline/develop' into develop-prs

Author: vrann

app/code/Magento/CatalogInventory/Test/Unit/Ui/Component/Product/Form/Element/UseConfigSettingsTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Ui\Component\Product\Form\Element;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings;
 use Magento\Framework\Data\ValueSourceInterface;
@@ -15,16 +16,23 @@ class UseConfigSettingsTest extends \PHPUnit_Framework_TestCase
     /**
      * @var ObjectManagerHelper
      */
-    protected $objectManagerHelper;
+    private $objectManagerHelper;
 
     /**
      * @var ContextInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    protected $contextMock;
+    private $contextMock;
 
     /**
-     * @return void
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
      */
+    private $serializerMock;
+
+    /**
+     * @var UseConfigSettings
+     */
+    private $useConfigSettings;
+
     protected function setUp()
     {
         $this->objectManagerHelper = new ObjectManagerHelper($this);
@@ -43,51 +51,70 @@ protected function setUp()
         $this->contextMock->expects($this->any())
             ->method('getProcessor')
             ->willReturn($processorMock);
+        $this->serializerMock = $this->getMock(Json::class);
+        $this->useConfigSettings = $this->objectManagerHelper->getObject(
+            UseConfigSettings::class,
+            [
+                'context' => $this->contextMock,
+                'serializer' => $this->serializerMock
+            ]
+        );
     }
 
-    /**
-     * @return void
-     */
     public function testPrepare()
     {
         $config = ['valueFromConfig' => 123];
-        $element = $this->getTestedElement($config);
-        $element->prepare();
-        $this->assertEquals($config, $element->getData('config'));
+        $this->useConfigSettings->setData('config', $config);
+        $this->useConfigSettings->prepare();
+        $this->assertEquals($config, $this->useConfigSettings->getData('config'));
     }
 
     /**
-     * @return void
+     * @param array $expectedResult
+     * @param string|int $sourceValue
+     * @param int $serializedCallCount
+     * @dataProvider prepareSourceDataProvider
      */
-    public function testPrepareSource()
+    public function testPrepareSource(array $expectedResult, $sourceValue, $serializedCallCount = 0)
     {
         /** @var ValueSourceInterface|\PHPUnit_Framework_MockObject_MockObject $source */
         $source = $this->getMock(ValueSourceInterface::class);
         $source->expects($this->once())
             ->method('getValue')
-            ->with('someKey')
-            ->willReturn('someData');
+            ->with($expectedResult['keyInConfiguration'])
+            ->willReturn($sourceValue);
+
+        $this->serializerMock->expects($this->exactly($serializedCallCount))
+            ->method('unserialize')
+            ->with($sourceValue)
+            ->willReturn($expectedResult['valueFromConfig']);
 
-        $config = ['valueFromConfig' => $source, 'keyInConfiguration' => 'someKey'];
-        $element = $this->getTestedElement($config);
-        $element->prepare();
+        $config = array_replace($expectedResult, ['valueFromConfig' => $source]);
+        $this->useConfigSettings->setData('config', $config);
+        $this->useConfigSettings->prepare();
 
-        $expectedResult =['valueFromConfig' => 'someData', 'keyInConfiguration' => 'someKey'];
-        $this->assertEquals($expectedResult, $element->getData('config'));
+        $this->assertEquals($expectedResult, $this->useConfigSettings->getData('config'));
     }
 
-    /**
-     * @param array $config
-     * @return UseConfigSettings
-     */
-    protected function getTestedElement(array $config = [])
+    public function prepareSourceDataProvider()
     {
-        return $this->objectManagerHelper->getObject(
-            UseConfigSettings::class,
-            [
-                'context' => $this->contextMock,
-                'data' => ['config' => $config]
+        return [
+            'valid' => [
+                'expectedResult' => [
+                    'valueFromConfig' => 2,
+                    'keyInConfiguration' => 'validKey'
+                ],
+                'sourceValue' => 2
+            ],
+            'serialized' => [
+                'expectedResult' => [
+                    'valueFromConfig' => ['32000' => 3],
+                    'keyInConfiguration' => 'serializedKey',
+                    'unserialized' => true
+                ],
+                'sourceValue' => '{"32000":3}',
+                'serialziedCallCount' => 1
             ]
-        );
+        ];
     }
 }

app/code/Magento/CatalogInventory/Test/Unit/Ui/DataProvider/Product/Form/Modifier/AdvancedInventoryTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogInventory\Test\Unit\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Store\Model\Store;
 use Magento\Catalog\Test\Unit\Ui\DataProvider\Product\Form\Modifier\AbstractModifierTest;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
@@ -37,6 +38,11 @@ class AdvancedInventoryTest extends AbstractModifierTest
      */
     protected $stockConfigurationMock;
 
+    /**
+     * @var Json|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializerMock;
+
     protected function setUp()
     {
         parent::setUp();
@@ -59,6 +65,7 @@ protected function setUp()
         $this->productMock->expects($this->any())
             ->method('getStore')
             ->willReturn($this->storeMock);
+        $this->serializerMock = $this->getMock(Json::class);
     }
 
     /**
@@ -71,6 +78,7 @@ protected function createModel()
             'stockRegistry' => $this->stockRegistryMock,
             'stockConfiguration' => $this->stockConfigurationMock,
             'arrayManager' => $this->arrayManagerMock,
+            'serializer' => $this->serializerMock
         ]);
     }
 
@@ -79,14 +87,31 @@ public function testModifyMeta()
         $this->assertNotEmpty($this->getModel()->modifyMeta(['meta_key' => 'meta_value']));
     }
 
-    public function testModifyData()
-    {
-        $modelId = 1;
-        $someData = 1;
-
+    /**
+     * @param int $modelId
+     * @param int $someData
+     * @param int|string $defaultConfigValue
+     * @param null|array $unserializedValue
+     * @param int $serializeCallCount
+     * @dataProvider modifyDataProvider
+     */
+    public function testModifyData(
+        $modelId,
+        $someData,
+        $defaultConfigValue,
+        $unserializedValue = null,
+        $serializeCallCount = 0
+    ) {
         $this->productMock->expects($this->any())->method('getId')->willReturn($modelId);
 
-        $this->stockConfigurationMock->expects($this->any())->method('getDefaultConfigValue')->willReturn("a:0:{}");
+        $this->stockConfigurationMock->expects($this->any())
+            ->method('getDefaultConfigValue')
+            ->willReturn($defaultConfigValue);
+
+        $this->serializerMock->expects($this->exactly($serializeCallCount))
+            ->method('unserialize')
+            ->with($defaultConfigValue)
+            ->willReturn($unserializedValue);
 
         $this->stockItemMock->expects($this->once())->method('getData')->willReturn(['someData']);
         $this->stockItemMock->expects($this->once())->method('getManageStock')->willReturn($someData);
@@ -109,4 +134,12 @@ public function testModifyData()
 
         $this->assertArrayHasKey($modelId, $this->getModel()->modifyData([]));
     }
+
+    public function modifyDataProvider()
+    {
+        return [
+            [1, 1, 1],
+            [1, 1, '{"36000":2}', ['36000' => 2], 1]
+        ];
+    }
 }

app/code/Magento/CatalogInventory/Ui/Component/Product/Form/Element/UseConfigSettings.php

@@ -5,14 +5,35 @@
  */
 namespace Magento\CatalogInventory\Ui\Component\Product\Form\Element;
 
-use Magento\Ui\Component\Form\Element\Checkbox;
 use Magento\Framework\Data\ValueSourceInterface;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\Form\Element\Checkbox;
 
 /**
  * Class UseConfigSettings sets default value from configuration
  */
 class UseConfigSettings extends Checkbox
 {
+    /** @var Json */
+    private $serializer;
+
+    /**
+     * @param ContextInterface $context
+     * @param array $components
+     * @param array $data
+     * @param Json|null $serializer
+     */
+    public function __construct(
+        ContextInterface $context,
+        $components = [],
+        array $data = [],
+        Json $serializer = null
+    ) {
+        parent::__construct($context, $components, $data);
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
+    }
+
     /**
      * Prepare component configuration
      *
@@ -26,11 +47,13 @@ public function prepare()
             && $config['valueFromConfig'] instanceof ValueSourceInterface
         ) {
             $keyInConfiguration = $config['valueFromConfig']->getValue($config['keyInConfiguration']);
-            if (!empty($config['unserialized']) && strpos($keyInConfiguration, 'a:') === 0) {
-                $config['valueFromConfig'] = unserialize($keyInConfiguration);
-            } else {
-                $config['valueFromConfig'] = $keyInConfiguration;
+            if (!empty($config['unserialized']) && is_string($keyInConfiguration)) {
+                $unserializedValue = $this->serializer->unserialize($keyInConfiguration);
+                if (json_last_error() === JSON_ERROR_NONE) {
+                    $keyInConfiguration = $unserializedValue;
+                }
             }
+            $config['valueFromConfig'] = $keyInConfiguration;
         }
         $this->setData('config', (array)$config);
 

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -9,6 +9,7 @@
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\CatalogInventory\Api\Data\StockItemInterface;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
@@ -45,22 +46,30 @@ class AdvancedInventory extends AbstractModifier
      */
     private $meta = [];
 
+    /**
+     * @var Json
+     */
+    private $serializer;
+
     /**
      * @param LocatorInterface $locator
      * @param StockRegistryInterface $stockRegistry
      * @param ArrayManager $arrayManager
      * @param StockConfigurationInterface $stockConfiguration
+     * @param Json|null $serializer
      */
     public function __construct(
         LocatorInterface $locator,
         StockRegistryInterface $stockRegistry,
         ArrayManager $arrayManager,
-        StockConfigurationInterface $stockConfiguration
+        StockConfigurationInterface $stockConfiguration,
+        Json $serializer = null
     ) {
         $this->locator = $locator;
         $this->stockRegistry = $stockRegistry;
         $this->arrayManager = $arrayManager;
         $this->stockConfiguration = $stockConfiguration;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
     }
 
     /**
@@ -89,21 +98,19 @@ public function modifyData(array $data)
         }
 
         if (!empty($this->stockConfiguration->getDefaultConfigValue(StockItemInterface::MIN_SALE_QTY))) {
-            $minSaleQtyData = null;
-            $defaultConfigValue = $this->stockConfiguration->getDefaultConfigValue(StockItemInterface::MIN_SALE_QTY);
+            $minSaleQtyData = $this->stockConfiguration->getDefaultConfigValue(StockItemInterface::MIN_SALE_QTY);
 
-            if (strpos($defaultConfigValue, 'a:') === 0) {
+            if (is_string($minSaleQtyData)) {
                 // Set data source for dynamicRows Minimum Qty Allowed in Shopping Cart
-                $minSaleQtyValue = unserialize($defaultConfigValue);
-
-                foreach ($minSaleQtyValue as $group => $qty) {
-                    $minSaleQtyData[] = [
-                        StockItemInterface::CUSTOMER_GROUP_ID => $group,
-                        StockItemInterface::MIN_SALE_QTY => $qty
-                    ];
+                $unserializedMinSaleQty = $this->serializer->unserialize($minSaleQtyData);
+                if (is_array($unserializedMinSaleQty) && json_last_error() === JSON_ERROR_NONE) {
+                    $minSaleQtyData = array_map(function ($group, $qty) {
+                        return [
+                            StockItemInterface::CUSTOMER_GROUP_ID => $group,
+                            StockItemInterface::MIN_SALE_QTY => $qty
+                        ];
+                    }, array_keys($unserializedMinSaleQty), array_values($unserializedMinSaleQty));
                 }
-            } else {
-                $minSaleQtyData = $defaultConfigValue;
             }
 
             $path = $modelId . '/' . self::DATA_SOURCE_DEFAULT . '/stock_data/min_qty_allowed_in_shopping_cart';