From d494df61ff2bbb4bc516d2ef7224bb48f42f4a2f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 24 Apr 2020 13:25:13 +0200 Subject: [PATCH] Make sure platform-check returns a non-0 exit code if it fails --- src/Composer/Autoload/AutoloadGenerator.php | 3 ++- .../Test/Autoload/Fixtures/platform/no_extensions_required.php | 3 ++- .../Test/Autoload/Fixtures/platform/no_php_lower_bound.php | 3 ++- .../Test/Autoload/Fixtures/platform/no_php_required.php | 3 ++- .../Test/Autoload/Fixtures/platform/no_php_upper_bound.php | 3 ++- .../Test/Autoload/Fixtures/platform/specific_php_release.php | 3 ++- tests/Composer/Test/Autoload/Fixtures/platform/typical.php | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php index c3cffa839..c0b71c566 100644 --- a/src/Composer/Autoload/AutoloadGenerator.php +++ b/src/Composer/Autoload/AutoloadGenerator.php @@ -660,7 +660,8 @@ if (!(PHP_VERSION_ID $lowestOperator $lowestPhpVersionId && PHP_VERSION_ID $high } $requiredExtensions if (\$issues) { - die('Composer detected issues in your platform:' . "\\n\\n" . implode("\\n", \$issues)); + echo 'Composer detected issues in your platform:' . "\\n\\n" . implode("\\n", \$issues); + exit(104); } PLATFORM_CHECK; diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php b/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php index ccb09bcde..1dbfcd455 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php @@ -9,5 +9,6 @@ if (!(PHP_VERSION_ID >= 70200 && PHP_VERSION_ID < 80000)) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); } diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_lower_bound.php b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_lower_bound.php index 5d1c368ad..1339d2b76 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_lower_bound.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_lower_bound.php @@ -9,5 +9,6 @@ if (!(PHP_VERSION_ID >= 0 && PHP_VERSION_ID < 80000)) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); } diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php index ed2ecf25e..0cd09927a 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php @@ -17,5 +17,6 @@ if ($missingExtensions) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); } diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_upper_bound.php b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_upper_bound.php index f11188b31..838cbbbba 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_upper_bound.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_upper_bound.php @@ -9,5 +9,6 @@ if (!(PHP_VERSION_ID >= 70200 && PHP_VERSION_ID < 99999)) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); } diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php b/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php index 3ba4d2cc4..d1300a62d 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php @@ -9,5 +9,6 @@ if (!(PHP_VERSION_ID >= 70208 && PHP_VERSION_ID < 80000)) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); } diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/typical.php b/tests/Composer/Test/Autoload/Fixtures/platform/typical.php index 45d85c8c2..728e68b63 100644 --- a/tests/Composer/Test/Autoload/Fixtures/platform/typical.php +++ b/tests/Composer/Test/Autoload/Fixtures/platform/typical.php @@ -17,5 +17,6 @@ if ($missingExtensions) { } if ($issues) { - die('Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues)); + echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); + exit(104); }