ENGCOM-1633: Error 500 in Module Manager #15211

magento-engcom-team · magento-engcom-team · commit 4c51dba11812 · 2018-05-21T09:29:15.000-05:00
- Merge Pull Request #15211 from flancer64/magento2:patch-1 - Merged commits: 1. a95034a 2. 131a458
diff --git a/setup/src/Magento/Setup/Model/Grid/Module.php b/setup/src/Magento/Setup/Model/Grid/Module.php
@@ -178,7 +178,7 @@ private function getModulesInfo(array $moduleList)
     private function addGeneralInfo(array $items)
     {
         foreach ($items as &$item) {
-            $item['moduleName'] = $item['moduleName'] ?: $this->packageInfo->getModuleName($item['name']);
+            $item['moduleName'] = $item['moduleName'] ?? $this->packageInfo->getModuleName($item['name']);
             $item['enable'] = $this->moduleList->has($item['moduleName']);
             $vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name'];
             $item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource)));

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ private function getModulesInfo(array $moduleList)`
`178`	`178`	`private function addGeneralInfo(array $items)`
`179`	`179`	`{`
`180`	`180`	`foreach ($items as &$item) {`
`181`		`- $item['moduleName'] = $item['moduleName'] ?: $this->packageInfo->getModuleName($item['name']);`
	`181`	`+ $item['moduleName'] = $item['moduleName'] ?? $this->packageInfo->getModuleName($item['name']);`
`182`	`182`	`$item['enable'] = $this->moduleList->has($item['moduleName']);`
`183`	`183`	`$vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name'];`
`184`	`184`	`$item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource)));`