Replace Zend_json in the ThemePackageInfo class and use the new serializer instead

Author: dmanners

app/code/Magento/Theme/Model/Theme/ThemePackageInfo.php

@@ -28,6 +28,11 @@ class ThemePackageInfo
      */
     private $packageNameToFullPathMap = [];
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
@@ -36,18 +41,20 @@ class ThemePackageInfo
      */
     public function __construct(
         ComponentRegistrar $componentRegistrar,
-        ReadFactory $readDirFactory
+        ReadFactory $readDirFactory,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->componentRegistrar = $componentRegistrar;
         $this->readDirFactory = $readDirFactory;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
      * Get package name of a theme by its full theme path
      *
      * @param string $themePath
      * @return string
-     * @throws \Zend_Json_Exception
      */
     public function getPackageName($themePath)
     {
@@ -57,7 +64,7 @@ public function getPackageName($themePath)
             $rawData = [];
             $themeFile = $themeDir->readFile('composer.json');
             if ($themeFile) {
-                $rawData = \Zend_Json::decode($themeFile);
+                $rawData = $this->serializer->unserialize($themeFile);
             }
             return isset($rawData['name']) ? $rawData['name'] : '';
         }
@@ -83,7 +90,6 @@ public function getFullThemePath($packageName)
      * Initialize package name to full theme path map
      *
      * @return void
-     * @throws \Zend_Json_Exception
      */
     private function initializeMap()
     {
@@ -92,7 +98,7 @@ private function initializeMap()
         foreach ($themePaths as $fullThemePath => $themeDir) {
             $themeDirRead = $this->readDirFactory->create($themeDir);
             if ($themeDirRead->isExist('composer.json')) {
-                $rawData = \Zend_Json::decode($themeDirRead->readFile('composer.json'));
+                $rawData = $this->serializer->unserialize($themeDirRead->readFile('composer.json'));
                 if (isset($rawData['name'])) {
                     $this->packageNameToFullPathMap[$rawData['name']] = $fullThemePath;
                 }

app/code/Magento/Theme/Test/Unit/Controller/Result/MessagePluginTest.php

@@ -112,7 +112,7 @@ public function testAfterRenderResult()
             ->method('setPublicCookie')
             ->with(
                 MessagePlugin::MESSAGES_COOKIES_NAME,
-                \Zend_Json::encode($messages),
+                json_encode($messages),
                 $cookieMetadataMock
             );
         $this->cookieManagerMock->expects($this->once())
@@ -411,7 +411,7 @@ public function testAfterRenderResultWithWrongArray()
             ->method('setPublicCookie')
             ->with(
                 MessagePlugin::MESSAGES_COOKIES_NAME,
-                \Zend_Json::encode($messages),
+                json_encode($messages),
                 $cookieMetadataMock
             );
         $this->cookieManagerMock->expects($this->once())

app/code/Magento/Theme/Test/Unit/Model/Theme/ThemePackageInfoTest.php

@@ -29,6 +29,9 @@ class ThemePackageInfoTest extends \PHPUnit_Framework_TestCase
      */
     private $dirReadFactory;
 
+    /** @var \Magento\Framework\Serialize\Serializer\Json|\PHPUnit_Framework_MockObject_MockObject */
+    private $serializerMock;
+
     protected function setUp()
     {
         $this->componentRegistrar = $this->getMock(
@@ -47,20 +50,27 @@ protected function setUp()
             false
         );
         $this->dirReadFactory->expects($this->any())->method('create')->willReturn($this->dirRead);
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->getMock();
         $this->themePackageInfo = new ThemePackageInfo(
             $this->componentRegistrar,
-            $this->dirReadFactory
+            $this->dirReadFactory,
+            $this->serializerMock
         );
     }
 
     public function testGetPackageName()
     {
+        $themeFileContents = '{"name": "package"}';
         $this->componentRegistrar->expects($this->once())->method('getPath')->willReturn('path/to/A');
         $this->dirRead->expects($this->once())->method('isExist')->with('composer.json')->willReturn(true);
         $this->dirRead->expects($this->once())
             ->method('readFile')
             ->with('composer.json')
-            ->willReturn('{"name": "package"}');
+            ->willReturn($themeFileContents);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn(json_decode($themeFileContents, true));
         $this->assertEquals('package', $this->themePackageInfo->getPackageName('themeA'));
     }
 
@@ -74,9 +84,13 @@ public function testGetPackageNameNonExist()
 
     public function testGetFullThemePath()
     {
+        $themeFileContents = '{"name": "package"}';
         $this->componentRegistrar->expects($this->once())->method('getPaths')->willReturn(['themeA' => 'path/to/A']);
         $this->dirRead->expects($this->once())->method('isExist')->willReturn(true);
-        $this->dirRead->expects($this->once())->method('readFile')->willReturn('{"name": "package"}');
+        $this->dirRead->expects($this->once())->method('readFile')->willReturn($themeFileContents);
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn(json_decode($themeFileContents, true));
         $this->assertEquals('themeA', $this->themePackageInfo->getFullThemePath('package'));
         // call one more time to make sure only initialize once
         $this->assertEquals('themeA', $this->themePackageInfo->getFullThemePath('package'));
@@ -90,14 +104,14 @@ public function testGetFullThemePathNonExist()
         $this->assertEquals('', $this->themePackageInfo->getFullThemePath('package-other'));
     }
 
-    /**
-     * @expectedException \Zend_Json_Exception
-     */
     public function testGetPackageNameInvalidJson()
     {
         $this->componentRegistrar->expects($this->once())->method('getPath')->willReturn('path/to/A');
         $this->dirRead->expects($this->once())->method('isExist')->willReturn(true);
         $this->dirRead->expects($this->once())->method('readFile')->willReturn('{"name": }');
-        $this->themePackageInfo->getPackageName('themeA');
+        $this->serializerMock->expects($this->once())
+            ->method('unserialize')
+            ->willReturn(null);
+        $this->assertEquals('', $this->themePackageInfo->getPackageName('themeA'));
     }
 }