Skip intermediate login page with single provider

[bookstack] / app / Uploads / Image.php

diff --git a/app/Uploads/Image.php b/app/Uploads/Image.php
index 029fd317501fd91a9706ea955c04359d12bce98e..bdf10f080fe99cd991f52bc0174e75cc4c5ac00f 100644 (file)
--- a/app/Uploads/Image.php
+++ b/app/Uploads/Image.php
@@ -1,34 +1,45 @@
-<?php namespace BookStack\Uploads;
+<?php
+
+namespace BookStack\Uploads;

 
 use BookStack\Entities\Models\Page;
 
 use BookStack\Entities\Models\Page;

-use BookStack\Ownable;
-use Images;
+use BookStack\Model;
+use BookStack\Traits\HasCreatorAndUpdater;
+use Illuminate\Database\Eloquent\Factories\HasFactory;

 
 

-class Image extends Ownable
+/**
+ * @property int    $id
+ * @property string $name
+ * @property string $url
+ * @property string $path
+ * @property string $type
+ * @property int    $uploaded_to
+ * @property int    $created_by
+ * @property int    $updated_by
+ */
+class Image extends Model

 {
 {

+    use HasFactory;
+    use HasCreatorAndUpdater;

 
     protected $fillable = ['name'];
     protected $hidden = [];
 
     /**
      * Get a thumbnail for this image.
 
     protected $fillable = ['name'];
     protected $hidden = [];
 
     /**
      * Get a thumbnail for this image.

-     * @param  int $width
-     * @param  int $height
-     * @param bool|false $keepRatio
-     * @return string
+     *

      * @throws \Exception
      */
      * @throws \Exception
      */

-    public function getThumb($width, $height, $keepRatio = false)
+    public function getThumb(int $width, int $height, bool $keepRatio = false): string

     {
     {

-        return Images::getThumbnail($this, $width, $height, $keepRatio);
+        return app()->make(ImageService::class)->getThumbnail($this, $width, $height, $keepRatio);

     }
 
     /**
      * Get the page this image has been uploaded to.
      * Only applicable to gallery or drawio image types.
     }
 
     /**
      * Get the page this image has been uploaded to.
      * Only applicable to gallery or drawio image types.

-     * @return Page|null

      */
      */

-    public function getPage()
+    public function getPage(): ?Page

     {
         return $this->belongsTo(Page::class, 'uploaded_to')->first();
     }
     {
         return $this->belongsTo(Page::class, 'uploaded_to')->first();
     }