Merge pull request #18080 from kamil-tekiela/ImageWrapper-property-promotion

MauricioFauth · web-flow · commit f19d22c671a4 · 2023-02-12T17:39:05.000-03:00
Use property promotion in ImageWrapper
diff --git a/libraries/classes/Image/ImageWrapper.php b/libraries/classes/Image/ImageWrapper.php
@@ -4,6 +4,8 @@
 
 namespace PhpMyAdmin\Image;
 
+use GdImage;
+
 use function extension_loaded;
 use function function_exists;
 use function imagearc;
@@ -23,21 +25,11 @@
 
 final class ImageWrapper
 {
-    /** @var resource */
-    private $image;
-
-    /**
-     * @param resource $image
-     */
-    private function __construct($image)
+    private function __construct(private GdImage $image)
     {
-        $this->image = $image;
     }
 
-    /**
-     * @return resource
-     */
-    public function getImage()
+    public function getImage(): GdImage
     {
         return $this->image;
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace PhpMyAdmin\Image;`
`6`	`6`
	`7`	`+use GdImage;`
	`8`	`+`
`7`	`9`	`use function extension_loaded;`
`8`	`10`	`use function function_exists;`
`9`	`11`	`use function imagearc;`
`@@ -23,21 +25,11 @@`
`23`	`25`
`24`	`26`	`final class ImageWrapper`
`25`	`27`	`{`
`26`		`- /** @var resource */`
`27`		`- private $image;`
`28`		`-`
`29`		`- /**`
`30`		`- * @param resource $image`
`31`		`- */`
`32`		`- private function __construct($image)`
	`28`	`+ private function __construct(private GdImage $image)`
`33`	`29`	`{`
`34`		`- $this->image = $image;`
`35`	`30`	`}`
`36`	`31`
`37`		`- /**`
`38`		`- * @return resource`
`39`		`- */`
`40`		`- public function getImage()`
	`32`	`+ public function getImage(): GdImage`
`41`	`33`	`{`
`42`	`34`	`return $this->image;`
`43`	`35`	`}`