From d92845a648efc9fee1e79f2179d93664c8c6bc68 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:11:02 +0000
Subject: [PATCH 1/9] Remove the use of Zend_Json from the Onepage checkout
 block

---
 app/code/Magento/Checkout/Block/Onepage.php         | 13 +++++++++++--
 .../Checkout/Test/Unit/Block/OnepageTest.php        | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 15e913d9338d0..d5fbb04155b5e 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -36,19 +36,26 @@ class Onepage extends \Magento\Framework\View\Element\Template
      */
     protected $layoutProcessors;
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
      * @param array $data
+     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Data\Form\FormKey $formKey,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null
     ) {
         parent::__construct($context, $data);
         $this->formKey = $formKey;
@@ -56,6 +63,8 @@ public function __construct(
         $this->jsLayout = isset($data['jsLayout']) && is_array($data['jsLayout']) ? $data['jsLayout'] : [];
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
     }
 
     /**
@@ -66,7 +75,7 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return \Zend_Json::encode($this->jsLayout);
+        return $this->serializer->serialize($this->jsLayout);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 47fddfeb4a827..9936dc5157af7 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -32,6 +32,11 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
      */
     protected $layoutProcessorMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $contextMock = $this->getMock(\Magento\Framework\View\Element\Template\Context::class, [], [], '', false);
@@ -54,11 +59,15 @@ protected function setUp()
             false
         );
 
+        $this->serializer = new \Magento\Framework\Serialize\Serializer\Json();
+
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,
             $this->formKeyMock,
             $this->configProviderMock,
-            [$this->layoutProcessorMock]
+            [$this->layoutProcessorMock],
+            [],
+            $this->serializer
         );
     }
 

From 248cd85617e857e5dcae35531a33e9806d63fc07 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:15:50 +0000
Subject: [PATCH 2/9] Mock the serialize method return value

---
 app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 9936dc5157af7..25b00379e5c44 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -59,7 +59,7 @@ protected function setUp()
             false
         );
 
-        $this->serializer = new \Magento\Framework\Serialize\Serializer\Json();
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
 
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,
@@ -103,6 +103,9 @@ public function testGetJsLayout()
         $processedLayout = ['layout' => ['processed' => true]];
         $jsonLayout = '{"layout":{"processed":true}}';
         $this->layoutProcessorMock->expects($this->once())->method('process')->with([])->willReturn($processedLayout);
+        $this->serializer->expects($this->once())->method('serialize')->will(
+            $this->returnValue(json_encode($processedLayout))
+        );
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }

From 072dde798832c708359c33c578f7990040e97f64 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:27:31 +0000
Subject: [PATCH 3/9] Remove Zend_Json usage from the cart shipping block

---
 app/code/Magento/Checkout/Block/Cart/Shipping.php  | 13 +++++++++++--
 app/code/Magento/Checkout/Block/Onepage.php        |  7 ++++---
 .../Checkout/Test/Unit/Block/Cart/ShippingTest.php | 14 +++++++++++++-
 .../Checkout/Test/Unit/Block/OnepageTest.php       |  4 ++--
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index a7f808b9ccb5e..5b0d231bbdfbe 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -20,14 +20,20 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      */
     protected $layoutProcessors;
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
+     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
      * @param array $data
-     * @codeCoverageIgnore
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -35,12 +41,15 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
         array $data = []
     ) {
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
         parent::__construct($context, $customerSession, $checkoutSession, $data);
         $this->_isScopePrivate = true;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
     }
 
     /**
@@ -64,7 +73,7 @@ public function getJsLayout()
         foreach ($this->layoutProcessors as $processor) {
             $this->jsLayout = $processor->process($this->jsLayout);
         }
-        return \Zend_Json::encode($this->jsLayout);
+        return $this->serializer->serialize($this->jsLayout);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index d5fbb04155b5e..61001abcc70d7 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -46,16 +46,17 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
-     * @param array $data
      * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
+     * @param array $data
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Data\Form\FormKey $formKey,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        array $data = [],
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
+        array $data = []
     ) {
         parent::__construct($context, $data);
         $this->formKey = $formKey;
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index 8313695ff8e76..f30ea4a9c578a 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -47,6 +47,11 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
      */
     protected $layout;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $this->context = $this->getMock(\Magento\Framework\View\Element\Template\Context::class, [], [], '', false);
