public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

ValidateCommand: always display all warnings, independently of --strict

pull/8605/head
Guilliam Xavier 2020-02-13 14:43:26 +01:00 committed by GitHub
parent 7e2679ffc1
commit b5e41d6792
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Composer/Command/ValidateCommand.php
View File

@ -143,25 +143,31 @@ EOT
$io->writeError('<error>' . $name . ' is invalid, the following errors/warnings were found:</error>'); $io->writeError('<error>' . $name . ' is invalid, the following errors/warnings were found:</error>');
} }
$allWarnings = $warnings;
// If checking publish errors, display them as errors, otherwise just show them as warnings // If checking publish errors, display them as errors, otherwise just show them as warnings
// Skip when it is a strict check and we don't want to check publish errors // Skip when it is a strict check and we don't want to check publish errors
if ($checkPublish) { if ($checkPublish) {
$errors = array_merge($errors, $publishErrors); $errors = array_merge($errors, $publishErrors);
} elseif (!$isStrict) { } else {
$warnings = array_merge($warnings, $publishErrors); $allWarnings = array_merge($allWarnings, $publishErrors);
} }
// If checking lock errors, display them as errors, otherwise just show them as warnings // If checking lock errors, display them as errors, otherwise just show them as warnings
// Skip when it is a strict check and we don't want to check lock errors // Skip when it is a strict check and we don't want to check lock errors
if ($checkLock) { if ($checkLock) {
$errors = array_merge($errors, $lockErrors); $errors = array_merge($errors, $lockErrors);
} elseif (!$isStrict) { } else {
$warnings = array_merge($warnings, $lockErrors); $allWarnings = array_merge($allWarnings, $lockErrors);
}
if (!$isStrict) {
$warnings = $allWarnings;
} }
$messages = array( $messages = array(
'error' => $errors, 'error' => $errors,
'warning' => $warnings, 'warning' => $allWarnings,
); );
foreach ($messages as $style => $msgs) { foreach ($messages as $style => $msgs) {