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

Improve output of platform check further in case errors are hidden

pull/9418/head
Jordi Boggiano 2020-11-04 22:28:17 +01:00
parent 55c7b45de0
commit 8c1355f448
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
7 changed files with 65 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Composer/Autoload/AutoloadGenerator.php
View File

@ -704,7 +704,7 @@ EOF;
$requiredPhp = <<<PHP_CHECK $requiredPhp = <<<PHP_CHECK
if (!($requiredPhp)) { if (!($requiredPhp)) {
\$issues[] = 'Your Composer dependencies require a PHP version $requiredPhpError. You are running ' . PHP_VERSION . '.'; \$issues[] = 'Your Composer dependencies require a PHP version $requiredPhpError. You are running ' . PHP_VERSION . '.';
} }
PHP_CHECK; PHP_CHECK;
@ -717,7 +717,7 @@ PHP_CHECK;
\$missingExtensions = array(); \$missingExtensions = array();
$requiredExtensions $requiredExtensions
if (\$missingExtensions) { if (\$missingExtensions) {
\$issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', \$missingExtensions); \$issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', \$missingExtensions) . '.';
} }
EXT_CHECKS; EXT_CHECKS;
@ -735,8 +735,15 @@ EXT_CHECKS;
\$issues = array(); \$issues = array();
${requiredPhp}${requiredExtensions} ${requiredPhp}${requiredExtensions}
if (\$issues) { if (\$issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, \$issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, \$issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', \$issues), 'Composer detected issues in your platform: ' . implode(' ', \$issues),
E_USER_ERROR E_USER_ERROR
); );
} }

11
tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php
View File

@ -5,12 +5,19 @@
$issues = array(); $issues = array();
if (!(PHP_VERSION_ID >= 70200)) { if (!(PHP_VERSION_ID >= 70200)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.'; $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }

11
tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php
View File

@ -9,12 +9,19 @@ extension_loaded('json') || $missingExtensions[] = 'json';
extension_loaded('xml') || $missingExtensions[] = 'xml'; extension_loaded('xml') || $missingExtensions[] = 'xml';
if ($missingExtensions) { if ($missingExtensions) {
$issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions); $issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions) . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }

11
tests/Composer/Test/Autoload/Fixtures/platform/no_php_upper_bound.php
View File

@ -5,12 +5,19 @@
$issues = array(); $issues = array();
if (!(PHP_VERSION_ID >= 70200)) { if (!(PHP_VERSION_ID >= 70200)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.'; $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }

11
tests/Composer/Test/Autoload/Fixtures/platform/replaced_provided_exts.php
View File

@ -8,12 +8,19 @@ $missingExtensions = array();
extension_loaded('pdo') || $missingExtensions[] = 'pdo'; extension_loaded('pdo') || $missingExtensions[] = 'pdo';
if ($missingExtensions) { if ($missingExtensions) {
$issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions); $issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions) . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }

11
tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php
View File

@ -5,12 +5,19 @@
$issues = array(); $issues = array();
if (!(PHP_VERSION_ID >= 70208)) { if (!(PHP_VERSION_ID >= 70208)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.8". You are running ' . PHP_VERSION . '.'; $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.8". You are running ' . PHP_VERSION . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }

13
tests/Composer/Test/Autoload/Fixtures/platform/typical.php
View File

@ -5,7 +5,7 @@
$issues = array(); $issues = array();
if (!(PHP_VERSION_ID >= 70200)) { if (!(PHP_VERSION_ID >= 70200)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.'; $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
} }
$missingExtensions = array(); $missingExtensions = array();
@ -13,12 +13,19 @@ extension_loaded('json') || $missingExtensions[] = 'json';
extension_loaded('xml') || $missingExtensions[] = 'xml'; extension_loaded('xml') || $missingExtensions[] = 'xml';
if ($missingExtensions) { if ($missingExtensions) {
$issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions); $issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions) . '.';
} }
if ($issues) { if ($issues) {
if (!ini_get('display_errors')) {
if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
} elseif (!headers_sent()) {
echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
}
}
trigger_error( trigger_error(
'Composer detected issues in your platform: ' . implode(', ', $issues), 'Composer detected issues in your platform: ' . implode(' ', $issues),
E_USER_ERROR E_USER_ERROR
); );
} }