Merge pull request #5969 from kenjis/fix-images-convert

fix: GDHandler::convert() does not work

Author: kenjis

system/Images/Handlers/BaseHandler.php

@@ -296,6 +296,8 @@ public function crop(?int $width = null, ?int $height = null, ?int $x = null, ?i
      */
     public function convert(int $imageType)
     {
+        $this->ensureResource();
+
         $this->image()->imageType = $imageType;
 
         return $this;

tests/system/Images/GDHandlerTest.php

@@ -394,7 +394,6 @@ public function testImageCompressionWithResource()
     public function testImageConvert()
     {
         $this->handler->withFile($this->origin . 'ci-logo.jpeg');
-        $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->start . 'work/ci-logo.png');
         $this->assertSame(exif_imagetype($this->start . 'work/ci-logo.png'), IMAGETYPE_PNG);

tests/system/Images/ImageMagickHandlerTest.php

@@ -392,7 +392,6 @@ public function testImageCompressionWithResource()
     public function testImageConvert()
     {
         $this->handler->withFile($this->origin . 'ci-logo.jpeg');
-        $this->handler->getResource(); // make sure resource is loaded
         $this->handler->convert(IMAGETYPE_PNG);
         $this->handler->save($this->root . 'ci-logo.png');
         $this->assertSame(exif_imagetype($this->root . 'ci-logo.png'), IMAGETYPE_PNG);