Update implementation for image handling

ralphjsmit · Mar 9, 2022 · 5c6bb62 · 5c6bb62
1 parent 835be9e
commit 5c6bb62
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/src/Models/SEO.php b/src/Models/SEO.php
@@ -29,10 +29,6 @@ public function prepareForUsage(): SEOData
             $enableTitleSuffix = $this->model->enableTitleSuffix;
         }
 
-        if ( method_exists($this->model, 'getSEOImageUrl') ) {
-            $image = $this->model->getSEOImageUrl();
-        }
-
         return new SEOData(
             title            : $overrides->title ?? $this->title,
             description      : $overrides->description ?? $this->description,

diff --git a/src/Support/ImageMeta.php b/src/Support/ImageMeta.php
@@ -2,15 +2,24 @@
 
 namespace RalphJSmit\Laravel\SEO\Support;
 
-use Illuminate\Support\Str;
+use PHPUnit\Runner\Exception;
 
 class ImageMeta
 {
-    public function __construct(string $imagePath)
+    public ?int $width = null;
+    public ?int $height = null;
+
+    public function __construct(string $path)
     {
-        $path = public_path(Str::of($imagePath)->after('public')->trim('/'));
+        $publicPath = public_path($path);
+
+        if ( ! is_file($publicPath) ) {
+            report(new Exception("Path {$publicPath} is not a file."));
+
+            return;
+        }
 
-        [$width, $height] = getimagesize($path);
+        [$width, $height] = getimagesize($publicPath);
 
         $this->width = $width;
         $this->height = $height;

diff --git a/src/Tags/OpenGraphTags.php b/src/Tags/OpenGraphTags.php
@@ -32,8 +32,11 @@ public static function initialize(SEOData $SEOData): static
         if ( $SEOData->image ) {
             $collection->push(new OpenGraphTag('image', $SEOData->image));
 
-            $collection->push(new OpenGraphTag('image:width', $SEOData->imageMeta->width));
-            $collection->push(new OpenGraphTag('image:height', $SEOData->imageMeta->height));
+            if ( $meta = $SEOData->imageMeta() ) {
+                $collection
+                    ->when($meta->width, fn (self $collection): self => $collection->push(new OpenGraphTag('image:width', $meta->width)))
+                    ->when($meta->height, fn (self $collection): self => $collection->push(new OpenGraphTag('image:height', $meta->height)));
+            }
         }
 
         $collection->push(new OpenGraphTag('url', url()->current()));

diff --git a/tests/Fixtures/PageWithOverrides.php b/tests/Fixtures/PageWithOverrides.php
@@ -14,9 +14,4 @@ class PageWithOverrides extends Model
     protected $table = 'pages';
 
     public static array $overrides = [];
-
-    public function getSEOImageUrl(): string
-    {
-        return secure_asset('public/storage/images/test.jpg');
-    }
 }