diff --git a/src/Command/Site/StatusCommand.php b/src/Command/Site/StatusCommand.php index be38be1aa..2909a9584 100644 --- a/src/Command/Site/StatusCommand.php +++ b/src/Command/Site/StatusCommand.php @@ -155,9 +155,11 @@ protected function getSystemData() $title = $requirement['title']; } - $systemData['system'][$title] = strip_tags($requirement['value']); + $value = empty($requirement['description']) ? $requirement['value'] : $requirement['value'] . ' (' . $requirement['description'] . ')'; + $systemData['system'][strip_tags($title)] = strip_tags($value); ; } + if ($this->settings) { try { $hashSalt = $this->settings->getHashSalt(); @@ -177,11 +179,11 @@ protected function getConnectionData() $connectionData = []; foreach ($this->connectionInfoKeys as $connectionInfoKey) { - if ("password" == $connectionInfoKey) { + if ('password' == $connectionInfoKey) { continue; } - $connectionKey = $this->trans('commands.site.status.messages.'.$connectionInfoKey); + $connectionKey = $this->trans('commands.site.status.messages.' . $connectionInfoKey); $connectionData['database'][$connectionKey] = $connectionInfo['default'][$connectionInfoKey]; } @@ -191,7 +193,7 @@ protected function getConnectionData() $connectionInfo['default']['username'], $connectionInfo['default']['password'], $connectionInfo['default']['host'], - $connectionInfo['default']['port'] ? ':'.$connectionInfo['default']['port'] : '', + $connectionInfo['default']['port'] ? ':' . $connectionInfo['default']['port'] : '', $connectionInfo['default']['database'] ); @@ -204,8 +206,8 @@ protected function getThemeData() return [ 'theme' => [ - $this->trans('commands.site.status.messages.theme_default') => $config->get('default'), - $this->trans('commands.site.status.messages.theme_admin') => $config->get('admin'), + $this->trans('commands.site.status.messages.theme-default') => $config->get('default'), + $this->trans('commands.site.status.messages.theme-admin') => $config->get('admin'), ], ]; }