Merge branch 'main' into copilot/support-restarting-shell

Author: swissspidy

.gitattributes

@@ -0,0 +1,14 @@
+/.actrc export-ignore
+/.distignore export-ignore
+/.editorconfig export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/.typos.toml export-ignore
+/AGENTS.md export-ignore
+/behat.yml export-ignore
+/features export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/wp-cli.yml export-ignore

.github/workflows/copilot-setup-steps.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -36,7 +36,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@a35c6ebd3d08125aaf8852dff361e686a1a67947 # v3
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

src/WP_CLI/Shell/REPL.php

@@ -156,8 +156,8 @@ private static function create_prompt_cmd( $prompt, $history_path ) {
 		} elseif ( is_file( '/bin/bash' ) && is_readable( '/bin/bash' ) ) {
 			// Prefer /bin/bash when available since we use bash-specific commands.
 			$shell_binary = '/bin/bash';
-		} elseif ( getenv( 'SHELL' ) && self::is_bash_shell( (string) getenv( 'SHELL' ) ) ) {
-			// Only use SHELL as fallback if it's bash (we use bash-specific commands).
+		} elseif ( getenv( 'SHELL' ) && self::is_supported_shell( (string) getenv( 'SHELL' ) ) ) {
+			// Use SHELL as fallback if it's a supported shell (bash or ksh).
 			$shell_binary = (string) getenv( 'SHELL' );
 		} else {
 			// Final fallback for systems without /bin/bash.
@@ -168,16 +168,27 @@ private static function create_prompt_cmd( $prompt, $history_path ) {
 			WP_CLI::error( "The shell binary '{$shell_binary}' is not valid. You can override the shell to be used through the WP_CLI_CUSTOM_SHELL environment variable." );
 		}
 
+		$is_ksh       = self::is_ksh_shell( $shell_binary );
 		$shell_binary = escapeshellarg( $shell_binary );
 
-		$cmd = 'set -f; '
-			. "history -r {$history_path}; "
-			. 'LINE=""; '
-			. "read -re -p {$prompt} LINE; "
-			. '[ $? -eq 0 ] || exit; '
-			. 'history -s -- "$LINE"; '
-			. "history -w {$history_path}; "
-			. 'echo $LINE; ';
+		if ( $is_ksh ) {
+			// ksh does not support bash-specific history commands or `read -e`/`read -p`.
+			// Use POSIX-compatible read and print the prompt via printf to stderr.
+			$cmd = 'set -f; '
+				. 'LINE=""; '
+				. "printf %s {$prompt} >&2; "
+				. 'IFS= read -r LINE || exit; '
+				. 'printf \'%s\n\' "$LINE"; ';
+		} else {
+			$cmd = 'set -f; '
+				. "history -r {$history_path}; "
+				. 'LINE=""; '
+				. "read -re -p {$prompt} LINE; "
+				. '[ $? -eq 0 ] || exit; '
+				. 'history -s -- "$LINE"; '
+				. "history -w {$history_path}; "
+				. 'printf \'%s\n\' "$LINE"; ';
+		}
 
 		return "{$shell_binary} -c " . escapeshellarg( $cmd );
 	}
@@ -197,6 +208,33 @@ private static function is_bash_shell( $shell_path ) {
 		return 'bash' === $basename || 0 === strpos( $basename, 'bash-' );
 	}
 
+	/**
+	 * Check if a shell binary is ksh or a ksh-compatible shell (mksh, pdksh, ksh93, etc.).
+	 *
+	 * @param string $shell_path Path to the shell binary.
+	 * @return bool True if the shell is ksh-compatible, false otherwise.
+	 */
+	private static function is_ksh_shell( $shell_path ) {
+		if ( ! is_file( $shell_path ) || ! is_readable( $shell_path ) ) {
+			return false;
+		}
+		$basename = basename( $shell_path );
+		// Matches ksh, ksh93, ksh88, mksh, pdksh, etc.
+		return 0 === strpos( $basename, 'ksh' )
+			|| 'mksh' === $basename
+			|| 'pdksh' === $basename;
+	}
+
+	/**
+	 * Check if a shell binary is supported (bash or ksh-compatible).
+	 *
+	 * @param string $shell_path Path to the shell binary.
+	 * @return bool True if the shell is supported, false otherwise.
+	 */
+	private static function is_supported_shell( $shell_path ) {
+		return self::is_bash_shell( $shell_path ) || self::is_ksh_shell( $shell_path );
+	}
+
 	private function set_history_file() {
 		$data = getcwd() . get_current_user();