Skip to content

Fix internal variable bleeding in REPL eval context #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix internal variable bleeding in REPL eval context #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c5f7d6
Initial plan
Copilot Jan 25, 2026
31bf815
Rename internal variables to prevent bleeding into eval context
Copilot Jan 25, 2026
ecaf2e7
Add test for $out and $evl variables
Copilot Jan 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions features/shell.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,41 @@ Feature: WordPress REPL
"""
history: -1: invalid option
"""

Scenario: User can define variable named $line
Given a WP install
And a session file:
"""
$line = 'this should work';
$line;
"""

When I run `wp shell --basic < session`
Then STDOUT should contain:
"""
=> string(16) "this should work"
"""
And STDOUT should contain:
"""
=> string(16) "this should work"
"""

Scenario: User can define variables named $out and $evl
Given a WP install
And a session file:
"""
$out = 'out should work';
$evl = 'evl should work';
$out;
$evl;
"""

When I run `wp shell --basic < session`
Then STDOUT should contain:
"""
=> string(15) "out should work"
"""
And STDOUT should contain:
"""
=> string(15) "evl should work"
"""
48 changes: 24 additions & 24 deletions src/WP_CLI/Shell/REPL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,38 @@ public function __construct( $prompt ) {
public function start() {
// @phpstan-ignore while.alwaysTrue
while ( true ) {
$line = $this->prompt();
$__repl_input_line = $this->prompt();

if ( '' === $line ) {
if ( '' === $__repl_input_line ) {
continue;
}

$line = rtrim( $line, ';' ) . ';';
$__repl_input_line = rtrim( $__repl_input_line, ';' ) . ';';

if ( self::starts_with( self::non_expressions(), $line ) ) {
if ( self::starts_with( self::non_expressions(), $__repl_input_line ) ) {
ob_start();
// phpcs:ignore Squiz.PHP.Eval.Discouraged -- This is meant to be a REPL, no way to avoid eval.
eval( $line );
$out = (string) ob_get_clean();
if ( 0 < strlen( $out ) ) {
$out = rtrim( $out, "\n" ) . "\n";
eval( $__repl_input_line );
$__repl_output = (string) ob_get_clean();
if ( 0 < strlen( $__repl_output ) ) {
$__repl_output = rtrim( $__repl_output, "\n" ) . "\n";
}
fwrite( STDOUT, $out );
fwrite( STDOUT, $__repl_output );
} else {
if ( ! self::starts_with( 'return', $line ) ) {
$line = 'return ' . $line;
if ( ! self::starts_with( 'return', $__repl_input_line ) ) {
$__repl_input_line = 'return ' . $__repl_input_line;
}

// Write directly to STDOUT, to sidestep any output buffers created by plugins
ob_start();
// phpcs:ignore Squiz.PHP.Eval.Discouraged -- This is meant to be a REPL, no way to avoid eval.
$evl = eval( $line );
$out = (string) ob_get_clean();
if ( 0 < strlen( $out ) ) {
echo rtrim( $out, "\n" ) . "\n";
$__repl_eval_result = eval( $__repl_input_line );
$__repl_output = (string) ob_get_clean();
if ( 0 < strlen( $__repl_output ) ) {
echo rtrim( $__repl_output, "\n" ) . "\n";
}
echo '=> ';
var_dump( $evl );
var_dump( $__repl_eval_result );
fwrite( STDOUT, (string) ob_get_clean() );
}
}
Expand Down Expand Up @@ -88,25 +88,25 @@ private function prompt() {

$fp = popen( self::create_prompt_cmd( $prompt, $this->history_file ), 'r' );

$line = $fp ? fgets( $fp ) : '';
$__repl_input_line = $fp ? fgets( $fp ) : '';

if ( $fp ) {
pclose( $fp );
}

if ( ! $line ) {
if ( ! $__repl_input_line ) {
break;
}

$line = rtrim( $line, "\n" );
$__repl_input_line = rtrim( $__repl_input_line, "\n" );

if ( $line && '\\' === $line[ strlen( $line ) - 1 ] ) {
$line = substr( $line, 0, -1 );
if ( $__repl_input_line && '\\' === $__repl_input_line[ strlen( $__repl_input_line ) - 1 ] ) {
$__repl_input_line = substr( $__repl_input_line, 0, -1 );
} else {
$done = true;
}

$full_line .= $line;
$full_line .= $__repl_input_line;

} while ( ! $done );

Expand Down Expand Up @@ -150,7 +150,7 @@ private function set_history_file() {
$this->history_file = \WP_CLI\Utils\get_temp_dir() . 'wp-cli-history-' . md5( $data );
}

private static function starts_with( $tokens, $line ) {
return preg_match( "/^($tokens)[\(\s]+/", $line );
private static function starts_with( $tokens, $__repl_input_line ) {
return preg_match( "/^($tokens)[\(\s]+/", $__repl_input_line );
}
}