Replace Zend_Json usage in Framework/Module/PackageInfo.php

 - inject the new \Magento\Framework\Serialize\Serializer\Json class,
 - update the load method to use the Serializer,
 - update the load method to catch the InvalidArgumentException exception

Author: dmanners

lib/internal/Magento/Framework/Module/PackageInfo.php

@@ -58,23 +58,33 @@ class PackageInfo
      */
     protected $nonExistingDependencies = [];
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * Constructor
      *
      * @param Dir\Reader $reader
      * @param ComponentRegistrar $componentRegistrar
      */
-    public function __construct(Dir\Reader $reader, ComponentRegistrar $componentRegistrar)
-    {
+    public function __construct(
+        Dir\Reader $reader,
+        ComponentRegistrar $componentRegistrar,
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+    ) {
         $this->reader = $reader;
         $this->componentRegistrar = $componentRegistrar;
+        $this->serializer = $serializer?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
      * Load the packages information
      *
      * @return void
-     * @throws \Zend_Json_Exception
+     * @throws \InvalidArgumentException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function load()
@@ -85,9 +95,9 @@ private function load()
                 $key = $moduleDir . '/composer.json';
                 if (isset($jsonData[$key]) && $jsonData[$key]) {
                     try {
-                        $packageData = \Zend_Json::decode($jsonData[$key]);
-                    } catch (\Zend_Json_Exception $e) {
-                        throw new \Zend_Json_Exception(
+                        $packageData = $this->serializer->unserialize($jsonData[$key]);
+                    } catch (\InvalidArgumentException $e) {
+                        throw new \InvalidArgumentException(
                             sprintf(
                                 "%s composer.json error: %s",
                                 $moduleName,

lib/internal/Magento/Framework/Module/Test/Unit/PackageInfoTest.php

@@ -54,7 +54,21 @@ protected function setUp()
             ->method('getComposerJsonFiles')
             ->will($this->returnValue($fileIteratorMock));
 
-        $this->packageInfo = new PackageInfo($this->reader, $this->componentRegistrar);
+        $this->serializerMock = $this->getMockBuilder(\Magento\Framework\Serialize\Serializer\Json::class)
+            ->getMock();
+
+        $this->serializerMock->expects($this->any())
+            ->method('unserialize')
+            ->willReturnCallback(
+                function ($serializedData) {
+                    return json_decode($serializedData, true);
+                }
+            );
+        $this->packageInfo = new PackageInfo(
+            $this->reader,
+            $this->componentRegistrar,
+            $this->serializerMock
+        );
     }
 
     public function testGetModuleName()