MAGETWO-67405: Improved text of exception message in case of error in…

… module's composer.json #9165 - Merge Pull Request #9165 from vovayatsyuk/magento2:patch-2
magento · Apr 12, 2017 · 3cb6105 · 3cb6105
2 parents e9d894f + c22243e
commit 3cb6105
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -82,7 +82,18 @@ private function load()
             foreach ($this->componentRegistrar->getPaths(ComponentRegistrar::MODULE) as $moduleName => $moduleDir) {
                 $key = $moduleDir . '/composer.json';
                 if (isset($jsonData[$key]) && $jsonData[$key]) {
-                    $packageData = \Zend_Json::decode($jsonData[$key]);
+                    try {
+                        $packageData = \Zend_Json::decode($jsonData[$key]);
+                    } catch (\Zend_Json_Exception $e) {
+                        throw new \Zend_Json_Exception(
+                            sprintf(
+                                "%s composer.json error: %s",
+                                $moduleName,
+                                $e->getMessage()
+                            )
+                        );
+                    }
+
                     if (isset($packageData['name'])) {
                         $this->packageModuleMap[$packageData['name']] = $moduleName;
                     }