wp-studio 1.7.8-beta2 → 1.7.8-beta4

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Dispatcher/Subcommand.php

@@ -112,10 +112,10 @@ class Subcommand extends CompositeCommand {
 	 * Wrapper for CLI Tools' prompt() method.
 	 *
 	 * @param string $question
-	 * @param mixed $default
+	 * @param string $default
 	 * @return string|false
 	 */
-	private function prompt( $question, $default = null ) {
+	private function prompt( $question, $default ) {
 
 		$question .= ': ';
 		if ( function_exists( 'readline' ) ) {
@@ -124,49 +124,13 @@ class Subcommand extends CompositeCommand {
 
 		echo $question;
 
-		$ret = (string) stream_get_line( STDIN, 1024, "\n" );
+		$ret = stream_get_line( STDIN, 1024, "\n" );
 		if ( Utils\is_windows() && "\r" === substr( $ret, -1 ) ) {
 			$ret = substr( $ret, 0, -1 );
 		}
 		return $ret;
 	}
 
-	/**
-	 * Get the description for an argument from documentation.
-	 *
-	 * @param array $spec_arg Argument specification from SynopsisParser
-	 * @param DocParser $docparser DocParser instance for retrieving descriptions
-	 * @param string $longdesc Long description text for regex matching
-	 * @return string Description text, or empty string if not found
-	 */
-	private function get_arg_description( $spec_arg, $docparser, $longdesc ) {
-		$description = '';
-
-		if ( 'positional' === $spec_arg['type'] ) {
-			$description = $docparser->get_arg_desc( $spec_arg['name'] );
-			// If get_arg_desc doesn't find it (e.g., for simple <arg> without modifiers),
-			// try a simpler pattern that matches <arg> followed by : description,
-			// using a pattern consistent with DocParser::get_arg_desc().
-			if ( empty( $description ) ) {
-				$arg_pattern = '/\[?<' . preg_quote( $spec_arg['name'], '/' ) . ">.+\n:\s*(.+?)(\n|$)/";
-				if ( preg_match( $arg_pattern, $longdesc, $matches ) ) {
-					$description = trim( $matches[1] );
-				}
-			}
-		} elseif ( 'assoc' === $spec_arg['type'] ) {
-			$description = $docparser->get_param_desc( $spec_arg['name'] );
-		} elseif ( 'flag' === $spec_arg['type'] ) {
-			// For flags, the pattern is [--flag] not [--flag=<value>]
-			// So we need a custom regex pattern in the longdesc
-			$flag_pattern = '/\[?--' . preg_quote( $spec_arg['name'], '/' ) . "\]\s*\n:\s*(.+?)(\n|$)/";
-			if ( preg_match( $flag_pattern, $longdesc, $matches ) ) {
-				$description = trim( $matches[1] );
-			}
-		}
-
-		return $description;
-	}
-
 	/**
 	 * Interactively prompt the user for input
 	 * based on defined synopsis and passed arguments.
@@ -183,9 +147,6 @@ class Subcommand extends CompositeCommand {
 			return [ $args, $assoc_args ];
 		}
 
-		// Create a docparser to get default values and descriptions
-		$docparser = $this->create_mock_docparser();
-
 		// To skip the already provided positional arguments, we need to count
 		// how many we had already received.
 		$arg_index = 0;
@@ -213,17 +174,11 @@ class Subcommand extends CompositeCommand {
 
 		$spec = array_values( $spec );
 
-		/**
-		 * @var string|true $prompt_args
-		 */
 		$prompt_args = WP_CLI::get_config( 'prompt' );
 		if ( true !== $prompt_args ) {
 			$prompt_args = explode( ',', $prompt_args );
 		}
 
-		// Reuse the existing DocParser to retrieve argument descriptions.
-		$docparser = $this->docparser;
-
 		// 'positional' arguments are positional (aka zero-indexed)
 		// so $args needs to be reset before prompting for new arguments
 		$args = [];
@@ -242,6 +197,7 @@ class Subcommand extends CompositeCommand {
 			}
 
 			$current_prompt = ( $key + 1 ) . '/' . count( $spec ) . ' ';
+			$default        = $spec_arg['optional'] ? '' : false;
 
 			// 'generic' permits arbitrary key=value (e.g. [--<field>=<value>] )
 			if ( 'generic' === $spec_arg['type'] ) {
@@ -256,7 +212,7 @@ class Subcommand extends CompositeCommand {
 						$key_prompt = str_repeat( ' ', strlen( $current_prompt ) ) . $key_token;
 					}
 
-					$key = $this->prompt( $key_prompt );
+					$key = $this->prompt( $key_prompt, $default );
 					if ( false === $key ) {
 						return [ $args, $assoc_args ];
 					}
@@ -265,7 +221,7 @@ class Subcommand extends CompositeCommand {
 						$key_prompt_count = strlen( $key_prompt ) - strlen( $value_token ) - 1;
 						$value_prompt     = str_repeat( ' ', $key_prompt_count ) . '=' . $value_token;
 
-						$value = $this->prompt( $value_prompt );
+						$value = $this->prompt( $value_prompt, $default );
 						if ( false === $value ) {
 							return [ $args, $assoc_args ];
 						}
@@ -279,41 +235,17 @@ class Subcommand extends CompositeCommand {
 				} while ( $repeat );
 
 			} else {
-				$prompt      = $current_prompt . $spec_arg['token'];
-				$default_val = null;
-
-				// Add description if available
-				$longdesc    = $this->get_longdesc();
-				$description = $this->get_arg_description( $spec_arg, $docparser, $longdesc );
-
-				if ( ! empty( $description ) ) {
-					$prompt .= ' (' . $description . ')';
-				}
-
-				// Get default value for the argument (not for flags)
+				$prompt = $current_prompt . $spec_arg['token'];
 				if ( 'flag' === $spec_arg['type'] ) {
 					$prompt .= ' (Y/n)';
-				} elseif ( 'positional' === $spec_arg['type'] || 'assoc' === $spec_arg['type'] ) {
-					$spec_args = ( 'positional' === $spec_arg['type'] )
-						? $docparser->get_arg_args( $spec_arg['name'] )
-						: $docparser->get_param_args( $spec_arg['name'] );
-					if ( null !== $spec_args && isset( $spec_args['default'] ) ) {
-						$default_val = $spec_args['default'];
-						$prompt     .= ' [' . $default_val . ']';
-					}
 				}
 
-				$response = $this->prompt( $prompt );
+				$response = $this->prompt( $prompt, $default );
 				if ( false === $response ) {
 					return [ $args, $assoc_args ];
 				}
 
-				// If response is empty and there's a default (not a flag), use the default
-				if ( '' === $response && null !== $default_val ) {
-					$response = $default_val;
-				}
-
-				if ( '' !== $response ) {
+				if ( $response ) {
 					switch ( $spec_arg['type'] ) {
 						case 'positional':
 							if ( $spec_arg['repeating'] ) {
@@ -339,85 +271,6 @@ class Subcommand extends CompositeCommand {
 		return [ $args, $assoc_args ];
 	}
 
-	/**
-	 * Create a DocParser instance from the command's description.
-	 *
-	 * This creates a mock DocParser from the command's short and long descriptions,
-	 * used internally for getting argument metadata.
-	 *
-	 * @return DocParser
-	 */
-	private function create_mock_docparser() {
-		$mock_doc = [ $this->get_shortdesc(), '' ];
-		$mock_doc = array_merge( $mock_doc, explode( "\n", $this->get_longdesc() ) );
-		$mock_doc = '/**' . PHP_EOL . '* ' . implode( PHP_EOL . '* ', $mock_doc ) . PHP_EOL . '*/';
-		return new DocParser( $mock_doc );
-	}
-
-	/**
-	 * Resolve argument aliases to their canonical names.
-	 *
-	 * Takes an associative array of arguments and replaces any aliases
-	 * with their canonical parameter names. This allows commands to define
-	 * shorter versions of arguments (e.g., -w for --with-dependencies).
-	 *
-	 * For repeating parameters, alias values are merged with any canonical
-	 * values already provided rather than being discarded.
-	 *
-	 * @param array $assoc_args      Arguments passed to command.
-	 * @param array $aliases         Map of alias => canonical_name.
-	 * @param array $repeating_params Map of canonical_name => true for repeating params.
-	 * @return array Arguments with aliases resolved to canonical names.
-	 */
-	private function resolve_arg_aliases( $assoc_args, $aliases, $repeating_params = [] ) {
-		if ( empty( $aliases ) ) {
-			return $assoc_args;
-		}
-
-		// First pass: copy all non-alias entries to $resolved_args.
-		$resolved_args = [];
-		foreach ( $assoc_args as $key => $value ) {
-			if ( ! isset( $aliases[ $key ] ) ) {
-				$resolved_args[ $key ] = $value;
-			}
-		}
-
-		// Second pass: resolve aliases.
-		foreach ( $assoc_args as $key => $value ) {
-			if ( ! isset( $aliases[ $key ] ) ) {
-				continue;
-			}
-
-			$canonical_key = $aliases[ $key ];
-			WP_CLI::debug( "Alias resolved: --{$key} => --{$canonical_key}", 'bootstrap' );
-
-			if ( ! array_key_exists( $canonical_key, $resolved_args ) ) {
-				// Canonical name not yet present; use alias value.
-				$resolved_args[ $canonical_key ] = $value;
-			} elseif ( ! empty( $repeating_params[ $canonical_key ] ) ) {
-				// Canonical name present and parameter is repeating; merge values.
-				$existing = $resolved_args[ $canonical_key ];
-				if ( ! is_array( $existing ) ) {
-					$existing = [ $existing ];
-				}
-				$alias_values                    = is_array( $value ) ? $value : [ $value ];
-				$resolved_args[ $canonical_key ] = array_merge( $existing, $alias_values );
-			} else {
-				// Canonical name present and not repeating; canonical wins.
-				WP_CLI::debug(
-					sprintf(
-						'Ignoring alias --%s because --%s was already provided.',
-						$key,
-						$canonical_key
-					),
-					'bootstrap'
-				);
-			}
-		}
-
-		return $resolved_args;
-	}
-
 	/**
 	 * Validate the supplied arguments to the command.
 	 * Throws warnings or errors if arguments are missing
@@ -466,7 +319,10 @@ class Subcommand extends CompositeCommand {
 			'fatal'   => [],
 			'warning' => [],
 		];
-		$docparser     = $this->create_mock_docparser();
+		$mock_doc      = [ $this->get_shortdesc(), '' ];
+		$mock_doc      = array_merge( $mock_doc, explode( "\n", $this->get_longdesc() ) );
+		$mock_doc      = '/**' . PHP_EOL . '* ' . implode( PHP_EOL . '* ', $mock_doc ) . PHP_EOL . '*/';
+		$docparser     = new DocParser( $mock_doc );
 		foreach ( $synopsis_spec as $spec ) {
 			if ( 'positional' === $spec['type'] ) {
 				$spec_args = $docparser->get_arg_args( $spec['name'] );
@@ -491,41 +347,16 @@ class Subcommand extends CompositeCommand {
 				++$i;
 			} elseif ( 'assoc' === $spec['type'] ) {
 				$spec_args = $docparser->get_param_args( $spec['name'] );
-
-				// Handle repeating parameter (e.g., [--status=<status>...])
-				if ( isset( $assoc_args[ $spec['name'] ] ) && is_array( $assoc_args[ $spec['name'] ] ) ) {
-					// If repeating is not set, use only the last value
-					if ( empty( $spec['repeating'] ) ) {
-						$values       = $assoc_args[ $spec['name'] ];
-						$values_count = count( $values );
-						if ( $values_count > 0 ) {
-							$assoc_args[ $spec['name'] ] = $values[ $values_count - 1 ];
-						}
-					}
-				}
-
 				if ( ! isset( $assoc_args[ $spec['name'] ] ) && ! isset( $extra_args[ $spec['name'] ] ) ) {
 					if ( isset( $spec_args['default'] ) ) {
 						$assoc_args[ $spec['name'] ] = $spec_args['default'];
 					}
 				}
 				if ( isset( $assoc_args[ $spec['name'] ] ) && isset( $spec_args['options'] ) ) {
-					/**
-					 * @var string|string[] $value
-					 */
 					$value   = $assoc_args[ $spec['name'] ];
 					$options = $spec_args['options'];
-
-					// Handle validation for multiple values
-					if ( is_array( $value ) ) {
-						foreach ( $value as $single_value ) {
-							// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- This is a loose comparison by design.
-							if ( ! in_array( $single_value, $options ) ) {
-								$errors['fatal'][ $spec['name'] ] = "Invalid value '{$single_value}' specified for '{$spec['name']}'";
-								break;
-							}
-						}
-					} elseif ( ! in_array( $value, $options ) ) { // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- This is a loose comparison by design.
+					// phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict -- This is a loose comparison by design.
+					if ( ! in_array( $value, $options ) ) {
 						// Try whether it might be a comma-separated list of multiple values.
 						$values = array_map( 'trim', explode( ',', $value ) );
 						$count  = count( $values );
@@ -549,9 +380,8 @@ class Subcommand extends CompositeCommand {
 			}
 		}
 
-		$config                             = \WP_CLI::get_config();
 		list( $returned_errors, $to_unset ) = $validator->validate_assoc(
-			array_merge( $config, $extra_args, $assoc_args )
+			array_merge( \WP_CLI::get_config(), $extra_args, $assoc_args )
 		);
 		foreach ( [ 'fatal', 'warning' ] as $error_type ) {
 			$errors[ $error_type ] = array_merge( $errors[ $error_type ], $returned_errors[ $error_type ] );
@@ -591,34 +421,6 @@ class Subcommand extends CompositeCommand {
 		return [ $to_unset, $args, $assoc_args, $extra_args ];
 	}
 
-	/**
-	 * Get the list of sensitive argument names from the synopsis.
-	 * These arguments will have their values masked in log output.
-	 *
-	 * @return array<string> Array of argument names that are marked as sensitive
-	 */
-	private function get_sensitive_args() {
-		$synopsis = $this->get_synopsis();
-		if ( ! $synopsis ) {
-			return [];
-		}
-
-		$synopsis_spec  = SynopsisParser::parse( $synopsis );
-		$docparser      = $this->create_mock_docparser();
-		$sensitive_args = [];
-
-		foreach ( $synopsis_spec as $spec ) {
-			if ( 'assoc' === $spec['type'] ) {
-				$spec_args = $docparser->get_param_args( $spec['name'] );
-				if ( isset( $spec_args['sensitive'] ) && $spec_args['sensitive'] ) {
-					$sensitive_args[] = $spec['name'];
-				}
-			}
-		}
-
-		return $sensitive_args;
-	}
-
 	/**
 	 * Invoke the subcommand with the supplied arguments.
 	 * Given a --prompt argument, interactively request input
@@ -630,70 +432,6 @@ class Subcommand extends CompositeCommand {
 	public function invoke( $args, $assoc_args, $extra_args ) {
 		static $prompted_once = false;
 
-		// Build alias map from the parsed synopsis and resolve to canonical names.
-		$aliases          = [];
-		$repeating_params = [];
-		$synopsis_spec    = SynopsisParser::parse( $this->get_synopsis() );
-
-		// Build a set of assoc/flag canonical names (local + global) for conflict detection.
-		// Positional parameter names are excluded because an alias matching a positional
-		// name would not cause any real ambiguity (--alias vs bare positional).
-		$assoc_flag_names = [];
-		foreach ( $synopsis_spec as $param ) {
-			if ( in_array( $param['type'], [ 'assoc', 'flag' ], true ) ) {
-				$assoc_flag_names[] = $param['name'];
-			}
-			if ( 'assoc' === $param['type'] && ! empty( $param['repeating'] ) ) {
-				$repeating_params[ $param['name'] ] = true;
-			}
-		}
-		foreach ( SynopsisParser::parse( $this->get_global_params() ) as $param ) {
-			if ( in_array( $param['type'], [ 'assoc', 'flag' ], true ) ) {
-				$assoc_flag_names[] = $param['name'];
-			}
-		}
-		$assoc_flag_names = array_unique( $assoc_flag_names );
-
-		foreach ( $synopsis_spec as $param ) {
-			if ( empty( $param['aliases'] ) ) {
-				continue;
-			}
-
-			foreach ( $param['aliases'] as $alias ) {
-				// Detect duplicate aliases (same alias used for different params).
-				if ( isset( $aliases[ $alias ] ) && $aliases[ $alias ] !== $param['name'] ) {
-					WP_CLI::warning(
-						sprintf(
-							"Alias '%s' for parameter '%s' conflicts with existing alias for parameter '%s'. Skipping.",
-							$alias,
-							$param['name'],
-							$aliases[ $alias ]
-						)
-					);
-					continue;
-				}
-
-				// Detect aliases that conflict with an assoc/flag canonical parameter name.
-				if ( in_array( $alias, $assoc_flag_names, true ) && $alias !== $param['name'] ) {
-					WP_CLI::warning(
-						sprintf(
-							"Alias '%s' for parameter '%s' conflicts with an existing parameter name. Skipping.",
-							$alias,
-							$param['name']
-						)
-					);
-					continue;
-				}
-
-				$aliases[ $alias ] = $param['name'];
-			}
-		}
-		if ( ! empty( $aliases ) ) {
-			WP_CLI::debug( 'Resolving argument aliases: ' . implode( ', ', array_keys( $aliases ) ), 'bootstrap' );
-		}
-		$assoc_args = $this->resolve_arg_aliases( $assoc_args, $aliases, $repeating_params );
-		$extra_args = $this->resolve_arg_aliases( $extra_args, $aliases, $repeating_params );
-
 		if ( 'help' !== $this->name ) {
 			if ( \WP_CLI::get_config( 'prompt' ) && ! $prompted_once ) {
 				list( $_args, $assoc_args ) = $this->prompt_args( $args, $assoc_args );
@@ -732,15 +470,12 @@ class Subcommand extends CompositeCommand {
 		if ( $prompted_once ) {
 			// Unset empty args.
 			$actual_args = $assoc_args;
-			foreach ( $actual_args as $key => $value ) {
-				if ( empty( $value ) ) {
+			foreach ( $actual_args as $key ) {
+				if ( empty( $actual_args[ $key ] ) ) {
 					unset( $actual_args[ $key ] );
 				}
 			}
 
-			// Get list of sensitive arguments to mask in output
-			$sensitive_args = $this->get_sensitive_args();
-
 			WP_CLI::log(
 				sprintf(
 					'wp %s %s',
@@ -750,7 +485,7 @@ class Subcommand extends CompositeCommand {
 							' ',
 							[
 								ltrim( Utils\args_to_str( $args ), ' ' ),
-								ltrim( Utils\assoc_args_to_str( $actual_args, $sensitive_args ), ' ' ),
+								ltrim( Utils\assoc_args_to_str( $actual_args ), ' ' ),
 							]
 						),
 						' '

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/DocParser.php

@@ -33,9 +33,9 @@ class DocParser {
 	 * @return string
 	 */
 	private static function remove_decorations( $comment ) {
-		$comment = (string) preg_replace( '|^/\*\*[\r\n]+|', '', $comment );
-		$comment = (string) preg_replace( '|\n[\t ]*\*/$|', '', $comment );
-		$comment = (string) preg_replace( '|^[\t ]*\* ?|m', '', $comment );
+		$comment = preg_replace( '|^/\*\*[\r\n]+|', '', $comment );
+		$comment = preg_replace( '|\n[\t ]*\*/$|', '', $comment );
+		$comment = preg_replace( '|^[\t ]*\* ?|m', '', $comment );
 
 		return $comment;
 	}
@@ -92,18 +92,6 @@ class DocParser {
 		return '';
 	}
 
-	/**
-	 * Check if a given tag exists (e.g. "@skipglobalargcheck")
-	 *
-	 * Useful for checking the presence of valueless tags in PHPdoc.
-	 *
-	 * @param string $name Name for the tag, without '@'
-	 * @return bool True if the tag exists, false otherwise.
-	 */
-	public function has_tag( $name ) {
-		return (bool) preg_match( '/^\s*\*?\s*@' . preg_quote( $name, '/' ) . '\b/m', $this->doc_comment );
-	}
-
 	/**
 	 * Get the command's synopsis.
 	 *
@@ -136,7 +124,7 @@ class DocParser {
 	 * Get the arguments for a given argument.
 	 *
 	 * @param string $name Argument's doc name.
-	 * @return array|null
+	 * @return mixed|null
 	 */
 	public function get_arg_args( $name ) {
 		return $this->get_arg_or_param_args( "/^\[?<{$name}>.*/" );
@@ -161,7 +149,7 @@ class DocParser {
 	 * Get the arguments for a given parameter.
 	 *
 	 * @param string $key Parameter's key.
-	 * @return array|null
+	 * @return mixed|null
 	 */
 	public function get_param_args( $key ) {
 		return $this->get_arg_or_param_args( "/^\[?--{$key}=.*/" );

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Exception/NonExistentKeyException.php

@@ -5,22 +5,19 @@ namespace WP_CLI\Exception;
 use OutOfBoundsException;
 use WP_CLI\Traverser\RecursiveDataStructureTraverser;
 
-/**
- * @template T
- */
 class NonExistentKeyException extends OutOfBoundsException {
-	/** @var RecursiveDataStructureTraverser<T> */
+	/** @var RecursiveDataStructureTraverser */
 	protected $traverser;
 
 	/**
-	 * @param RecursiveDataStructureTraverser<T> $traverser
+	 * @param RecursiveDataStructureTraverser $traverser
 	 */
 	public function set_traverser( $traverser ) {
 		$this->traverser = $traverser;
 	}
 
 	/**
-	 * @return RecursiveDataStructureTraverser<T>
+	 * @return RecursiveDataStructureTraverser
 	 */
 	public function get_traverser() {
 		return $this->traverser;

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Extractor.php

@@ -58,7 +58,7 @@ class Extractor {
 		$res = $zip->open( $zipfile );
 
 		if ( true === $res ) {
-			$name    = Path::basename( $zipfile );
+			$name    = Utils\basename( $zipfile );
 			$tempdir = Utils\get_temp_dir()
 						. uniqid( 'wp-cli-extract-zipfile-', true )
 						. "-{$name}";
@@ -98,7 +98,7 @@ class Extractor {
 		if ( class_exists( 'PharData' ) ) {
 			try {
 				$phar    = new PharData( $tarball );
-				$name    = Path::basename( $tarball );
+				$name    = Utils\basename( $tarball );
 				$tempdir = Utils\get_temp_dir()
 							. uniqid( 'wp-cli-extract-tarball-', true )
 							. "-{$name}";
@@ -121,15 +121,16 @@ class Extractor {
 			}
 		}
 
-		$tarball_absolute = realpath( $tarball );
-		if ( ! $tarball_absolute ) {
-			throw new Exception( "Invalid tarball '{$tarball}'." );
+		// Ensure relative paths cannot be misinterpreted as hostnames.
+		// Prepending `./` will force tar to interpret it as a filesystem path.
+		if ( self::path_is_relative( $tarball ) ) {
+			$tarball = "./{$tarball}";
 		}
-		$tarball = $tarball_absolute;
 
-		if ( ! is_readable( $tarball )
+		if ( ! file_exists( $tarball )
+			|| ! is_readable( $tarball )
 			|| filesize( $tarball ) <= 0 ) {
-			throw new Exception( "Invalid tarball '{$tarball}'." );
+			throw new Exception( "Invalid zip file '{$tarball}'." );
 		}
 
 		// Note: directory must exist for tar --directory to work.
@@ -178,12 +179,9 @@ class Extractor {
 			mkdir( $dest, 0777, true );
 		}
 
-		/**
-		 * @var \SplFileInfo $item
-		 */
 		foreach ( $iterator as $item ) {
 
-			$dest_path = $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathname();
+			$dest_path = $dest . DIRECTORY_SEPARATOR . $iterator->getSubPathName();
 
 			if ( $item->isDir() ) {
 				if ( ! is_dir( $dest_path ) ) {
@@ -195,7 +193,7 @@ class Extractor {
 				copy( $item, $dest_path );
 			} else {
 				$error = 1;
-				WP_CLI::warning( "Unable to copy '" . $iterator->getSubPathname() . "' to current directory." );
+				WP_CLI::warning( "Unable to copy '" . $iterator->getSubPathName() . "' to current directory." );
 			}
 		}
 
@@ -219,27 +217,14 @@ class Extractor {
 			RecursiveIteratorIterator::CHILD_FIRST
 		);
 
-		$base_dir = realpath( $dir );
-		if ( false === $base_dir ) {
-			return;
-		}
-		$base_dir = rtrim( $base_dir, DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR;
-
-		/**
-		 * @var \SplFileInfo $fileinfo
-		 */
 		foreach ( $files as $fileinfo ) {
-			$todo      = $fileinfo->isDir() ? 'rmdir' : 'unlink';
-			$path      = $fileinfo->getPathname();
-			$real_path = $fileinfo->getRealPath();
-
-			if ( ! $real_path || 0 !== strpos( $real_path, $base_dir ) ) {
+			$todo = $fileinfo->isDir() ? 'rmdir' : 'unlink';
+			$path = $fileinfo->getRealPath();
+			if ( 0 !== strpos( $path, $fileinfo->getRealPath() ) ) {
 				WP_CLI::warning(
 					"Temporary file or folder to be removed was found outside of temporary folder, aborting removal: '{$path}'"
 				);
-				continue;
 			}
-
 			$todo( $path );
 		}
 		rmdir( $dir );
@@ -345,7 +330,7 @@ class Extractor {
 					sprintf(
 						"Failed to create directory '%s': %s.",
 						$dir,
-						$error ? $error['message'] : 'Unknown error'
+						$error['message']
 					)
 				);
 				return false;
@@ -354,4 +339,43 @@ class Extractor {
 
 		return true;
 	}
+
+	/**
+	 * Check whether a path is relative-
+	 *
+	 * @param string $path Path to check.
+	 * @return bool Whether the path is relative.
+	 */
+	private static function path_is_relative( $path ) {
+		if ( '' === $path ) {
+			return true;
+		}
+
+		// Strip scheme.
+		$scheme_position = strpos( $path, '://' );
+		if ( false !== $scheme_position ) {
+			$path = substr( $path, $scheme_position + 3 );
+		}
+
+		// UNIX root "/" or "\" (Windows style).
+		if ( '/' === $path[0] || '\\' === $path[0] ) {
+			return false;
+		}
+
+		// Windows root.
+		if ( strlen( $path ) > 1 && ctype_alpha( $path[0] ) && ':' === $path[1] ) {
+
+			// Special case: only drive letter, like "C:".
+			if ( 2 === strlen( $path ) ) {
+				return false;
+			}
+
+			// Regular Windows path starting with drive letter, like "C:/ or "C:\".
+			if ( '/' === $path[2] || '\\' === $path[2] ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
 }