From 8c1355f448ec8087bf7ed468208f8d63794de909 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 4 Nov 2020 22:28:17 +0100
Subject: [PATCH] Improve output of platform check further in case errors are
 hidden

---
 src/Composer/Autoload/AutoloadGenerator.php         | 13 ++++++++++---
 .../Fixtures/platform/no_extensions_required.php    | 11 +++++++++--
 .../Autoload/Fixtures/platform/no_php_required.php  | 11 +++++++++--
 .../Fixtures/platform/no_php_upper_bound.php        | 11 +++++++++--
 .../Fixtures/platform/replaced_provided_exts.php    | 11 +++++++++--
 .../Fixtures/platform/specific_php_release.php      | 11 +++++++++--
 .../Test/Autoload/Fixtures/platform/typical.php     | 13 ++++++++++---
 7 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/src/Composer/Autoload/AutoloadGenerator.php b/src/Composer/Autoload/AutoloadGenerator.php
index 13708693a..75c5ed44f 100644
--- a/src/Composer/Autoload/AutoloadGenerator.php
+++ b/src/Composer/Autoload/AutoloadGenerator.php
@@ -704,7 +704,7 @@ EOF;
             $requiredPhp = <<<PHP_CHECK
 
 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;
@@ -717,7 +717,7 @@ PHP_CHECK;
 \$missingExtensions = array();
 $requiredExtensions
 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;
@@ -735,8 +735,15 @@ EXT_CHECKS;
 \$issues = array();
 ${requiredPhp}${requiredExtensions}
 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(
-        'Composer detected issues in your platform: ' . implode(', ', \$issues),
+        'Composer detected issues in your platform: ' . implode(' ', \$issues),
         E_USER_ERROR
     );
 }
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 188c0fae4..762b670af 100644
--- a/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php
+++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_extensions_required.php
@@ -5,12 +5,19 @@
 $issues = array();
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }
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 ee7d8cacd..0665633cd 100644
--- a/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php
+++ b/tests/Composer/Test/Autoload/Fixtures/platform/no_php_required.php
@@ -9,12 +9,19 @@ extension_loaded('json') || $missingExtensions[] = 'json';
 extension_loaded('xml') || $missingExtensions[] = 'xml';
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }
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 188c0fae4..762b670af 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
@@ -5,12 +5,19 @@
 $issues = array();
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/replaced_provided_exts.php b/tests/Composer/Test/Autoload/Fixtures/platform/replaced_provided_exts.php
index c530dc59d..78b550268 100644
--- a/tests/Composer/Test/Autoload/Fixtures/platform/replaced_provided_exts.php
+++ b/tests/Composer/Test/Autoload/Fixtures/platform/replaced_provided_exts.php
@@ -8,12 +8,19 @@ $missingExtensions = array();
 extension_loaded('pdo') || $missingExtensions[] = 'pdo';
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }
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 5a2d6dfed..9ae604c1c 100644
--- a/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php
+++ b/tests/Composer/Test/Autoload/Fixtures/platform/specific_php_release.php
@@ -5,12 +5,19 @@
 $issues = array();
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }
diff --git a/tests/Composer/Test/Autoload/Fixtures/platform/typical.php b/tests/Composer/Test/Autoload/Fixtures/platform/typical.php
index ba33b7aeb..9319e33bd 100644
--- a/tests/Composer/Test/Autoload/Fixtures/platform/typical.php
+++ b/tests/Composer/Test/Autoload/Fixtures/platform/typical.php
@@ -5,7 +5,7 @@
 $issues = array();
 
 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();
@@ -13,12 +13,19 @@ extension_loaded('json') || $missingExtensions[] = 'json';
 extension_loaded('xml') || $missingExtensions[] = 'xml';
 
 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 (!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(
-        'Composer detected issues in your platform: ' . implode(', ', $issues),
+        'Composer detected issues in your platform: ' . implode(' ', $issues),
         E_USER_ERROR
     );
 }