Move changeExtension logic into manipulate method #6715

src/Cms/FileActions.php

@@ -139,10 +139,9 @@ public function changeTemplate(string|null $template): static
 
 			$file = $file->update(['template' => $template]);
 
-			// rename and/or resize the file if configured by new blueprint
+			// resize the file if configured by new blueprint
 			$create = $file->blueprint()->create();
-			$file = $file->manipulate($create);
-			$file = $file->changeExtension($file, $create['format'] ?? null);
+			$file   = $file->manipulate($create);
 
 			return $file;
 		});
@@ -286,7 +285,6 @@ public static function create(array $props, bool $move = false): File
 
 			// resize the file on upload if configured
 			$file = $file->manipulate($create);
-			$file = $file->changeExtension($file, $create['format'] ?? null);
 
 			// store the content if necessary
 			// (always create files in the default language)
@@ -339,7 +337,14 @@ public function manipulate(array|null $options = []): static
 		// generate image file and overwrite it in place
 		$this->kirby()->thumb($this->root(), $this->root(), $options);
 
-		return $this->clone([]);
+		$file = $this->clone();
+
+		// change the file extension if format option configured
+		if ($format = $options['format'] ?? null) {
+			$file = $file->changeExtension($file, $format);
+		}
+
+		return $file;
 	}
 
 	/**
@@ -388,7 +393,6 @@ public function replace(string $source, bool $move = false): static
 			// apply the resizing/crop options from the blueprint
 			$create = $file->blueprint()->create();
 			$file   = $file->manipulate($create);
-			$file   = $file->changeExtension($file, $create['format'] ?? null);
 
 			// return a fresh clone
 			return $file->clone();

tests/Cms/Files/FileActionsTest.php

@@ -936,6 +936,57 @@ public function testManipulate($parent)
 		$this->assertSame(100, $replacedFile->height());
 	}
 
+	/**
+	 * @dataProvider parentProvider
+	 */
+	public function testManipulateValidFormat($parent)
+	{
+		$original = static::FIXTURES . '/test.jpg';
+
+		$originalFile = File::create([
+			'filename' => 'test.jpg',
+			'source'   => $original,
+			'parent'   => $parent
+		]);
+
+		$this->assertSame(128, $originalFile->width());
+		$this->assertSame(128, $originalFile->height());
+
+		$replacedFile = $originalFile->manipulate([
+			'width'  => 100,
+			'height' => 100,
+			'format' => 'webp'
+		]);
+
+		$this->assertSame('webp', $replacedFile->extension());
+		$this->assertSame(100, $replacedFile->width());
+		$this->assertSame(100, $replacedFile->height());
+	}
+
+	/**
+	 * @dataProvider parentProvider
+	 */
+	public function testManipulateInvalidValidFormat($parent)
+	{
+		$original = static::FIXTURES . '/test.mp4';
+
+		$originalFile = File::create([
+			'filename' => 'test.mp4',
+			'source'   => $original,
+			'parent'   => $parent
+		]);
+
+		$replacedFile = $originalFile->manipulate([
+			'width'  => 100,
+			'height' => 100,
+			'format' => 'webp'
+		]);
+
+		// proves strictly that both are the same object
+		$this->assertSame($originalFile, $replacedFile);
+		$this->assertSame('mp4', $replacedFile->extension());
+	}
+
 	public function testChangeNameHooks()
 	{
 		$calls = 0;