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

Merge pull request #8605 from guilliamxavier/fix-validate-strict-warnings 

Fix validate strict warnings
pull/8611/head
Jordi Boggiano 2020-02-14 14:14:21 +01:00 committed by GitHub
parent 8fd70d2dc4 a17e7e9bd3
commit 653e62f201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ EOT
$lockErrors[] = 'The lock file is not up to date with the latest changes in composer.json, it is recommended that you run `composer update` or `composer update <package name>`.'; $lockErrors[] = 'The lock file is not up to date with the latest changes in composer.json, it is recommended that you run `composer update` or `composer update <package name>`.';
} }
$this->outputResult($io, $file, $errors, $warnings, $checkPublish, $publishErrors, $checkLock, $lockErrors, true, $isStrict); $this->outputResult($io, $file, $errors, $warnings, $checkPublish, $publishErrors, $checkLock, $lockErrors, true);
// $errors include publish and lock errors when exists // $errors include publish and lock errors when exists
$exitCode = $errors ? 2 : ($isStrict && $warnings ? 1 : 0); $exitCode = $errors ? 2 : ($isStrict && $warnings ? 1 : 0);
@ -108,8 +108,10 @@ EOT
$file = $path . '/composer.json'; $file = $path . '/composer.json';
if (is_dir($path) && file_exists($file)) { if (is_dir($path) && file_exists($file)) {
list($errors, $publishErrors, $warnings) = $validator->validate($file, $checkAll); list($errors, $publishErrors, $warnings) = $validator->validate($file, $checkAll);
$this->outputResult($io, $package->getPrettyName(), $errors, $warnings, $checkPublish, $publishErrors); $this->outputResult($io, $package->getPrettyName(), $errors, $warnings, $checkPublish, $publishErrors);
// $errors include publish errors when exists
$depCode = $errors ? 2 : ($isStrict && $warnings ? 1 : 0); $depCode = $errors ? 2 : ($isStrict && $warnings ? 1 : 0);
$exitCode = max($depCode, $exitCode); $exitCode = max($depCode, $exitCode);
} }
@ -123,44 +125,48 @@ EOT
return $exitCode; return $exitCode;
} }
private function outputResult($io, $name, &$errors, &$warnings, $checkPublish = false, $publishErrors = array(), $checkLock = false, $lockErrors = array(), $printSchemaUrl = false, $isStrict = false) private function outputResult($io, $name, &$errors, &$warnings, $checkPublish = false, $publishErrors = array(), $checkLock = false, $lockErrors = array(), $printSchemaUrl = false)
{ {
if (!$errors && !$publishErrors && !$warnings) { $doPrintSchemaUrl = false;
$io->write('<info>' . $name . ' is valid</info>');
} elseif (!$errors && !$publishErrors) { if ($errors) {
$io->writeError('<info>' . $name . ' is valid, but with a few warnings</info>'); $io->writeError('<error>' . $name . ' is invalid, the following errors/warnings were found:</error>');
if ($printSchemaUrl) { } elseif ($publishErrors) {
$io->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
}
} elseif (!$errors) {
$io->writeError('<info>' . $name . ' is valid for simple usage with composer but has</info>'); $io->writeError('<info>' . $name . ' is valid for simple usage with composer but has</info>');
$io->writeError('<info>strict errors that make it unable to be published as a package:</info>'); $io->writeError('<info>strict errors that make it unable to be published as a package:</info>');
if ($printSchemaUrl) { $doPrintSchemaUrl = $printSchemaUrl;
$io->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>'); } elseif ($warnings) {
} $io->writeError('<info>' . $name . ' is valid, but with a few warnings</info>');
$doPrintSchemaUrl = $printSchemaUrl;
} else { } else {
$io->writeError('<error>' . $name . ' is invalid, the following errors/warnings were found:</error>'); $io->write('<info>' . $name . ' is valid</info>');
// if ($lockErrors) then they will be displayed below
} }
if ($doPrintSchemaUrl) {
$io->writeError('<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>');
}
// Avoid setting the exit code to 1 in case --strict and --no-check-publish/--no-check-lock are combined
$extraWarnings = array();
// 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
if ($checkPublish) { if ($checkPublish) {
$errors = array_merge($errors, $publishErrors); $errors = array_merge($errors, $publishErrors);
} elseif (!$isStrict) { } else {
$warnings = array_merge($warnings, $publishErrors); $extraWarnings = array_merge($extraWarnings, $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
if ($checkLock) { if ($checkLock) {
$errors = array_merge($errors, $lockErrors); $errors = array_merge($errors, $lockErrors);
} elseif (!$isStrict) { } else {
$warnings = array_merge($warnings, $lockErrors); $extraWarnings = array_merge($extraWarnings, $lockErrors);
} }
$messages = array( $messages = array(
'error' => $errors, 'error' => $errors,
'warning' => $warnings, 'warning' => array_merge($warnings, $extraWarnings),
); );
foreach ($messages as $style => $msgs) { foreach ($messages as $style => $msgs) {