update migration

.idea/images.iml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Meoran\Images\" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/images.iml" filepath="$PROJECT_DIR$/.idea/images.iml" />
+    </modules>
+  </component>
+</project>

.idea/php.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="7" />
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="8409b98c-02e3-4b35-86a6-bf73d1bc2a05" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/composer.json" beforeDir="false" afterPath="$PROJECT_DIR$/composer.json" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+    <execution />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="1bGCgaByldIqNY40ITgHAqcYemj" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="configurable.group.language" />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="2" />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="623" y="267" width="424" height="479" key="FileChooserDialogImpl" timestamp="1588249996502">
+      <screen x="0" y="0" width="1680" height="1020" />
+    </state>
+    <state x="623" y="267" width="424" height="479" key="FileChooserDialogImpl/0.0.1680.1020/1680.0.1680.1050@0.0.1680.1020" timestamp="1588249996502" />
+  </component>
+</project>

composer.json

@@ -11,11 +11,10 @@
     ],
     "require": {
         "php": ">=7.0.0",
-        "laravel/lumen-framework": "5.5.*",
+        "laravel/framework": "^8.0",
-        "symfony/process" : "3.*",
+        "intervention/image": "^2.5",
-        "intervention/image": "^2.4",
+        "intervention/imagecache": "^2.5",
-        "intervention/imagecache": "^2.3",
+        "spatie/laravel-image-optimizer": "^1.6"
-        "spatie/laravel-image-optimizer": "^1.1"
     },
     "autoload": {
         "psr-4": {

database/migrations/0000_00_00_000001_create_images__table.php

@@ -11,10 +11,10 @@ class CreateImagesTable extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('images', function (Blueprint $table) {
-            $table->integer('id', true);
+            $table->id();
             $table->string('filename');
             $table->dateTime('created_at');
             $table->dateTime('updated_at');
@@ -27,7 +27,7 @@ class CreateImagesTable extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('images');
     }

database/migrations/0000_00_00_000002_create_associate_images.php

@@ -11,17 +11,14 @@ class CreateAssociateImages extends Migration
      *
      * @return void
      */
-    public function up()
+    public function up(): void
     {
         Schema::create('associate_images', function (Blueprint $table) {
-            $table->integer('id', true);
+            $table->id();
-            $table->integer('image_id');
+            $table->foreignId('image_id')->constrained()->onDelete('cascade');
             $table->string('relation_type');
-            $table->integer('relation_id');
+            $table->unsignedBigInteger('relation_id');
             $table->integer('position')->nullable();
-
-            $table->foreign('image_id')->references('id')->on('images')->onDelete('cascade');
-
         });
     }
 
@@ -30,9 +27,8 @@ class CreateAssociateImages extends Migration
      *
      * @return void
      */
-    public function down()
+    public function down(): void
     {
         Schema::drop('associate_images');
-
     }
 }

src/Http/Controllers/ImagesController.php

@@ -2,18 +2,29 @@
 
 namespace Meoran\Images\Http\Controllers;
 
+use App\Http\Controllers\Controller;
 use Closure;
+use Illuminate\Contracts\Container\BindingResolutionException;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Intervention\Image\Constraint;
+use Illuminate\Http\Response;
-use Intervention\Image\Exception\ImageException;
+use Illuminate\Validation\ValidationException;
-use Intervention\Image\Exception\NotSupportedException;
-use Laravel\Lumen\Routing\Controller as BaseController;
 use Meoran\Images\Model\Image;
 use Meoran\Images\Templates\Custom;
 
-class ImagesController extends BaseController
+/**
+ * Class ImagesController
+ * @package Meoran\Images\Http\Controllers
+ */
+class ImagesController extends Controller
 {
 
+    /**
+     * @param $filename
+     * @return Application|ResponseFactory|Response
+     */
     public function get($filename)
     {
         $template = app('request')->input('template');
@@ -30,7 +41,12 @@ class ImagesController extends BaseController
         }
     }
 
-    public function upload(Request $request)
+    /**
+     * @param  Request  $request
+     * @return JsonResponse
+     * @throws ValidationException
+     */
+    public function upload(Request $request): JsonResponse
     {
         $this->validate($request, [
             'image' => 'required|file|image'
@@ -79,6 +95,12 @@ class ImagesController extends BaseController
         abort(404);
     }
 
+    /**
+     * @param $template
+     * @param $filename
+     * @return Application|ResponseFactory|Response
+     * @throws BindingResolutionException
+     */
     public function getImage($template, $filename)
     {
         $template = $this->getTemplate($template);
@@ -97,6 +119,13 @@ class ImagesController extends BaseController
         return $this->buildResponse($content);
     }
 
+    /**
+     * @param        $template
+     * @param        $path
+     * @param  null  $image
+     * @return mixed
+     * @throws BindingResolutionException
+     */
     private function applyTemplate($template, $path, $image = null)
     {
         if (empty($image)) {
@@ -106,12 +135,12 @@ class ImagesController extends BaseController
         if ($template instanceof Closure) {
             // build from closure callback template
             return $template($image->make($path));
-        } else {
+        }
-            // build from filter template
+
-            $res = $image->make($path)->filter($template);
+        // build from filter template
-            if ($res === null) {
+        $res = $image->make($path)->filter($template);
-                abort(404);
+        if ($res === null) {
-            }
+            abort(404);
         }
     }
 
@@ -140,6 +169,10 @@ class ImagesController extends BaseController
         }
     }
 
+    /**
+     * @param $content
+     * @return Application|ResponseFactory|Response
+     */
     private function buildResponse($content)
     {
         // define mime type
@@ -155,7 +188,11 @@ class ImagesController extends BaseController
         ));
     }
 
-    private function getCustomTemplate($templateName)
+    /**
+     * @param $templateName
+     * @return Custom
+     */
+    private function getCustomTemplate($templateName): Custom
     {
         $custom = new Custom();
         $custom->actions = [$templateName];

src/Model/Image.php

@@ -2,48 +2,78 @@
 
 namespace Meoran\Images\Model;
 
+use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
+use Illuminate\Support\Str;
 use Intervention\Image\Exception\NotReadableException;
 use Intervention\Image\Image as InterventionImage;
 use Meoran\Images\Exception\InvalidContent;
+use RuntimeException;
 use Spatie\ImageOptimizer\OptimizerChain;
 
 /**
  * Class Image
  * @property InterventionImage $content
+ * @property string            filename
+ * @property string            hash
  * @package App\Model
  */
 class Image extends Model
 {
 
-    /**
+    /** @var string[] */
-     * @var InterventionImage $_content
-     */
-    protected $_content;
-
-    protected $table = 'images';
-
     public $fillable = [
         'content',
         'filename',
         'created_at',
-        'updated_at'
+        'updated_at',
     ];
+    /** @var InterventionImage */
+    protected $_content;
+    /** @var string */
+    protected $table = 'images';
+    /** @var string[] */
     protected $dates = ['created_at', 'updated_at'];
+    /** @var string[] */
     protected $appends = ['url'];
-    protected $hidden = [];
 
-    public function getUrlAttribute()
+    /**
+     * @param  string  $filename
+     * @return string
+     */
+    public static function sanitizeFilename(string $filename): string
     {
-        $route = config('image.route');
+        return Str::slug($filename, '-');
-        if (empty($route)) {
-            return null;
-        }
-        return app('url')->to('/' . $route . '/' . $this->filename);
     }
 
-    protected static function boot()
+    /**
+     * @param  Model  $class
+     * @param         $relationName
+     * @return MorphToMany
+     */
+    public static function createRelation(Model $class, $relationName): MorphToMany
+    {
+        $instance = $class->newRelatedInstance(static::class);
+        $foreignPivotKey = 'relation_id';
+        $relatedPivotKey = 'image_id';
+        $table = 'associate_images';
+        $name = 'relation';
+
+        $morph = new MorphToMany(
+            $instance->newQuery(), $class, $name, $table,
+            $foreignPivotKey, $relatedPivotKey, $class->getKeyName(),
+            $instance->getKeyName(), $relationName, false
+        );
+        $morph->withPivot('position');
+
+        return $morph;
+    }
+
+    /**
+     *
+     */
+    protected static function boot(): void
     {
         parent::boot();
 
@@ -67,7 +97,56 @@ class Image extends Model
 
     }
 
-    public function getPath()
+    protected function savePicture()
+    {
+        if (empty($this->content)) {
+            return true;
+        }
+        $this->generateFilename();
+        return $this->saveContent();
+    }
+
+    /**
+     * @param  boolean  $force
+     */
+    public function generateFilename($force = false): void
+    {
+        if ($this->filename && !$force) {
+            return;
+        }
+        $this->filename = self::generateRandomFilename();
+    }
+
+    /**+
+     * @return string
+     */
+    public static function generateRandomFilename(): string
+    {
+        return mb_strtolower(Str::random(60));
+    }
+
+    /**
+     * @return InterventionImage
+     */
+    protected function saveContent(): InterventionImage
+    {
+        if (empty($this->content)) {
+            throw new \InvalidArgumentException("Content is Empty");
+        }
+        $path = $this->getPath();
+        $dir = dirname($path);
+        if (!is_dir($dir) && !mkdir($dir, 0775, true) && !is_dir($dir)) {
+            throw new \RuntimeException(sprintf('Directory "%s" was not created', $dir));
+        }
+        $res = $this->content->save($path);
+        app(OptimizerChain::class)->optimize($path);
+        return $res;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getPath(): ?string
     {
         if (empty($this->filename)) {
             return null;
@@ -76,29 +155,48 @@ class Image extends Model
         return self::getAbsolutePath($this->filename);
     }
 
-    static function getAbsolutePath($filename)
+    /**
+     * @param $filename
+     * @return string
+     */
+    public static function getAbsolutePath($filename): string
     {
         $basePath = config('image.path');
         if (empty($basePath)) {
-            throw new \Exception('You must defined config image.path');
+            throw new RuntimeException('You must defined config image.path');
         }
         $parts = array_slice(str_split(md5($filename), 2), 0, 2);
-        $path = $basePath . '/' . implode('/', $parts) . '/' . $filename;
+        return $basePath . '/' . implode('/', $parts) . '/' . $filename;
-
-        return $path;
     }
 
-    static function generateRandomFilename()
+    /**
+     * @return bool
+     */
+    protected function deletePicture(): bool
     {
-        return mb_strtolower(str_random(60));
+        $path = $this->getPath();
+        if (is_file($path)) {
+            return unlink($path);
+        }
+        return true;
     }
 
-    static function sanitizeFilename($filename)
+    /**
+     * @return string
+     */
+    public function getUrlAttribute(): ?string
     {
-        return str_slug($filename, '-');
+        $route = config('image.route');
+        if (empty($route)) {
+            return null;
+        }
+        return app('url')->to('/' . $route . '/' . $this->filename);
     }
 
-    public function setFilenameAttribute($value)
+    /**
+     * @param  string  $value
+     */
+    public function setFilenameAttribute(string $value): void
     {
         $pattern = '/[^a-z_\-\.0-9]/i';
         $patternLetter = '/[a-z0-9]+/i';
@@ -108,25 +206,27 @@ class Image extends Model
         $this->attributes['filename'] = $value;
     }
 
-    public function fileExist()
+    /**
+     * @return bool
+     */
+    public function fileExist(): bool
     {
         return is_file($this->getPath());
     }
 
-    public function generateFilename($force = false)
+    /**
-    {
+     * @param $content
-        if ($this->filename && !$force) {
+     * @throws BindingResolutionException
-            return;
+     */
-        }
+    public function setContentAttribute($content): void
-        $this->filename = self::generateRandomFilename();
-    }
-
-    public function setContentAttribute($content)
     {
         $this->_content = app('image')->make($content)->orientate();
     }
 
-    public function getHashAttribute()
+    /**
+     * @return string|null
+     */
+    public function getHashAttribute(): ?string
     {
         if (empty($this->content)) {
             return null;
@@ -137,7 +237,10 @@ class Image extends Model
         return sha1($this->content->getEncoded());
     }
 
-    public function getExtensionAttribute()
+    /**
+     * @return string|null
+     */
+    public function getExtensionAttribute(): ?string
     {
         $mime = $this->content->mime();
         if (empty($mime)) {
@@ -146,21 +249,33 @@ class Image extends Model
         return str_replace('image/', '', $mime);
     }
 
-    public function getMimeAttribute() {
+    /**
+     * @return string|null
+     */
+    public function getMimeAttribute(): ?string
+    {
         if (empty($this->content)) {
             return null;
         }
         return $this->content->mime();
     }
 
-    public function same(Image $image)
+    /**
+     * @param  Image  $image
+     * @return bool
+     */
+    public function same(Image $image): bool
     {
         $hash1 = $this->hash;
         $hash2 = $image->hash;
         return !empty($hash1) && !empty($hash2) && $hash1 === $hash2;
     }
 
-    public function getContentAttribute($value)
+    /**
+     * @return InterventionImage|null
+     * @throws BindingResolutionException
+     */
+    public function getContentAttribute(): ?InterventionImage
     {
         if (empty($this->_content)) {
             try {
@@ -172,67 +287,4 @@ class Image extends Model
         return $this->_content;
     }
 
-    protected function savePicture()
-    {
-        if (empty($this->content)) {
-            return true;
-        }
-        $this->generateFilename();
-        return $this->saveContent();
-    }
-
-    protected function saveContent()
-    {
-        if (empty($this->content)) {
-            throw new \InvalidArgumentException("Content is Empty");
-        }
-        $path = $this->getPath();
-        $dir = dirname($path);
-        if (!is_dir($dir)) {
-            mkdir($dir, 0775, true);
-        }
-        $res = $this->content->save($path);
-        app(OptimizerChain::class)->optimize($path);
-        return $res;
-    }
-
-    protected function deletePicture()
-    {
-        $path = $this->getPath();
-        if (is_file($path)) {
-            return unlink($path);
-        }
-        return true;
-    }
-
-    /**
-     * @param Model $class
-     * @param $relationName
-     * @return MorphToMany
-     */
-    public static function createRelation(Model $class, $relationName)
-    {
-        $instance = $class->newRelatedInstance(static::class);
-        $foreignPivotKey = 'relation_id';
-        $relatedPivotKey = 'image_id';
-        $table = 'associate_images';
-        $name = 'relation';
-
-        $morph = new MorphToMany(
-            $instance->newQuery(), $class, $name, $table,
-            $foreignPivotKey, $relatedPivotKey, $class->getKeyName(),
-            $instance->getKeyName(), $relationName, false
-        );
-        $morph->withPivot('position');
-
-        return $morph;
-    }
-
-    public function toArray()
-    {
-        $attributes = parent::toArray();
-
-        return $attributes;
-    }
-
 }

src/Templates/Custom.php

@@ -7,11 +7,19 @@ use Intervention\Image\Exception\NotSupportedException;
 use Intervention\Image\Filters\FilterInterface;
 use Intervention\Image\Image;
 
+/**
+ * Class Custom
+ * @package Meoran\Images\Templates
+ */
 class Custom implements FilterInterface
 {
-    public $actions = null;
+    public $actions;
 
-    public function applyFilter(Image $image)
+    /**
+     * @param  Image  $image
+     * @return Image|null
+     */
+    public function applyFilter(Image $image): ?Image
     {
         $actions = $this->actions;
         if ($actions === null) {
@@ -31,16 +39,18 @@ class Custom implements FilterInterface
             if (isset($exploded[1])) {
                 $params = explode(',', $exploded[1]);
             }
-            $params[] = function (Constraint $constraint) {
+            $params[] = static function (Constraint $constraint) {
                 $constraint->upsize();
                 $constraint->aspectRatio();
             };
-            $params = array_map(function($el) {
+            $params = array_map(static function($el) {
-                if (is_string($el) && $el === 'null') return null;
+                if (is_string($el) && $el === 'null') {
+                    return null;
+                }
                 return $el;
             },$params);
             try {
-                call_user_func_array([$image,$methodName], $params);
+                call_user_func_array([$image, $methodName], $params);
             } catch (NotSupportedException $exception) {
                 return null;
             }

src/Templates/Large.php

@@ -8,7 +8,11 @@ use Intervention\Image\Image;
 
 class Large implements FilterInterface
 {
-    public function applyFilter(Image $image)
+    /**
+     * @param  Image  $image
+     * @return Image
+     */
+    public function applyFilter(Image $image): Image
     {
         return $image->resize(1920, null, function (Constraint $constraint) {
             $constraint->upsize();

src/Templates/Medium.php

@@ -8,7 +8,7 @@ use Intervention\Image\Image;
 
 class Medium implements FilterInterface
 {
-    public function applyFilter(Image $image)
+    public function applyFilter(Image $image): Image
     {
         return $image->resize(960, null, function (Constraint $constraint) {
             $constraint->upsize();

src/Templates/Small.php

@@ -8,7 +8,7 @@ use Intervention\Image\Image;
 
 class Small implements FilterInterface
 {
-    public function applyFilter(Image $image)
+    public function applyFilter(Image $image): Image
     {
         return $image->resize(480, null, function (Constraint $constraint) {
             $constraint->upsize();

src/Templates/Thumb.php

@@ -8,7 +8,7 @@ use Intervention\Image\Image;
 
 class Thumb implements FilterInterface
 {
-    public function applyFilter(Image $image)
+    public function applyFilter(Image $image): Image
     {
         return $image->resize(120, null, function (Constraint $constraint) {
             $constraint->upsize();