Skip to content

Fix child-theme/plugin path check when --path contains relative segments #385

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

Closed
armorbreak001 wants to merge 1 commit into from
Closed

Fix child-theme/plugin path check when --path contains relative segments #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Scaffold_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,11 +986,11 @@ static function ( $item ) use ( $slug ) {
private function check_target_directory( $type, $target_dir ) {
$parent_dir = dirname( self::canonicalize_path( str_replace( '\\', '/', $target_dir ) ) );

if ( 'theme' === $type && str_replace( '\\', '/', WP_CONTENT_DIR . '/themes' ) !== $parent_dir ) {
if ( 'theme' === $type && self::canonicalize_path( str_replace( '\\', '/', WP_CONTENT_DIR . '/themes' ) ) !== $parent_dir ) {
return sprintf( 'The target directory \'%1$s\' is not in \'%2$s\'.', $target_dir, WP_CONTENT_DIR . '/themes' );
}

if ( 'plugin' === $type && str_replace( '\\', '/', WP_PLUGIN_DIR ) !== $parent_dir ) {
if ( 'plugin' === $type && self::canonicalize_path( str_replace( '\\', '/', WP_PLUGIN_DIR ) ) !== $parent_dir ) {
return sprintf( 'The target directory \'%1$s\' is not in \'%2$s\'.', $target_dir, WP_PLUGIN_DIR );
}
Comment on lines +989 to 995

@gemini-code-assist gemini-code-assist Bot Apr 21, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The path comparison logic is duplicated and potentially fragile if the WordPress constants contain trailing slashes or double slashes, as canonicalize_path() does not collapse them. Refactoring this to use a single normalized check improves maintainability and robustness. Using dirname() on the reference path (after appending /.) ensures it is normalized consistently with $parent_dir.

		$check_dir = 'theme' === $type ? WP_CONTENT_DIR . '/themes' : WP_PLUGIN_DIR;
		if ( in_array( $type, [ 'theme', 'plugin' ], true ) && dirname( self::canonicalize_path( str_replace( '\\', '/', $check_dir . '/.' ) ) ) !== $parent_dir ) {
			return sprintf( 'The target directory \'%1$s\' is not in \'%2$s\'.', $target_dir, $check_dir );
		}


Expand Down