MAGETWO-80177: [2.2.x] - Remove zend json from customer data #10259

- rework fix for 2.2.1 without minor change

Author: irenelagno

app/code/Magento/Customer/Block/CustomerScopeData.php

@@ -5,15 +5,11 @@
  */
 namespace Magento\Customer\Block;
 
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Serialize\Serializer\Json;
-
 /**
  * Class CustomerScopeData provide scope (website, store or store_group) information on front
  * Can be used, for example, on store front, in order to determine
  * that private cache invalid for current scope, by comparing
  * with appropriate value in store front private cache.
- *
  * @api
  * @since 100.2.0
  */
@@ -25,27 +21,24 @@ class CustomerScopeData extends \Magento\Framework\View\Element\Template
     private $storeManager;
 
     /**
-     * @var Json
+     * @var \Magento\Framework\Json\EncoderInterface
      */
-    private $serializer;
+    private $jsonEncoder;
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
-     * @param Json|null $serializer
-     * @throws \RuntimeException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @since 100.2.0
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Json\EncoderInterface $jsonEncoder,
-        array $data = [],
-        Json $serializer = null
+        array $data = []
     ) {
         parent::__construct($context, $data);
         $this->storeManager = $context->getStoreManager();
-        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->jsonEncoder = $jsonEncoder;
     }
 
     /**
@@ -60,16 +53,4 @@ public function getWebsiteId()
     {
         return (int)$this->_storeManager->getStore()->getWebsiteId();
     }
-
-    /**
-     * Encode invalidation rules.
-     *
-     * @param array $configuration
-     * @return bool|string
-     * @throws \InvalidArgumentException
-     */
-    public function encodeConfiguration(array $configuration)
-    {
-        return $this->serializer->serialize($configuration);
-    }
 }

app/code/Magento/Customer/Test/Unit/Block/CustomerScopeDataTest.php

@@ -10,6 +10,7 @@
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Block\CustomerScopeData;
+use Magento\Framework\Json\EncoderInterface;
 
 class CustomerScopeDataTest extends \PHPUnit\Framework\TestCase
 {
@@ -28,9 +29,6 @@ class CustomerScopeDataTest extends \PHPUnit\Framework\TestCase
     /** @var \Magento\Framework\Json\EncoderInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $encoderMock;
 
-    /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
-    private $serializerMock;
-
     protected function setUp()
     {
         $this->contextMock = $this->getMockBuilder(Context::class)
@@ -43,10 +41,7 @@ protected function setUp()
         $this->scopeConfigMock = $this->getMockBuilder(ScopeConfigInterface::class)
             ->getMock();
 
-        $this->encoderMock = $this->getMockBuilder(\Magento\Framework\Json\EncoderInterface::class)
-            ->getMock();
-
-        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+        $this->encoderMock = $this->getMockBuilder(EncoderInterface::class)
             ->getMock();
 
         $this->contextMock->expects($this->exactly(2))
@@ -60,8 +55,7 @@ protected function setUp()
         $this->model = new CustomerScopeData(
             $this->contextMock,
             $this->encoderMock,
-            [],
-            $this->serializerMock
+            []
         );
     }
 
@@ -84,33 +78,4 @@ public function testGetWebsiteId()
 
         $this->assertEquals($storeId, $this->model->getWebsiteId());
     }
-
-    public function testEncodeConfiguration()
-    {
-        $rules = [
-            '*' => [
-                'Magento_Customer/js/invalidation-processor' => [
-                    'invalidationRules' => [
-                        'website-rule' => [
-                            'Magento_Customer/js/invalidation-rules/website-rule' => [
-                                'scopeConfig' => [
-                                    'websiteId' => 1,
-                                ]
-                            ]
-                        ]
-                    ]
-                ]
-            ],
-        ];
-
-        $this->serializerMock->expects($this->any())
-            ->method('serialize')
-            ->with($rules)
-            ->willReturn(json_encode($rules));
-
-        $this->assertEquals(
-            json_encode($rules),
-            $this->model->encodeConfiguration($rules)
-        );
-    }
 }

app/code/Magento/Customer/view/frontend/templates/js/customer-data/invalidation-rules.phtml

@@ -8,7 +8,9 @@
 /* @var $block \Magento\Customer\Block\CustomerScopeData */
 ?>
 <script type="text/x-magento-init">
-<?= /* @noEscape */ $block->encodeConfiguration([
+<?php
+    /* @noEscape */
+    echo \Magento\Framework\Serialize\JsonConverter::convert([
         '*' => ['Magento_Customer/js/invalidation-processor' => [
             'invalidationRules' => [
                 'website-rule' => [