Merge pull request #1363 from magento-engcom/develop-prs

Public Pull Requests

#10333
#10329

Author: Oleksii Korshenko

lib/internal/Magento/Framework/Webapi/Rest/Request/Deserializer/Json.php

@@ -12,22 +12,37 @@
 
 class Json implements \Magento\Framework\Webapi\Rest\Request\DeserializerInterface
 {
-    /** @var \Magento\Framework\Json\Decoder */
+    /**
+     * @var \Magento\Framework\Json\Decoder
+     * @deprecated
+     */
     protected $decoder;
 
     /**
      * @var State
      */
     protected $_appState;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\Json\Decoder $decoder
-     * @param \Magento\Framework\App\State $appState
+     * @param State $appState
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @throws \RuntimeException
      */
-    public function __construct(\Magento\Framework\Json\Decoder $decoder, State $appState)
-    {
+    public function __construct(
+        \Magento\Framework\Json\Decoder $decoder,
+        State $appState,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+    ) {
         $this->decoder = $decoder;
         $this->_appState = $appState;
+        $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -46,8 +61,8 @@ public function deserialize($encodedBody)
             );
         }
         try {
-            $decodedBody = $this->decoder->decode($encodedBody);
-        } catch (\Zend_Json_Exception $e) {
+            $decodedBody = $this->serializer->unserialize($encodedBody);
+        } catch (\InvalidArgumentException $e) {
             if ($this->_appState->getMode() !== State::MODE_DEVELOPER) {
                 throw new \Magento\Framework\Webapi\Exception(new Phrase('Decoding error.'));
             } else {

lib/internal/Magento/Framework/Webapi/Test/Unit/Rest/Request/Deserializer/JsonTest.php

@@ -21,18 +21,30 @@ class JsonTest extends \PHPUnit_Framework_TestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject */
     protected $_appStateMock;
 
+    /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
+    private $serializerMock;
+
     protected function setUp()
     {
         /** Prepare mocks for SUT constructor. */
         $this->decoderMock = $this->getMockBuilder(\Magento\Framework\Json\Decoder::class)
             ->disableOriginalConstructor()
             ->setMethods(['decode'])
             ->getMock();
-        $this->_appStateMock = $this->getMock(\Magento\Framework\App\State::class, [], [], '', false);
+        $this->_appStateMock = $this->getMock(
+            \Magento\Framework\App\State::class,
+            [],
+            [],
+            '',
+            false
+        );
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->getMock();
         /** Initialize SUT. */
         $this->_jsonDeserializer = new \Magento\Framework\Webapi\Rest\Request\Deserializer\Json(
             $this->decoderMock,
-            $this->_appStateMock
+            $this->_appStateMock,
+            $this->serializerMock
         );
         parent::setUp();
     }
@@ -60,13 +72,13 @@ public function testDeserialize()
             'key2' => 'test2',
             'array' => ['test01' => 'some1', 'test02' => 'some2'],
         ];
-        $this->decoderMock->expects(
-            $this->once()
-        )->method(
-            'decode'
-        )->will(
-            $this->returnValue($expectedDecodedJson)
-        );
+        $this->serializerMock->expects($this->any())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($serializedData) {
+                    return json_decode($serializedData, true);
+                }
+            );
         /** Initialize SUT. */
         $this->assertEquals(
             $expectedDecodedJson,
@@ -78,9 +90,10 @@ public function testDeserialize()
     public function testDeserializeInvalidEncodedBodyExceptionDeveloperModeOff()
     {
         /** Prepare mocks for SUT constructor. */
-        $this->decoderMock->expects($this->once())
-            ->method('decode')
-            ->will($this->throwException(new \Zend_Json_Exception));
+        $this->serializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->will($this->throwException(new \InvalidArgumentException));
         $this->_appStateMock->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue('production'));
@@ -103,15 +116,14 @@ public function testDeserializeInvalidEncodedBodyExceptionDeveloperModeOff()
     public function testDeserializeInvalidEncodedBodyExceptionDeveloperModeOn()
     {
         /** Prepare mocks for SUT constructor. */
-        $this->decoderMock->expects(
-            $this->once()
-        )->method(
-            'decode'
-        )->will(
-            $this->throwException(
-                new \Zend_Json_Exception('Decoding error:' . PHP_EOL . 'Decoding failed: Syntax error')
-            )
-        );
+        $this->serializerMock
+            ->expects($this->once())
+            ->method('unserialize')
+            ->will(
+                $this->throwException(
+                    new \InvalidArgumentException('Unable to unserialize value.')
+                )
+            );
         $this->_appStateMock->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue('developer'));

setup/src/Magento/Setup/Test/Unit/Controller/MarketplaceTest.php

@@ -39,7 +39,7 @@ public function testSaveAuthJsonAction()
         $this->packagesAuth
             ->expects($this->once())
             ->method('checkCredentials')
-            ->will($this->returnValue(\Zend_Json::encode(['success' => true])));
+            ->will($this->returnValue(json_encode(['success' => true])));
         $this->packagesAuth
             ->expects($this->once())
             ->method('saveAuthJson')
@@ -75,7 +75,7 @@ public function testCheckAuthAction()
         $this->packagesAuth
             ->expects($this->once())
             ->method('checkCredentials')
-            ->will($this->returnValue(\Zend_Json::encode(['success' => true])));
+            ->will($this->returnValue(json_encode(['success' => true])));
         $jsonModel = $this->controller->checkAuthAction();
         $this->assertInstanceOf(\Zend\View\Model\ViewModel::class, $jsonModel);
         $variables = $jsonModel->getVariables();