From 1f4c492cd8e59d32b8a8a5ede99e5d77225bc65b Mon Sep 17 00:00:00 2001
From: GDR! <gdr@gdr.name>
Date: Tue, 29 Nov 2022 13:20:17 +0100
Subject: [PATCH 1/2] Detect if running phar via CLI SAPI.

Signed-off-by: GDR! <gdr@gdr.name>
---
 php/boot-phar.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/php/boot-phar.php b/php/boot-phar.php
index 946e8369e..77549328f 100644
--- a/php/boot-phar.php
+++ b/php/boot-phar.php
@@ -1,5 +1,14 @@
 <?php
 
+if ( 'cli' !== PHP_SAPI ) {
+	echo "Only PHP-CLI access.\n";
+	echo "You're currently using the " . PHP_SAPI . " PHP SAPI.\n";
+	echo "If you're trying to run this file with a web browser, don't.\n";
+	echo "When running in command line, ensure that `php -v` has the\n";
+	echo "word \"cli\" in the first line of output.\n";
+	die( -1 );
+}
+
 // Store the path to the Phar early on for `Utils\phar-safe-path()` function.
 define( 'WP_CLI_PHAR_PATH', getcwd() );
 

From 39dff319ebab6c84f295b8863cb5d431e9659184 Mon Sep 17 00:00:00 2001
From: GDR! <gdr@gdr.name>
Date: Fri, 9 Dec 2022 10:23:52 +0100
Subject: [PATCH 2/2] Better wording for php-cgi error

Co-authored-by: Alain Schlesser <alain.schlesser@gmail.com>
---
 php/boot-phar.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/php/boot-phar.php b/php/boot-phar.php
index 77549328f..406402e97 100644
--- a/php/boot-phar.php
+++ b/php/boot-phar.php
@@ -1,11 +1,11 @@
 <?php
 
 if ( 'cli' !== PHP_SAPI ) {
-	echo "Only PHP-CLI access.\n";
-	echo "You're currently using the " . PHP_SAPI . " PHP SAPI.\n";
-	echo "If you're trying to run this file with a web browser, don't.\n";
-	echo "When running in command line, ensure that `php -v` has the\n";
-	echo "word \"cli\" in the first line of output.\n";
+	echo "WP-CLI only works correctly from the command line, using the 'cli' PHP SAPI.\n",
+		"You're currently executing the WP-CLI binary via the '" . PHP_SAPI . "' PHP SAPI.\n",
+		"In case you were trying to run this file with a web browser, know that this cannot technically work.\n",
+		"When running the WP-CLI binary on the command line, you can ensure you're using the right PHP SAPI",
+		"by checking that `php -v` has the word 'cli' in the first line of output.\n";
 	die( -1 );
 }