Update Image.php

Author: andi34

src/Image.php

@@ -361,21 +361,10 @@ public function createFromImage(string $image): GdImage|false
                 parse_str(parse_url($image)['query'] ?? '', $query);
                 $path = is_array($query['dir']) ? $query['dir']['0'] : $query['dir'];
                 $image = ImageUtility::getRandomImageFromPath($path);
-            } elseif (!PathUtility::isUrl($image) && !PathUtility::isAbsolutePath($image)) {
-                $image = PathUtility::getAbsolutePath($image);
             }
 
             if (!file_exists($image)) {
-                $imageAlt1 = $_SERVER['DOCUMENT_ROOT'] . $image;
-                $imageAlt2 = $_SERVER['DOCUMENT_ROOT'] . '/' . $image;
-
-                if (file_exists($imageAlt1)) {
-                    $image = $imageAlt1;
-                } elseif (file_exists($imageAlt2)) {
-                    $image = $imageAlt2;
-                } else {
-                    throw new \Exception('File not found: ' . $image);
-                }
+                $image = PathUtility::resolveFilePath($image);
             }
 
             $resource = imagecreatefromstring((string)file_get_contents($image));
@@ -761,22 +750,7 @@ public function applyText(GdImage $sourceResource): GdImage
                 $fontPath = $tempFontPath;
                 $isTempFont = true;
             } else {
-                if (!PathUtility::isAbsolutePath($this->fontPath)) {
-                    $fontPath = PathUtility::getAbsolutePath($this->fontPath);
-                }
-
-                if (!file_exists($fontPath)) {
-                    $fontAlt1 = $_SERVER['DOCUMENT_ROOT'] . $this->fontPath;
-                    $fontAlt2 = $_SERVER['DOCUMENT_ROOT'] . '/' . $this->fontPath;
-
-                    if (file_exists($fontAlt1)) {
-                        $fontPath = $fontAlt1;
-                    } elseif (file_exists($fontAlt2)) {
-                        $fontPath = $fontAlt2;
-                    } else {
-                        throw new \Exception('Font file not found: ' . $fontPath);
-                    }
-                }
+                $fontPath = PathUtility::resolveFilePath($this->fontPath);
             }
 
             // Add first line of text