Merge branch 'main' into phpunit-coverage-config

swissspidy · web-flow · commit 060322445c1e · 2025-02-25T19:44:04.000+01:00
diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
@@ -344,6 +344,14 @@ private static function guess_url( $assoc_args ) {
 		return false;
 	}
 
+	/**
+	 * Checks if the arguments passed to the WP-CLI binary start with the specified prefix.
+	 *
+	 * @param array $prefix An array of strings specifying the expected start of the arguments passed to the WP-CLI binary.
+	 *                      For example, `['user', 'list']` checks if the arguments passed to the WP-CLI binary start with `user list`.
+	 *
+	 * @return bool `true` if the arguments passed to the WP-CLI binary start with the specified prefix, `false` otherwise.
+	 */
 	private function cmd_starts_with( $prefix ) {
 		return array_slice( $this->arguments, 0, count( $prefix ) ) === $prefix;
 	}
diff --git a/php/class-wp-cli.php b/php/class-wp-cli.php
@@ -772,7 +772,7 @@ public static function log( $message ) {
 	/**
 	 * Display success message prefixed with "Success: ".
 	 *
-	 * Success message is written to STDOUT.
+	 * Success message is written to STDOUT, or discarded when `--quiet` flag is supplied.
 	 *
 	 * Typically recommended to inform user of successful script conclusion.
 	 *
@@ -852,7 +852,7 @@ public static function debug( $message, $group = false ) {
 	/**
 	 * Display warning message prefixed with "Warning: ".
 	 *
-	 * Warning message is written to STDERR.
+	 * Warning message is written to STDERR, or discarded when `--quiet` flag is supplied.
 	 *
 	 * Use instead of `WP_CLI::debug()` when script execution should be permitted
 	 * to continue.
diff --git a/php/wp-cli.php b/php/wp-cli.php
@@ -19,7 +19,7 @@
 
 // Set common headers, to prevent warnings from plugins.
 $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.0';
-$_SERVER['HTTP_USER_AGENT'] = '';
+$_SERVER['HTTP_USER_AGENT'] = ( ! empty( getenv( 'WP_CLI_USER_AGENT' ) ) ? getenv( 'WP_CLI_USER_AGENT' ) : 'WP CLI ' . WP_CLI_VERSION );
 $_SERVER['REQUEST_METHOD']  = 'GET';
 $_SERVER['REMOTE_ADDR']     = '127.0.0.1';
 

Original file line number	Diff line number	Diff line change
`@@ -344,6 +344,14 @@ private static function guess_url( $assoc_args ) {`
`344`	`344`	`return false;`
`345`	`345`	`}`
`346`	`346`
	`347`	`+ /**`
	`348`	`+ * Checks if the arguments passed to the WP-CLI binary start with the specified prefix.`
	`349`	`+ *`
	`350`	`+ * @param array $prefix An array of strings specifying the expected start of the arguments passed to the WP-CLI binary.`
	`351`	+ * For example, `['user', 'list']` checks if the arguments passed to the WP-CLI binary start with `user list`.
	`352`	`+ *`
	`353`	+ * @return bool `true` if the arguments passed to the WP-CLI binary start with the specified prefix, `false` otherwise.
	`354`	`+ */`
`347`	`355`	`private function cmd_starts_with( $prefix ) {`
`348`	`356`	`return array_slice( $this->arguments, 0, count( $prefix ) ) === $prefix;`
`349`	`357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -772,7 +772,7 @@ public static function log( $message ) {`
`772`	`772`	`/**`
`773`	`773`	`* Display success message prefixed with "Success: ".`
`774`	`774`	`*`
`775`		`- * Success message is written to STDOUT.`
	`775`	+ * Success message is written to STDOUT, or discarded when `--quiet` flag is supplied.
`776`	`776`	`*`
`777`	`777`	`* Typically recommended to inform user of successful script conclusion.`
`778`	`778`	`*`
`@@ -852,7 +852,7 @@ public static function debug( $message, $group = false ) {`
`852`	`852`	`/**`
`853`	`853`	`* Display warning message prefixed with "Warning: ".`
`854`	`854`	`*`
`855`		`- * Warning message is written to STDERR.`
	`855`	+ * Warning message is written to STDERR, or discarded when `--quiet` flag is supplied.
`856`	`856`	`*`
`857`	`857`	* Use instead of `WP_CLI::debug()` when script execution should be permitted
`858`	`858`	`* to continue.`