[5.x] Throw UnableToReadFile for invalid images in ImageGenerator (#14043)

Author: mmodler

src/Imaging/ImageGenerator.php

@@ -306,7 +306,7 @@ private function validateImage()
         }
 
         if (! ImageValidator::isValidImage($extension, $mime)) {
-            throw new \Exception("Image [{$path}] does not actually appear to be a valid image.");
+            throw UnableToReadFile::fromLocation($path, "Image [{$path}] does not actually appear to be a valid image.");
         }
     }
 

tests/Imaging/ImageGeneratorTest.php

@@ -10,6 +10,7 @@
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Storage;
 use League\Flysystem\Local\LocalFilesystemAdapter;
+use League\Flysystem\UnableToReadFile;
 use League\Glide\Manipulators\Watermark;
 use League\Glide\Server;
 use PHPUnit\Framework\Attributes\DataProvider;
@@ -85,6 +86,22 @@ public function it_generates_an_image_by_asset()
         Event::assertDispatchedTimes(GlideImageGenerated::class, 1);
     }
 
+    #[Test]
+    public function it_throws_unable_to_read_file_when_asset_is_not_a_valid_image()
+    {
+        Storage::fake('test');
+        $file = UploadedFile::fake()->create('foo/hoff.jpg', 100);
+        Storage::disk('test')->putFileAs('foo', $file, 'hoff.jpg');
+        $container = tap(AssetContainer::make('test_container')->disk('test'))->save();
+        $asset = tap($container->makeAsset('foo/hoff.jpg'))->save();
+
+        ImageValidator::shouldReceive('isValidImage')->andReturnFalse();
+
+        $this->expectException(UnableToReadFile::class);
+
+        $this->makeGenerator()->generateByAsset($asset, ['w' => 100]);
+    }
+
     #[Test]
     public function it_generates_cache_manifest_for_multiple_asset_manipulations()
     {