Skip to content

Require wp-cli/wp-cli v2.13 #90

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

Merged
swissspidy merged 12 commits into from
Jul 14, 2026
+46 −24
Merged

Require wp-cli/wp-cli v2.13 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
92453ab
Require wp-cli/wp-cli v2.13
swissspidy Jul 13, 2026
5b75880
Prefix aliases for back compat
swissspidy Jul 13, 2026
a01e83c
Merge branch 'main' into chore/update
swissspidy Jul 13, 2026
96b9891
Normalize paths throughout
swissspidy Jul 13, 2026
b5943e4
More Windows tweaks
swissspidy Jul 13, 2026
dc788a4
Another one
swissspidy Jul 13, 2026
bd72195
Wrap in quotes
swissspidy Jul 13, 2026
79339cd
Wrap everything
swissspidy Jul 14, 2026
6d89aec
debug logs
swissspidy Jul 14, 2026
23c3d8b
comment out
swissspidy Jul 14, 2026
8b03513
cleanup
swissspidy Jul 14, 2026
60f73a2
Potential fix for pull request finding
swissspidy Jul 14, 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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"require": {
"php": ">=7.2.24",
"wp-cli/wp-cli": "^2.12"
"wp-cli/wp-cli": "^2.13"
Comment thread
swissspidy marked this conversation as resolved.
},
"require-dev": {
"wp-cli/wp-cli-tests": "^5.0.0"
Expand Down
27 changes: 15 additions & 12 deletions features/find.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Feature: Find WordPress installs on the filesystem
Given a WP install in 'subdir1'
And a WP install in 'subdir2'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --field=version_path | sort`
Expand Down Expand Up @@ -35,7 +35,7 @@ Feature: Find WordPress installs on the filesystem
And a WP install in 'cache'
And a WP install in 'tmp'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --field=version_path --verbose`
Expand Down Expand Up @@ -70,11 +70,11 @@ Feature: Find WordPress installs on the filesystem

Scenario: Use --max_depth=<depth> to specify max recursion depth
Given a WP install in 'subdir1'
And I run `mkdir -p sub/sub`
And an empty sub/sub directory
And a WP install in 'sub/subdir2'
And a WP install in 'sub/sub/subdir3'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --verbose`
Expand Down Expand Up @@ -166,11 +166,14 @@ Feature: Find WordPress installs on the filesystem
Given a WP install in 'subdir1'
And a WP install in 'subdir2'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `echo "@test1:\n path: {TEST_DIR}/subdir2" > wp-cli.yml`
Then the return code should be 0
Given a wp-cli.yml file:
"""
@test1:
path: {TEST_DIR}/subdir2
"""

When I run `wp find {TEST_DIR} --fields=version_path,alias`
Then STDOUT should be a table containing rows:
Expand All @@ -181,10 +184,10 @@ Feature: Find WordPress installs on the filesystem
Scenario: Ignore hidden directories by default
Given a WP install in 'subdir1'
And a WP install in '.svn'
And I run `mkdir -p subdir2/.svn`
And an empty subdir2/.svn directory
And a WP install in 'subdir2/.svn/wp-install'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --format=count`
Expand All @@ -203,7 +206,7 @@ Feature: Find WordPress installs on the filesystem
Given a WP install in 'subdir1'
And a WP install in 'subdir2'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --format=count`
Expand All @@ -212,7 +215,7 @@ Feature: Find WordPress installs on the filesystem
2
"""

When I run `wp find {TEST_DIR} --include_ignored_paths='/subdir1/,/apple/' --format=count`
When I run `wp find {TEST_DIR} "--include_ignored_paths=subdir1,apple" --format=count`
Then STDOUT should be:
"""
1
Expand All @@ -224,7 +227,7 @@ Feature: Find WordPress installs on the filesystem
And a WP install in 'logs'
And a WP install in 'js'

When I run `wp eval --skip-wordpress 'echo realpath( getenv( "RUN_DIR" ) );'`
When I run `wp eval --skip-wordpress "echo WP_CLI\Path::normalize( realpath( getenv( 'RUN_DIR' ) ) );"`
Then save STDOUT as {TEST_DIR}

When I run `wp find {TEST_DIR} --field=version_path --verbose`
Expand Down
41 changes: 30 additions & 11 deletions src/Find_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use WP_CLI\Utils;
use WP_CLI\Formatter;
use WP_CLI\Path;

class Find_Command {

Expand Down Expand Up @@ -189,14 +190,23 @@ class Find_Command {
* @when before_wp_load
*/
public function __invoke( $args, $assoc_args ) {
list( $path ) = $args;
$this->base_path = (string) realpath( $path );
if ( ! $this->base_path ) {
list( $path ) = $args;
$base_path = (string) realpath( $path );
if ( ! $base_path ) {
WP_CLI::error( 'Invalid path specified.' );
}
$this->base_path = Path::normalize( $base_path );
$this->skip_ignored_paths = Utils\get_flag_value( $assoc_args, 'skip-ignored-paths' );
if ( ! empty( $assoc_args['include_ignored_paths'] ) ) {
$this->ignored_paths = array_merge( $this->ignored_paths, explode( ',', $assoc_args['include_ignored_paths'] ) );
$included_paths = explode( ',', trim( $assoc_args['include_ignored_paths'], "\"' " ) );
$included_paths = array_map(
static function ( $path ) {
$path = Path::normalize( trim( $path, "\"' " ) );
return ltrim( rtrim( $path, '/' ) . '/', '/' );
},
$included_paths
);
$this->ignored_paths = array_merge( $this->ignored_paths, $included_paths );
}
$this->max_depth = Utils\get_flag_value( $assoc_args, 'max_depth', false );
$this->verbose = Utils\get_flag_value( $assoc_args, 'verbose' );
Expand All @@ -206,12 +216,18 @@ public function __invoke( $args, $assoc_args ) {
if ( empty( $target['path'] ) ) {
continue;
}
$this->resolved_aliases[ rtrim( $target['path'], '/' ) ] = $alias;
$this->resolved_aliases[ rtrim( Path::normalize( $target['path'] ), '/' ) ] = $alias;
}

$fields = [ 'version_path', 'version', 'depth', 'alias' ];
if ( ! empty( $assoc_args['fields'] ) ) {
$fields = explode( ',', $assoc_args['fields'] );
$fields = explode( ',', trim( $assoc_args['fields'], "\"' " ) );
$fields = array_map(
static function ( $field ) {
return trim( $field, "\"' " );
},
$fields
);
}

$this->start_time = microtime( true );
Expand All @@ -229,15 +245,18 @@ private function recurse_directory( $path ) {
return;
}

$path = Path::normalize( $path );

// Provide consistent trailing slashes to all paths
$path = rtrim( $path, '/' ) . '/';

// Don't recurse directories that probably don't have a WordPress installation.
if ( ! $this->skip_ignored_paths ) {
// Assume base path doesn't need comparison
$compared_path = (string) preg_replace( '#^' . preg_quote( $this->base_path, '#' ) . '#', '', $path );
$compared_path = (string) preg_replace( '#^' . preg_quote( $this->base_path, '#' ) . '#' . ( '\\' === DIRECTORY_SEPARATOR ? 'i' : '' ), '', $path );
// Ignore all hidden system directories
$bits = explode( '/', trim( $compared_path, '/' ) );
$bits = explode( '/', trim( $compared_path, '/' ) );

$current_dir = array_pop( $bits );
if ( $current_dir && '.' === $current_dir[0] ) {
$this->log( "Matched ignored path. Skipping recursion into '{$path}'" );
Expand All @@ -254,11 +273,11 @@ private function recurse_directory( $path ) {

// This looks like a wp-includes directory, so check if it has a
// version.php file.
if ( DIRECTORY_SEPARATOR . 'wp-includes/' === substr( $path, -13 )
if ( '/wp-includes/' === substr( $path, -13 )
&& file_exists( $path . 'version.php' ) ) {
$version_path = $path . 'version.php';
$wp_path = substr( $path, 0, -13 );
$alias = isset( $this->resolved_aliases[ $wp_path ] ) ? $this->resolved_aliases[ $wp_path ] : '';
$alias = isset( $this->resolved_aliases[ $wp_path ] ) ? '@' . $this->resolved_aliases[ $wp_path ] : '';
$wp_path = rtrim( $wp_path, '/' ) . '/';

$this->found_wp[ $version_path ] = [
Expand Down Expand Up @@ -346,7 +365,7 @@ private static function get_wp_config_path( $installation_dir ) {
}

if ( $path ) {
$path = realpath( $path );
$path = Path::normalize( (string) realpath( $path ) );
}
Comment thread
swissspidy marked this conversation as resolved.
return $path;
}
Expand Down
Loading