Add back in the mock of the jsonEncoder to the test case

Author: dmanners

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

@@ -25,12 +25,12 @@ class CustomerScopeData extends \Magento\Framework\View\Element\Template
     private $serializer;
 
     /**
-     * CustomerScopeData constructor.
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
      * @param array $data
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      * @throws \RuntimeException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,

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

@@ -10,7 +10,6 @@
 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
 {
@@ -26,6 +25,9 @@ class CustomerScopeDataTest extends \PHPUnit_Framework_TestCase
     /** @var ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
     private $scopeConfigMock;
 
+    /** @var \Magento\Framework\Json\EncoderInterface|\PHPUnit_Framework_MockObject_MockObject */
+    private $encoderMock;
+
     /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
     private $serializerMock;
 
@@ -41,6 +43,9 @@ 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)
             ->getMock();
 
@@ -54,7 +59,7 @@ protected function setUp()
 
         $this->model = new CustomerScopeData(
             $this->contextMock,
-            null,
+            $this->encoderMock,
             [],
             $this->serializerMock
         );