@@ -69,6 +74,7 @@ protected function setUp()
 
         $this->storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->context->expects($this->once())->method('getStoreManager')->willReturn($this->storeManager);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
 
         $this->model = new \Magento\Checkout\Block\Cart\Shipping(
             $this->context,
@@ -76,6 +82,7 @@ protected function setUp()
             $this->checkoutSession,
             $this->configProvider,
             [$this->layoutProcessor],
+            $this->serializer,
             ['jsLayout' => $this->layout]
         );
     }
@@ -91,13 +98,18 @@ public function testGetJsLayout()
     {
         $layoutProcessed = $this->layout;
         $layoutProcessed['components']['thirdComponent'] = ['param' => 'value'];
+        $jsonLayoutProcessed = json_encode($layoutProcessed);
 
         $this->layoutProcessor->expects($this->once())
             ->method('process')
             ->with($this->layout)
             ->willReturn($layoutProcessed);
+
+        $this->serializer->expects($this->once())->method('serialize')->will(
+            $this->returnValue($jsonLayoutProcessed)
+        );
         $this->assertEquals(
-            \Zend_Json::encode($layoutProcessed),
+            $jsonLayoutProcessed,
             $this->model->getJsLayout()
         );
     }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 25b00379e5c44..0ef5e89669dad 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -66,8 +66,8 @@ protected function setUp()
             $this->formKeyMock,
             $this->configProviderMock,
             [$this->layoutProcessorMock],
-            [],
-            $this->serializer
+            $this->serializer,
+            []
         );
     }
 

From 287c3150bd793cc1bc3e94512f0423e8e64b470f Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:32:16 +0000
Subject: [PATCH 4/9] Remove Zend_Json usage from the onepage.phtml template

---
 app/code/Magento/Checkout/Block/Onepage.php           |  8 ++++++++
 .../Magento/Checkout/Test/Unit/Block/OnepageTest.php  | 11 +++++++++++
 .../Checkout/view/frontend/templates/onepage.phtml    |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 61001abcc70d7..d9b1e9d08ad6c 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -111,4 +111,12 @@ public function getBaseUrl()
     {
         return $this->_storeManager->getStore()->getBaseUrl();
     }
+
+    /**
+     * @return bool|string
+     */
+    public function getSerializedCheckoutConfig()
+    {
+        return $this->serializer->serialize($this->getCheckoutConfig());
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 0ef5e89669dad..ac50ce76c45ad 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -109,4 +109,15 @@ public function testGetJsLayout()
 
         $this->assertEquals($jsonLayout, $this->model->getJsLayout());
     }
+
+    public function testGetSerializedCheckoutConfig()
+    {
+        $checkoutConfig = ['checkout', 'config'];
+        $this->configProviderMock->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+        $this->serializer->expects($this->once())->method('serialize')->will(
+            $this->returnValue(json_encode($checkoutConfig))
+        );
+
+        $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
+    }
 }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
index bf9bcb15c3ec8..6f1931583fb57 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/onepage.phtml
@@ -23,7 +23,7 @@
         }
     </script>
     <script>
-        window.checkoutConfig = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
+        window.checkoutConfig = <?php /* @escapeNotVerified */ echo $block->getSerializedCheckoutConfig(); ?>;
         // Create aliases for customer.js model from customer module
         window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
         window.customerData = window.checkoutConfig.customerData;

From 122997ce7dda507fb47bb179291e3c23721ead4e Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:34:55 +0000
Subject: [PATCH 5/9] Remove Zend_Json usage from the cart shipping.phtml
 template

