Avoid downgrading from error to warning

6 years ago · 284da1487c
parent da94e4b619
commit 284da1487c
1 changed files with 3 additions and 3 deletions
--- a/src/Composer/Command/DiagnoseCommand.php
+++ b/src/Composer/Command/DiagnoseCommand.php
@ -474,10 +474,10 @@ EOT

        if ($hadError) {
            $io->write('<error>FAIL</error>');
-            $this->exitCode = 2;
+            $this->exitCode = max($this->exitCode, 2);
        } elseif ($hadWarning) {
            $io->write('<warning>WARNING</warning>');
-            $this->exitCode = 1;
+            $this->exitCode = max($this->exitCode, 1);
        }

        if ($result) {