Update the CustomerScopeData changes to use serializer to fit with BiC rules

 - keep the $jsonEncoder injection but remove the type,
 - mark the constructor as PHPMD.UnusedFormalParameter,
 - split out the config and the serilization to happen in two methods,

Author: dmanners

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

@@ -26,17 +26,21 @@ class CustomerScopeData extends \Magento\Framework\View\Element\Template
 
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param $jsonEncoder
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Framework\Serialize\Serializer\Json $serializer,
-        array $data = []
+        $jsonEncoder,
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         parent::__construct($context, $data);
         $this->storeManager = $context->getStoreManager();
-        $this->serializer = $serializer;
+        $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -51,6 +55,28 @@ public function getWebsiteId()
         return (int)$this->_storeManager->getStore()->getWebsiteId();
     }
 
+    /**
+     * @return array
+     */
+    public function getInvalidationRules()
+    {
+        return [
+            '*' => [
+                'Magento_Customer/js/invalidation-processor' => [
+                    'invalidationRules' => [
+                        'website-rule' => [
+                            'Magento_Customer/js/invalidation-rules/website-rule' => [
+                                'scopeConfig' => [
+                                    'websiteId' => $this->getWebsiteId(),
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+        ];
+    }
+
     /**
      * Get the invalidation rules json encoded
      *
@@ -59,22 +85,6 @@ public function getWebsiteId()
      */
     public function getSerializedInvalidationRules()
     {
-        return $this->serializer->serialize(
-            [
-                '*' => [
-                    'Magento_Customer/js/invalidation-processor' => [
-                        'invalidationRules' => [
-                            'website-rule' => [
-                                'Magento_Customer/js/invalidation-rules/website-rule' => [
-                                    'scopeConfig' => [
-                                        'websiteId' => $this->getWebsiteId(),
-                                    ]
-                                ]
-                            ]
-                        ]
-                    ]
-                ],
-            ]
-        );
+        return $this->serializer->serialize($this->getInvalidationRules());
     }
 }

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

@@ -54,8 +54,9 @@ protected function setUp()
 
         $this->model = new CustomerScopeData(
             $this->contextMock,
-            $this->serializerMock,
-            []
+            null,
+            [],
+            $this->serializerMock
         );
     }
 
@@ -78,4 +79,84 @@ public function testGetWebsiteId()
 
         $this->assertEquals($storeId, $this->model->getWebsiteId());
     }
+
+    public function testGetInvalidationRules()
+    {
+        $storeId = 1;
+
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getWebsiteId'])
+            ->getMockForAbstractClass();
+
+        $storeMock->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($storeId);
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(null)
+            ->willReturn($storeMock);
+
+        $this->assertEquals(
+            [
+                '*' => [
+                    'Magento_Customer/js/invalidation-processor' => [
+                        'invalidationRules' => [
+                            'website-rule' => [
+                                'Magento_Customer/js/invalidation-rules/website-rule' => [
+                                    'scopeConfig' => [
+                                        'websiteId' => 1,
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                ],
+            ],
+            $this->model->getInvalidationRules()
+        );
+    }
+
+    public function testGetSerializedInvalidationRules()
+    {
+        $storeId = 1;
+        $rules = [
+            '*' => [
+                'Magento_Customer/js/invalidation-processor' => [
+                    'invalidationRules' => [
+                        'website-rule' => [
+                            'Magento_Customer/js/invalidation-rules/website-rule' => [
+                                'scopeConfig' => [
+                                    'websiteId' => 1,
+                                ]
+                            ]
+                        ]
+                    ]
+                ]
+            ],
+        ];
+
+        $storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->setMethods(['getWebsiteId'])
+            ->getMockForAbstractClass();
+
+        $storeMock->expects($this->any())
+            ->method('getWebsiteId')
+            ->willReturn($storeId);
+
+        $this->storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->with(null)
+            ->willReturn($storeMock);
+
+        $this->serializerMock->expects($this->any())
+            ->method('serialize')
+            ->with($rules)
+            ->willReturn(json_encode($rules));
+
+        $this->assertEquals(
+            json_encode($rules),
+            $this->model->getSerializedInvalidationRules()
+        );
+    }
 }