---
 app/code/Magento/Checkout/Block/Cart/Shipping.php     |  8 ++++++++
 .../Checkout/Test/Unit/Block/Cart/ShippingTest.php    | 11 +++++++++++
 .../view/frontend/templates/cart/shipping.phtml       |  2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 5b0d231bbdfbe..0658d7d039011 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -86,4 +86,12 @@ public function getBaseUrl()
     {
         return $this->_storeManager->getStore()->getBaseUrl();
     }
+
+    /**
+     * @return bool|string
+     */
+    public function getSerializedCheckoutConfig()
+    {
+        return $this->serializer->serialize($this->getCheckoutConfig());
+    }
 }
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index f30ea4a9c578a..9ec5f00dc652e 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -122,4 +122,15 @@ public function testGetBaseUrl()
         $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
         $this->assertEquals($baseUrl, $this->model->getBaseUrl());
     }
+
+    public function testGetSerializedCheckoutConfig()
+    {
+        $checkoutConfig = ['checkout', 'config'];
+        $this->configProvider->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
+        $this->serializer->expects($this->once())->method('serialize')->will(
+            $this->returnValue(json_encode($checkoutConfig))
+        );
+
+        $this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
+    }
 }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
index 4eb142aa4eb6f..b184b4ef7791d 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/shipping.phtml
@@ -25,7 +25,7 @@
             }
         </script>
         <script>
