Address PR review feedback: fix noun, temp file cleanup, error handling, skip-delete test

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>

Author: Copilot

features/media-replace.feature

@@ -20,7 +20,7 @@ Feature: Replace WordPress attachment files
       """
     And STDOUT should contain:
       """
-      Success: Replaced 1 of 1 images.
+      Success: Replaced 1 of 1 attachments.
       """
 
   Scenario: Replace an attachment file from a URL
@@ -39,7 +39,7 @@ Feature: Replace WordPress attachment files
       """
     And STDOUT should contain:
       """
-      Success: Replaced 1 of 1 images.
+      Success: Replaced 1 of 1 attachments.
       """
 
   Scenario: Replace an attachment file and output only the attachment ID in porcelain mode
@@ -71,7 +71,7 @@ Feature: Replace WordPress attachment files
     When I run `wp media replace {ATTACHMENT_ID} {CACHE_DIR}/canola.jpg`
     Then STDOUT should contain:
       """
-      Success: Replaced 1 of 1 images.
+      Success: Replaced 1 of 1 attachments.
       """
 
     When I run `wp post get {ATTACHMENT_ID} --field=post_title`
@@ -106,3 +106,24 @@ Feature: Replace WordPress attachment files
       Error: Invalid attachment ID 999999.
       """
     And the return code should be 1
+
+  Scenario: Skip deletion of old thumbnails when --skip-delete flag is used
+    Given download:
+      | path                        | url                                          |
+      | {CACHE_DIR}/large-image.jpg | http://wp-cli.org/behat-data/large-image.jpg |
+      | {CACHE_DIR}/canola.jpg      | http://wp-cli.org/behat-data/canola.jpg      |
+    And I run `wp option update uploads_use_yearmonth_folders 0`
+
+    When I run `wp media import {CACHE_DIR}/large-image.jpg --porcelain`
+    Then save STDOUT as {ATTACHMENT_ID}
+
+    When I run `wp post meta get {ATTACHMENT_ID} _wp_attached_file`
+    Then save STDOUT as {OLD_FILE}
+
+    When I run `wp media replace {ATTACHMENT_ID} {CACHE_DIR}/canola.jpg --skip-delete`
+    Then STDOUT should contain:
+      """
+      Success: Replaced 1 of 1 attachments.
+      """
+
+    Then the wp-content/uploads/{OLD_FILE} file should exist

src/Media_Command.php

@@ -656,11 +656,12 @@ public function replace( $args, $assoc_args = array() ) {
 			}
 
 			// For big-image scaling (WP 5.3+), delete the original image if present in metadata.
-			if ( ! empty( $old_metadata['original_image'] ) && ! empty( $old_metadata['file'] ) ) {
+			$original_image = isset( $old_metadata['original_image'] ) ? (string) $old_metadata['original_image'] : '';
+			if ( '' !== $original_image && ! empty( $old_metadata['file'] ) ) {
 				$uploads = wp_get_upload_dir();
 				if ( ! empty( $uploads['basedir'] ) ) {
-					$dirname              = dirname( $old_metadata['file'] );
-					$original_image_rel   = ( '.' === $dirname || '/' === $dirname ) ? $old_metadata['original_image'] : $dirname . '/' . $old_metadata['original_image'];
+					$dirname                = dirname( $old_metadata['file'] );
+					$original_image_rel     = ( '.' === $dirname || '/' === $dirname ) ? $original_image : $dirname . '/' . $original_image;
 					$original_image_abspath = $uploads['basedir'] . '/' . $original_image_rel;
 					if ( $original_image_abspath !== $new_file_path && file_exists( $original_image_abspath ) ) {
 						@unlink( $original_image_abspath );
@@ -677,10 +678,9 @@ public function replace( $args, $assoc_args = array() ) {
 			),
 			true
 		);
-		if ( false === $updated || is_wp_error( $updated ) ) {
-			$message = is_wp_error( $updated ) ? $updated->get_error_message() : 'Unknown error.';
+		if ( is_wp_error( $updated ) ) {
 			WP_CLI::warning(
-				sprintf( 'Failed to update MIME type for attachment %d: %s', $attachment_id, $message )
+				sprintf( 'Failed to update MIME type for attachment %d: %s', $attachment_id, $updated->get_error_message() )
 			);
 		}
 
@@ -694,7 +694,7 @@ public function replace( $args, $assoc_args = array() ) {
 		} else {
 			WP_CLI::warning(
 				sprintf(
-					"Failed to generate new attachment metadata for attachment ID %d. Existing metadata has been preserved.",
+					'Failed to generate new attachment metadata for attachment ID %d. Existing metadata has been preserved.',
 					$attachment_id
 				)
 			);