Merge remote-tracking branch 'origin/MAGETWO-72184' into MPI-PR-Regression2

Author: iivashchenko

app/bootstrap.php

@@ -62,6 +62,6 @@
 
 date_default_timezone_set('UTC');
 
-/*  Adjustment of precision value for several versions of PHP */
-ini_set('precision', 17);
-ini_set('serialize_precision', 17);
+/*  For data consistency between displaying (printing) and serialization a float number */
+ini_set('precision', 14);
+ini_set('serialize_precision', 14);

lib/internal/Magento/Framework/DB/DataConverter/SerializedToJson.php

@@ -93,15 +93,40 @@ protected function unserializeValue($value)
     }
 
     /**
-     * Encode value with json encoder
+     * Encode value with json encoder.
+     *
+     * In PHP version < 7.1.0 serialize() uses PG(serialize_precision) which set to 17 be default.
+     * Since json_encode() uses EG(precision) which set to 14 be default, json_encode() removes lower digits of
+     * fraction parts and destroys original value even if PHP's float could hold more precise float value.
+     * To prevent this issue EG(precision) is set to 17 to be equal with PG(serialize_precision) during
+     * data converting from serialized format to JSON.
+     *
+     * In PHP version >= 7.1.0 serialize() and json_encode() use PG(serialize_precision) which set to -1 be default.
+     * Setting -1 uses better algorithm for rounding float numbers.
+     * But for data consistency during converting process PG(serialize_precision) is set to 17.
      *
      * @param string $value
      * @return string
      * @throws DataConversionException
      */
     protected function encodeJson($value)
     {
+        $storedPrecision = ini_get('precision');
+        $storedSerializePrecision = ini_get('serialize_precision');
+
+        if (PHP_VERSION_ID < 70100) {
+            // In PHP version < 7.1.0 json_encode() uses EG(precision).
+            ini_set('precision', 17);
+        } else {
+            // In PHP version >= 7.1.0 json_encode() uses PG(serialize_precision).
+            ini_set('serialize_precision', 17);
+        }
+
         $value = $this->json->serialize($value);
+
+        ini_set('precision', $storedPrecision);
+        ini_set('serialize_precision', $storedSerializePrecision);
+
         if (json_last_error()) {
             throw new DataConversionException(json_last_error_msg());
         }

lib/internal/Magento/Framework/DB/Test/Unit/DataConverter/SerializedToJsonTest.php

@@ -8,52 +8,44 @@
 use Magento\Framework\Serialize\Serializer\Serialize;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
 class SerializedToJsonTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var Serialize|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $serializeMock;
-
-    /**
-     * @var Json|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $jsonMock;
-
     /**
      * @var SerializedToJson
      */
     private $serializedToJson;
 
     protected function setUp()
     {
-        $objectManager = new ObjectManager($this);
-        $this->serializeMock = $this->createMock(Serialize::class);
-        $this->jsonMock = $this->createMock(Json::class);
-        $this->serializedToJson = $objectManager->getObject(
-            SerializedToJson::class,
-            [
-                'serialize' => $this->serializeMock,
-                'json' => $this->jsonMock
-            ]
+        $this->serializedToJson =  new SerializedToJson(
+            new Serialize(),
+            new Json()
         );
     }
 
-    public function testConvert()
+    /**
+     * Tests converting from serialized to JSON format with different precision settings.
+     *
+     * @param $serializedData
+     * @param $expectedJson
+     * @dataProvider convertDataProvider
+     */
+    public function testConvert($serializedData, $expectedJson)
+    {
+        $this->assertEquals($expectedJson, $this->serializedToJson->convert($serializedData));
+    }
+
+    /**
+     * @case #1 - Serialized 0.1234567890123456789 with serialize_precision = 17 (default for PHP version < 7.1.0)
+     * @case #2 - Serialized 2.203 with serialize_precision = 17 (default for PHP version < 7.1.0 )
+     * @return array
+     */
+    public function convertDataProvider()
     {
-        $serializedData = 'serialized data';
-        $jsonData = 'json data';
-        $unserializedData = 'unserialized data';
-        $this->serializeMock->expects($this->once())
-            ->method('unserialize')
-            ->with($serializedData)
-            ->willReturn($unserializedData);
-        $this->jsonMock->expects($this->once())
-            ->method('serialize')
-            ->with($unserializedData)
-            ->willReturn($jsonData);
-        $this->assertEquals($jsonData, $this->serializedToJson->convert($serializedData));
+        return [
+            1 => ['serializedData' => 'a:1:{i:0;d:0.12345678901234568;}', 'expectedJson' => '[0.12345678901234568]'],
+            2 => ['serializedData' => 'a:1:{i:0;d:2.2029999999999998;}', 'expectedJson' => '[2.2029999999999998]']
+        ];
     }
 }