-            window.checkoutConfig = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getCheckoutConfig()); ?>;
+            window.checkoutConfig = <?php /* @escapeNotVerified */ echo $block->getSerializedCheckoutConfig(); ?>;
             window.customerData = window.checkoutConfig.customerData;
             window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;
             require([

From 4ddbfc2dc062d7cc2e8296ba1cb369cd3b24f13f Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Fri, 3 Feb 2017 14:41:47 +0000
Subject: [PATCH 6/9] Remove Zend_Json usage from the minicart.phtml template

---
 app/code/Magento/Checkout/Block/Cart/Sidebar.php | 16 ++++++++++++++++
 .../Test/Unit/Block/Cart/SidebarTest.php         | 10 +++++++++-
 .../view/frontend/templates/cart/minicart.phtml  |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 03c705d8a4751..42852d2219a5a 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -27,6 +27,11 @@ class Sidebar extends AbstractCart
      */
     protected $imageHelper;
 
+    /**
+     * @var \Magento\Framework\Serialize\SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -42,6 +47,7 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
         \Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface $jsLayoutDataProvider,
+        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
         array $data = []
     ) {
         if (isset($data['jsLayout'])) {
@@ -53,6 +59,8 @@ public function __construct(
         parent::__construct($context, $customerSession, $checkoutSession, $data);
         $this->_isScopePrivate = false;
         $this->imageHelper = $imageHelper;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
     }
 
     /**
@@ -74,6 +82,14 @@ public function getConfig()
         ];
     }
 
+    /**
+     * @return string
+     */
+    public function getSerializedConfig()
+    {
+        return $this->serializer->serialize($this->getConfig());
+    }
+
     /**
      * @return string
      */
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
index 4fdd8499ad8b7..759bee00962ce 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
@@ -53,6 +53,11 @@ class SidebarTest extends \PHPUnit_Framework_TestCase
      */
     protected $requestMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $serializer;
+
     protected function setUp()
     {
         $this->_objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
@@ -94,12 +99,15 @@ protected function setUp()
             ->method('getRequest')
             ->will($this->returnValue($this->requestMock));
 
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
+
         $this->model = $this->_objectManager->getObject(
             \Magento\Checkout\Block\Cart\Sidebar::class,
             [
                 'context' => $contextMock,
                 'imageHelper' => $this->imageHelper,
-                'checkoutSession' => $this->checkoutSessionMock
+                'checkoutSession' => $this->checkoutSessionMock,
+                'serializer' => $this->serializer
             ]
         );
     }
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
index ae68b530d67f6..d7596413d4122 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -43,7 +43,7 @@
         </div>
     <?php endif ?>
     <script>
-        window.checkout = <?php /* @escapeNotVerified */ echo \Zend_Json::encode($block->getConfig()); ?>;
+        window.checkout = <?php /* @escapeNotVerified */ echo $block->getSerializedConfig(); ?>;
     </script>
     <script type="text/x-magento-init">
     {

From d350783e1dca1e73f0602fa58cb474ba0d451516 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Thu, 9 Feb 2017 07:57:26 +0000
Subject: [PATCH 7/9] Update the serializer to use directly the json version
 and not just asking for the interface

---
 app/code/Magento/Checkout/Block/Cart/Shipping.php        | 8 ++++----
 app/code/Magento/Checkout/Block/Cart/Sidebar.php         | 9 +++++----
 app/code/Magento/Checkout/Block/Onepage.php              | 8 ++++----
 .../Checkout/Test/Unit/Block/Cart/ShippingTest.php       | 2 +-
 .../Checkout/Test/Unit/Block/Cart/SidebarTest.php        | 2 +-
 .../Magento/Checkout/Test/Unit/Block/OnepageTest.php     | 2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 0658d7d039011..5eb87c880ee4c 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -21,7 +21,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
     protected $layoutProcessors;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $serializer;
 
@@ -31,7 +31,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
-     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
      * @throws \RuntimeException
      */
@@ -41,7 +41,7 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         array $data = []
     ) {
         $this->configProvider = $configProvider;
@@ -49,7 +49,7 @@ public function __construct(
         parent::__construct($context, $customerSession, $checkoutSession, $data);
         $this->_isScopePrivate = true;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 42852d2219a5a..c7afbe233a4b0 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -28,7 +28,7 @@ class Sidebar extends AbstractCart
     protected $imageHelper;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $serializer;
 
@@ -38,8 +38,9 @@ class Sidebar extends AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface $jsLayoutDataProvider
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
-     * @codeCoverageIgnore
+     * @throws \RuntimeException
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
@@ -47,7 +48,7 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
         \Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface $jsLayoutDataProvider,
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         array $data = []
     ) {
         if (isset($data['jsLayout'])) {
@@ -60,7 +61,7 @@ public function __construct(
         $this->_isScopePrivate = false;
         $this->imageHelper = $imageHelper;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index d9b1e9d08ad6c..71852a416a5f7 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -37,7 +37,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
     protected $layoutProcessors;
 
     /**
-     * @var \Magento\Framework\Serialize\SerializerInterface
+     * @var \Magento\Framework\Serialize\Serializer\Json
      */
     private $serializer;
 
@@ -46,7 +46,7 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
-     * @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
      * @throws \RuntimeException
      */
@@ -55,7 +55,7 @@ public function __construct(
         \Magento\Framework\Data\Form\FormKey $formKey,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        \Magento\Framework\Serialize\SerializerInterface $serializer = null,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
         array $data = []
     ) {
         parent::__construct($context, $data);
@@ -65,7 +65,7 @@ public function __construct(
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\SerializerInterface::class);
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index 9ec5f00dc652e..303c13773e102 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -74,7 +74,7 @@ protected function setUp()
 
         $this->storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->context->expects($this->once())->method('getStoreManager')->willReturn($this->storeManager);
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
 
         $this->model = new \Magento\Checkout\Block\Cart\Shipping(
             $this->context,
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
index 759bee00962ce..85460647996b5 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
@@ -99,7 +99,7 @@ protected function setUp()
             ->method('getRequest')
             ->will($this->returnValue($this->requestMock));
 
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
 
         $this->model = $this->_objectManager->getObject(
             \Magento\Checkout\Block\Cart\Sidebar::class,
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index ac50ce76c45ad..0a5bd951716c8 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -59,7 +59,7 @@ protected function setUp()
             false
         );
 
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\SerializerInterface::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
 
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,

From eb31f86109ed23c904403b73cc545fa7c94eb76f Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Thu, 9 Feb 2017 08:56:57 +0000
Subject: [PATCH 8/9] Fix the getting of the Serializer Json mock object to
 match the coding standards and add a space after each comman in the function
 call

---
 app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php | 2 +-
 app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php  | 2 +-
 app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index 303c13773e102..72fa743024b3a 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -74,7 +74,7 @@ protected function setUp()
 
         $this->storeManager = $this->getMock(\Magento\Store\Model\StoreManagerInterface::class);
         $this->context->expects($this->once())->method('getStoreManager')->willReturn($this->storeManager);
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false);
 
         $this->model = new \Magento\Checkout\Block\Cart\Shipping(
             $this->context,
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
index 85460647996b5..28fc06fd8b264 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php
@@ -99,7 +99,7 @@ protected function setUp()
             ->method('getRequest')
             ->will($this->returnValue($this->requestMock));
 
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false);
 
         $this->model = $this->_objectManager->getObject(
             \Magento\Checkout\Block\Cart\Sidebar::class,
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 0a5bd951716c8..33e7e3021663d 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -59,7 +59,7 @@ protected function setUp()
             false
         );
 
-        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class,[],[],'',false);
+        $this->serializer = $this->getMock(\Magento\Framework\Serialize\Serializer\Json::class, [], [], '', false);
 
         $this->model = new \Magento\Checkout\Block\Onepage(
             $contextMock,

From 5c57dc2139d58a441f5df7bfb989b296ba821f81 Mon Sep 17 00:00:00 2001
From: dmanners <dmanners87@gmail.com>
Date: Thu, 9 Feb 2017 10:01:46 +0000
Subject: [PATCH 9/9] Make sure that the new dependancy on Serializer\Json is
 the last thing in the constructor

---
 app/code/Magento/Checkout/Block/Cart/Shipping.php           | 6 +++---
 app/code/Magento/Checkout/Block/Cart/Sidebar.php            | 6 +++---
 app/code/Magento/Checkout/Block/Onepage.php                 | 6 +++---
 .../Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php  | 4 ++--
 app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php   | 4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 5eb87c880ee4c..147dc08a49d99 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -31,8 +31,8 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -41,8 +41,8 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->configProvider = $configProvider;
         $this->layoutProcessors = $layoutProcessors;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index c7afbe233a4b0..6863c9e8a27b0 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -38,8 +38,8 @@ class Sidebar extends AbstractCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Catalog\Helper\Image $imageHelper
      * @param \Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface $jsLayoutDataProvider
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -48,8 +48,8 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Catalog\Helper\Image $imageHelper,
         \Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface $jsLayoutDataProvider,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         if (isset($data['jsLayout'])) {
             $this->jsLayout = array_merge_recursive($jsLayoutDataProvider->getData(), $data['jsLayout']);
diff --git a/app/code/Magento/Checkout/Block/Onepage.php b/app/code/Magento/Checkout/Block/Onepage.php
index 71852a416a5f7..29493cab6f517 100644
--- a/app/code/Magento/Checkout/Block/Onepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage.php
@@ -46,8 +46,8 @@ class Onepage extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Data\Form\FormKey $formKey
      * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
      * @param array $layoutProcessors
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -55,8 +55,8 @@ public function __construct(
         \Magento\Framework\Data\Form\FormKey $formKey,
         \Magento\Checkout\Model\CompositeConfigProvider $configProvider,
         array $layoutProcessors = [],
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         parent::__construct($context, $data);
         $this->formKey = $formKey;
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
index 72fa743024b3a..7941889f37ac1 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
@@ -82,8 +82,8 @@ protected function setUp()
             $this->checkoutSession,
             $this->configProvider,
             [$this->layoutProcessor],
-            $this->serializer,
-            ['jsLayout' => $this->layout]
+            ['jsLayout' => $this->layout],
+            $this->serializer
         );
     }
 
diff --git a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
index 33e7e3021663d..9bfdee8ccd645 100644
--- a/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
+++ b/app/code/Magento/Checkout/Test/Unit/Block/OnepageTest.php
@@ -66,8 +66,8 @@ protected function setUp()
             $this->formKeyMock,
             $this->configProviderMock,
             [$this->layoutProcessorMock],
-            $this->serializer,
-            []
+            [],
+            $this->serializer
         );
     }