Lint fix

Author: swissspidy

src/Plugin_Command.php

@@ -3,10 +3,9 @@
 use WP_CLI\CommandWithUpgrade;
 use WP_CLI\ParsePluginNameInput;
 use WP_CLI\Utils;
+use WP_CLI\Path;
 use WP_CLI\WpOrgApi;
 
-use function WP_CLI\Utils\normalize_path;
-
 /**
  * Manages plugins, including installs, activations, and updates.
  *
@@ -1003,7 +1002,7 @@ protected function get_item_list() {
 			];
 
 			if ( $this->check_headers['tested_up_to'] ) {
-				$plugin_readme = normalize_path( dirname( WP_PLUGIN_DIR . '/' . $file ) . '/readme.txt' );
+				$plugin_readme = Path::normalize( dirname( WP_PLUGIN_DIR . '/' . $file ) . '/readme.txt' );
 
 				if ( file_exists( $plugin_readme ) && is_readable( $plugin_readme ) ) {
 					$readme_obj = new SplFileObject( $plugin_readme );
@@ -2026,7 +2025,7 @@ protected function get_status( $file ) {
 	 * Gets the template path based on installation type.
 	 */
 	private static function get_template_path( $template ) {
-		$command_root  = Utils\phar_safe_path( dirname( __DIR__ ) );
+		$command_root  = Path::phar_safe( dirname( __DIR__ ) );
 		$template_path = "{$command_root}/templates/{$template}";
 
 		if ( ! file_exists( $template_path ) ) {
@@ -2044,7 +2043,7 @@ private static function get_template_path( $template ) {
 	 */
 	private function get_details( $file ) {
 		$plugin_folder = get_plugins( '/' . plugin_basename( dirname( $file ) ) );
-		$plugin_file   = Utils\basename( $file );
+		$plugin_file   = Path::basename( $file );
 
 		return $plugin_folder[ $plugin_file ];
 	}

src/Theme_Command.php

@@ -3,6 +3,7 @@
 use WP_CLI\CommandWithUpgrade;
 use WP_CLI\ParseThemeNameInput;
 use WP_CLI\Utils;
+use WP_CLI\Path;
 
 /**
  * Manages themes, including installs, activations, and updates.
@@ -1074,7 +1075,7 @@ public function list_( $_, $assoc_args ) {
 	 * Gets the template path based on installation type.
 	 */
 	private static function get_template_path( $template ) {
-		$command_root  = Utils\phar_safe_path( dirname( __DIR__ ) );
+		$command_root  = Path::phar_safe( dirname( __DIR__ ) );
 		$template_path = "{$command_root}/templates/{$template}";
 
 		if ( ! file_exists( $template_path ) ) {

src/WP_CLI/CommandWithUpgrade.php

@@ -9,6 +9,7 @@
 use WP_CLI\Fetchers;
 use WP_CLI\Loggers;
 use WP_CLI\Utils;
+use WP_CLI\Path;
 use WP_Error;
 
 /**
@@ -284,7 +285,7 @@ public function install( $args, $assoc_args ) {
 						 */
 						global $wp_filesystem;
 
-						$source_dir = Utils\basename( $source ); // `$source` is trailing-slashed path to the unzipped archive directory.
+						$source_dir = Path::basename( $source ); // `$source` is trailing-slashed path to the unzipped archive directory.
 						if ( $source_dir === $custom_slug ) {
 							return $source;
 						}
@@ -314,15 +315,15 @@ public function install( $args, $assoc_args ) {
 						 * @var string $path
 						 */
 						$path     = Utils\parse_url( $slug, PHP_URL_PATH );
-						$slug_dir = Utils\basename( $path, '.zip' );
+						$slug_dir = Path::basename( $path, '.zip' );
 
 						// Don't use the zip name if archive attached to release, as name likely to contain version tag/branch.
 						if ( preg_match( '#github\.com/[^/]+/([^/]+)/archive/#', $slug, $matches ) ) {
 							// Note this will be wrong if the project name isn't the same as the plugin/theme slug name.
 							$slug_dir = $matches[1];
 						}
 
-						$source_dir = Utils\basename( $source ); // `$source` is trailing-slashed path to the unzipped archive directory, so basename returns the unslashed directory.
+						$source_dir = Path::basename( $source ); // `$source` is trailing-slashed path to the unzipped archive directory, so basename returns the unslashed directory.
 						if ( $source_dir === $slug_dir ) {
 							return $source;
 						}
@@ -430,10 +431,10 @@ protected function install_from_php_file( $url, $assoc_args ) {
 
 		// Extract and validate filename before downloading.
 		$url_path = (string) Utils\parse_url( $url, PHP_URL_PATH );
-		$filename = Utils\basename( $url_path );
+		$filename = Path::basename( $url_path );
 
 		// Validate the filename doesn't contain directory separators or relative path components.
-		// Note: Utils\basename() already strips directory components (including ".."), so this check
+		// Note: Path::basename() already strips directory components (including ".."), so this check
 		// is primarily a defense-in-depth safeguard in case its behavior changes or is bypassed.
 		if ( strpos( $filename, '/' ) !== false || strpos( $filename, '\\' ) !== false || strpos( $filename, '..' ) !== false ) {
 			return new WP_Error( 'invalid_filename', 'The filename contains invalid path components.' );