From 3d9272f353fa66e1d119062f3bedef9100daafa7 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Sat, 25 Nov 2023 14:38:05 +0100 Subject: [PATCH] Remove redundant expections --- src/Drivers/AbstractDriver.php | 4 ++-- src/Drivers/Gd/Modifiers/RotateModifier.php | 6 ------ src/Exceptions/ConfigurationException.php | 8 -------- src/Exceptions/EncoderException.php | 8 -------- src/Exceptions/MissingDriverComponentException.php | 8 -------- tests/Drivers/Gd/ImageTest.php | 4 ++-- tests/Drivers/Imagick/ImageTest.php | 2 -- 7 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 src/Exceptions/ConfigurationException.php delete mode 100644 src/Exceptions/EncoderException.php delete mode 100644 src/Exceptions/MissingDriverComponentException.php diff --git a/src/Drivers/AbstractDriver.php b/src/Drivers/AbstractDriver.php index ddfddb3a..5d7bee26 100644 --- a/src/Drivers/AbstractDriver.php +++ b/src/Drivers/AbstractDriver.php @@ -2,7 +2,7 @@ namespace Intervention\Image\Drivers; -use Intervention\Image\Exceptions\MissingDriverComponentException; +use Intervention\Image\Exceptions\NotSupportedException; use Intervention\Image\Interfaces\DriverInterface; use ReflectionClass; @@ -15,7 +15,7 @@ abstract class AbstractDriver implements DriverInterface $specialized = $driver_namespace . "\\" . $class_path; if (! class_exists($specialized)) { - throw new MissingDriverComponentException( + throw new NotSupportedException( "Class '" . $class_path . "' is not supported by " . $this->id() . " driver." ); } diff --git a/src/Drivers/Gd/Modifiers/RotateModifier.php b/src/Drivers/Gd/Modifiers/RotateModifier.php index 585fcb98..c822913c 100644 --- a/src/Drivers/Gd/Modifiers/RotateModifier.php +++ b/src/Drivers/Gd/Modifiers/RotateModifier.php @@ -6,14 +6,11 @@ use Intervention\Image\Colors\Rgb\Channels\Blue; use Intervention\Image\Colors\Rgb\Channels\Green; use Intervention\Image\Colors\Rgb\Channels\Red; use Intervention\Image\Drivers\DriverModifier; -use Intervention\Image\Exceptions\RuntimeException; -use Intervention\Image\Exceptions\MissingDriverComponentException; use Intervention\Image\Geometry\Rectangle; use Intervention\Image\Interfaces\ColorInterface; use Intervention\Image\Interfaces\FrameInterface; use Intervention\Image\Interfaces\ImageInterface; use Intervention\Image\Modifiers\FillModifier; -use ReflectionException; class RotateModifier extends DriverModifier { @@ -35,9 +32,6 @@ class RotateModifier extends DriverModifier * @param FrameInterface $frame * @param ColorInterface $background * @return void - * @throws RuntimeException - * @throws MissingDriverComponentException - * @throws ReflectionException */ protected function modifyFrame(FrameInterface $frame, ColorInterface $background): void { diff --git a/src/Exceptions/ConfigurationException.php b/src/Exceptions/ConfigurationException.php deleted file mode 100644 index df77d83a..00000000 --- a/src/Exceptions/ConfigurationException.php +++ /dev/null @@ -1,8 +0,0 @@ -expectException(MissingDriverComponentException::class); + $this->expectException(NotSupportedException::class); $this->image->profile(); } diff --git a/tests/Drivers/Imagick/ImageTest.php b/tests/Drivers/Imagick/ImageTest.php index ebf4b696..57f55bf1 100644 --- a/tests/Drivers/Imagick/ImageTest.php +++ b/tests/Drivers/Imagick/ImageTest.php @@ -11,7 +11,6 @@ use Intervention\Image\Drivers\Imagick\Frame; use Intervention\Image\EncodedImage; use Intervention\Image\Encoders\PngEncoder; use Intervention\Image\Exceptions\ColorException; -use Intervention\Image\Exceptions\MissingDriverComponentException; use Intervention\Image\Image; use Intervention\Image\Interfaces\ColorInterface; use Intervention\Image\Interfaces\ColorspaceInterface; @@ -19,7 +18,6 @@ use Intervention\Image\Interfaces\ResolutionInterface; use Intervention\Image\Interfaces\SizeInterface; use Intervention\Image\Modifiers\GreyscaleModifier; use Intervention\Image\Tests\TestCase; -use Intervention\Image\Typography\Font; class ImageTest extends TestCase {