From 985026e60d5b59050795c43e14f1cc7258956543 Mon Sep 17 00:00:00 2001 From: konradoboza Date: Fri, 21 May 2021 10:07:12 +0200 Subject: [PATCH 1/9] IBX-385: Fixed error handling when composer files are corrupted --- Resources/translations/dashboard.en.xlf | 4 ++-- .../themes/admin/dashboard/block/ez.html.twig | 2 +- .../Collector/EzSystemInfoCollector.php | 3 ++- .../JsonComposerLockSystemInfoCollector.php | 9 +++++++ .../ComposerFileValidationException.php | 21 ++++++++++++++++ SystemInfo/Value/InvalidSystemInfo.php | 24 +++++++++++++++++++ View/SystemInfoViewBuilder.php | 10 +++++++- composer.json | 2 +- 8 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 SystemInfo/Exception/ComposerFileValidationException.php create mode 100644 SystemInfo/Value/InvalidSystemInfo.php diff --git a/Resources/translations/dashboard.en.xlf b/Resources/translations/dashboard.en.xlf index 1e5e8143..1afce332 100644 --- a/Resources/translations/dashboard.en.xlf +++ b/Resources/translations/dashboard.en.xlf @@ -73,9 +73,9 @@ key: dashboard.ez_version.non_stable_ee - composer.lock file. It's needed to determine information about + composer.lock or composer.json file or it's not valid. It's needed to determine information about your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments.]]> - composer.lock file. It's needed to determine information about + composer.lock or composer.json file or it's not valid. It's needed to determine information about your eZ install, and recommended to be kept on project development to make sure same package versions are used across all environments.]]> key: dashboard.ez_version.release_not_determined diff --git a/Resources/views/themes/admin/dashboard/block/ez.html.twig b/Resources/views/themes/admin/dashboard/block/ez.html.twig index c9a4598f..7d8e6078 100644 --- a/Resources/views/themes/admin/dashboard/block/ez.html.twig +++ b/Resources/views/themes/admin/dashboard/block/ez.html.twig @@ -16,7 +16,7 @@ {% set severity = 1 %}