FIX Return null early if there is no file to convert (#669)

silverstripe · Jan 6, 2025 · 627d272 · 627d272
1 parent 6b6fcbc
commit 627d272
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/ImageManipulation.php b/src/ImageManipulation.php
@@ -720,6 +720,10 @@ public function ThumbnailURL($width, $height)
      */
     public function Convert(string $toExtension): ?AssetContainer
     {
+        // Verify this manipulation is applicable to this instance
+        if (!$this->exists()) {
+            return null;
+        }
         $converter = Injector::inst()->get(FileConverterManager::class);
         try {
             return $converter->convert($this, $toExtension);

diff --git a/tests/php/ImageManipulationTest.php b/tests/php/ImageManipulationTest.php
@@ -606,6 +606,12 @@ public function testConvert(string $originalFileFixtureClass, string $originalFi
         }
     }
 
+    public function testConvertEmpty(): void
+    {
+        $file = new Image();
+        $this->assertNull($file->Convert('webp'));
+    }
+
     public function provideConvertChainWithLazyLoad(): array
     {
         return [