updates for php8; creates missing folders for attachables

Author: aocneanu

composer.json

@@ -10,15 +10,16 @@
     "homepage": "https://github.com/laravel-enso/files",
     "type": "library",
     "license": "MIT",
-    "authors": [{
-        "name": "Adrian Ocneanu",
-        "email": "[email protected]",
-        "homepage": "https://laravel-enso.com",
-        "role": "Developer"
-    }],
+    "authors": [
+        {
+            "name": "Adrian Ocneanu",
+            "email": "[email protected]",
+            "homepage": "https://laravel-enso.com",
+            "role": "Developer"
+        }
+    ],
     "require": {
-        "php": ">=7.4.0",
-        "laravel-enso/core": "^5.0|^6.0",
+        "laravel-enso/core": "^7.0",
         "laravel-enso/helpers": "^2.0",
         "laravel-enso/image-transformer": "^2.0",
         "laravel-enso/migrator": "^2.0",
@@ -42,4 +43,4 @@
             }
         }
     }
-}
+}

config/files.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'linkExpiration' => env('TEMPORARY_LINK_EXPIRATION', 60 * 60 * 24),
+    'linkExpiration' => (int) env('TEMPORARY_LINK_EXPIRATION', 60 * 60 * 24),
     'storageLimit' => 500000,
     'paginate' => (int) env('FILES_PAGINATION', 24),
     'testingFolder' => 'testing',

routes/api.php

@@ -7,8 +7,8 @@
     ->prefix('api/core')
     ->as('core.')
     ->group(function () {
-        require 'app/files.php';
-        require 'app/uploads.php';
+        require __DIR__.'/app/files.php';
+        require __DIR__.'/app/uploads.php';
     });
 
 Route::middleware(['signed', 'bindings'])

src/Contracts/AuthorizesFileAccess.php

@@ -2,7 +2,7 @@
 
 namespace LaravelEnso\Files\Contracts;
 
-use LaravelEnso\Core\Models\User;
+use LaravelEnso\Users\Models\User;
 
 interface AuthorizesFileAccess
 {

src/Models/File.php

@@ -13,14 +13,14 @@
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Str;
-use LaravelEnso\Core\Models\User;
 use LaravelEnso\Files\Exceptions\File as Exception;
 use LaravelEnso\Files\Facades\FileBrowser;
 use LaravelEnso\Files\Services\FileValidator;
 use LaravelEnso\Files\Services\ImageProcessor;
 use LaravelEnso\Files\Traits\FilePolicies;
 use LaravelEnso\ImageTransformer\Services\ImageTransformer;
 use LaravelEnso\TrackWho\Traits\CreatedBy;
+use LaravelEnso\Users\Models\User;
 use Symfony\Component\HttpFoundation\File\File as BaseFile;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 

src/Policies/File.php

@@ -3,9 +3,9 @@
 namespace LaravelEnso\Files\Policies;
 
 use Illuminate\Auth\Access\HandlesAuthorization;
-use LaravelEnso\Core\Models\User;
 use LaravelEnso\Files\Contracts\AuthorizesFileAccess;
 use LaravelEnso\Files\Models\File as Model;
+use LaravelEnso\Users\Models\User;
 
 class File
 {

src/Policies/Upload.php

@@ -3,8 +3,8 @@
 namespace LaravelEnso\Files\Policies;
 
 use Illuminate\Auth\Access\HandlesAuthorization;
-use LaravelEnso\Core\Models\User;
 use LaravelEnso\Files\Models\Upload as Model;
+use LaravelEnso\Users\Models\User;
 
 class Upload
 {

src/Services/FileBrowser.php

@@ -42,7 +42,7 @@ public function model($folder): ?string
 
     public function remove($folders): void
     {
-        (new Collection($folders))
+        Collection::wrap($folders)
             ->each(fn ($folder) => $this->models->forget($folder));
     }
 

src/Services/FileValidator.php

@@ -10,16 +10,11 @@
 
 class FileValidator
 {
-    protected BaseFile $file;
-
-    private array $extensions;
-    private array $mimeTypes;
-
-    public function __construct(BaseFile $file, array $extensions, array $mimeTypes)
-    {
-        $this->file = $file;
-        $this->extensions = $extensions;
-        $this->mimeTypes = $mimeTypes;
+    public function __construct(
+        protected BaseFile $file,
+        private array $extensions,
+        private array $mimeTypes
+    ) {
     }
 
     public function handle(): void
@@ -40,33 +35,29 @@ private function validateFile(): self
 
     private function validateExtension(): self
     {
-        $valid = (new Collection($this->extensions));
+        $valid = new Collection($this->extensions);
 
         $extension = $this->file instanceof UploadedFile
             ? $this->file->getClientOriginalExtension()
             : $this->file->getExtension();
 
         if ($valid->isNotEmpty() && ! $valid->contains($extension)) {
-            throw FileException::invalidExtension(
-                $extension,
-                implode(', ', $this->extensions)
-            );
+            $extensions = implode(', ', $this->extensions);
+            throw FileException::invalidExtension($extension, $extensions);
         }
 
         return $this;
     }
 
     private function validateMimeType()
     {
-        $valid = (new Collection($this->mimeTypes));
+        $valid = new Collection($this->mimeTypes);
 
         $mimeType = $this->file->getMimeType();
 
         if ($valid->isNotEmpty() && ! $valid->contains($mimeType)) {
-            throw FileException::invalidMimeType(
-                $mimeType,
-                implode(', ', $this->mimeTypes),
-            );
+            $mimeTypes = implode(', ', $this->mimeTypes);
+            throw FileException::invalidMimeType($mimeType, $mimeTypes);
         }
 
         return $this;

src/Services/ImageProcessor.php

@@ -8,16 +8,13 @@
 
 class ImageProcessor
 {
-    private File $file;
-    private bool $optimize;
-    private array $resize;
     private ImageTransformer $transformer;
 
-    public function __construct(File $file, bool $optimize, array $resize)
-    {
-        $this->file = $file;
-        $this->optimize = $optimize;
-        $this->resize = $resize;
+    public function __construct(
+        private File $file,
+        private bool $optimize,
+        private array $resize
+    ) {
     }
 
     public function handle(): void