- removes the App folder / namespace

- adds guarded = ['id'] to model
- changes `web` middleware to `api`
- adds type to props in structure migrations
- updates relation
- updates codacy badge

README.md

@@ -1,6 +1,6 @@
 # File Manager
 
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6e342eff10f24db5b89be5fe203e424d)](https://www.codacy.com/app/laravel-enso/files?utm_source=github.com&utm_medium=referral&utm_content=laravel-enso/files&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/0ad3f6e21d9e42279dedd5432602891b)](https://www.codacy.com/gh/laravel-enso/files?utm_source=github.com&utm_medium=referral&utm_content=laravel-enso/files&utm_campaign=Badge_Grade)
 [![StyleCI](https://github.styleci.io/repos/85492361/shield?branch=master)](https://github.styleci.io/repos/85492361)
 [![License](https://poser.pugx.org/laravel-enso/datatable/license)](https://packagist.org/packages/laravel-enso/datatable)
 [![Total Downloads](https://poser.pugx.org/laravel-enso/files/downloads)](https://packagist.org/packages/laravel-enso/files)

composer.json

@@ -10,21 +10,19 @@
     "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": "4.8.*",
-        "laravel-enso/helpers": "1.15.*",
-        "laravel-enso/image-transformer": "1.6.*",
-        "laravel-enso/migrator": "1.1.*",
-        "laravel-enso/track-who": "1.9.*"
+        "laravel-enso/core": "^5.0",
+        "laravel-enso/helpers": "^2.0",
+        "laravel-enso/image-transformer": "^2.0",
+        "laravel-enso/migrator": "^2.0",
+        "laravel-enso/track-who": "^2.0"
     },
     "autoload": {
         "psr-4": {
@@ -40,8 +38,8 @@
                 "LaravelEnso\\Files\\UploadServiceProvider"
             ],
             "aliases": {
-                "FileBrowser": "LaravelEnso\\Files\\App\\Facades\\FileBrowser"
+                "FileBrowser": "LaravelEnso\\Files\\Facades\\FileBrowser"
             }
         }
     }
-}
+}

src/database/migrations/2018_08_25_101000_create_structure_for_files.php → database/migrations/2018_08_25_101000_create_structure_for_files.php

@@ -1,18 +1,18 @@
 <?php
 
-use LaravelEnso\Migrator\App\Database\Migration;
+use LaravelEnso\Migrator\Database\Migration;
 
 class CreateStructureForFiles extends Migration
 {
-    protected $permissions = [
+    protected array $permissions = [
         ['name' => 'core.files.index', 'description' => 'List files', 'is_default' => true],
         ['name' => 'core.files.link', 'description' => 'Get file download temporary link', 'is_default' => true],
         ['name' => 'core.files.show', 'description' => 'Open file in browser', 'is_default' => true],
         ['name' => 'core.files.download', 'description' => 'Download file', 'is_default' => true],
         ['name' => 'core.files.destroy', 'description' => 'Delete file', 'is_default' => true],
     ];
 
-    protected $menu = [
+    protected array $menu = [
         'name' => 'Files', 'icon' => 'folder-open', 'route' => 'core.files.index', 'order_index' => 255, 'has_children' => false,
     ];
 }

src/database/migrations/2018_08_25_103000_create_structure_for_uploads.php → database/migrations/2018_08_25_103000_create_structure_for_uploads.php

@@ -1,10 +1,10 @@
 <?php
 
-use LaravelEnso\Migrator\App\Database\Migration;
+use LaravelEnso\Migrator\Database\Migration;
 
 class CreateStructureForUploads extends Migration
 {
-    protected $permissions = [
+    protected array $permissions = [
         ['name' => 'core.uploads.store', 'description' => 'Upload file', 'is_default' => true],
         ['name' => 'core.uploads.destroy', 'description' => 'Delete upload', 'is_default' => true],
     ];

src/routes/api.php → routes/api.php

@@ -2,8 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::middleware(['web', 'auth', 'core'])
-    ->namespace('LaravelEnso\Files\App\Http\Controllers')
+Route::middleware(['api', 'auth', 'core'])
+    ->namespace('LaravelEnso\Files\Http\Controllers')
     ->prefix('api/core')
     ->as('core.')
     ->group(function () {
@@ -12,7 +12,7 @@
     });
 
 Route::middleware(['signed', 'bindings'])
-    ->namespace('LaravelEnso\Files\App\Http\Controllers\File')
+    ->namespace('LaravelEnso\Files\Http\Controllers\File')
     ->prefix('api/core/files')
     ->as('core.files.')
     ->group(function () {

src/AppServiceProvider.php

@@ -2,10 +2,12 @@
 
 namespace LaravelEnso\Files;
 
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\ServiceProvider;
-use LaravelEnso\Files\App\Models\Upload;
-use LaravelEnso\Files\App\Services\FileBrowser;
+use LaravelEnso\Core\Models\User;
+use LaravelEnso\DynamicMethods\Services\Methods;
+use LaravelEnso\Files\DynamicsRelations\Uploads;
+use LaravelEnso\Files\Models\Upload;
+use LaravelEnso\Files\Services\FileBrowser;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -22,28 +24,27 @@ public function boot()
 
     private function load()
     {
-        $this->loadRoutesFrom(__DIR__.'/routes/api.php');
+        $this->loadRoutesFrom(__DIR__.'/../routes/api.php');
 
-        $this->mergeConfigFrom(__DIR__.'/config/files.php', 'enso.files');
+        $this->mergeConfigFrom(__DIR__.'/../config/files.php', 'enso.files');
 
-        $this->loadMigrationsFrom(__DIR__.'/database/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
         return $this;
     }
 
     private function mapMorphs()
     {
-        Relation::morphMap([
-            Upload::morphMapKey() => Upload::class,
-        ]);
+        Upload::morphMap();
+        Methods::bind(User::class, [Uploads::class]);
 
         return $this;
     }
 
     private function publish()
     {
         $this->publishes([
-            __DIR__.'/config' => config_path('enso'),
+            __DIR__.'/../config' => config_path('enso'),
         ], ['files-config', 'enso-config']);
 
         $this->publishes([

src/AuthServiceProvider.php

@@ -3,10 +3,10 @@
 namespace LaravelEnso\Files;
 
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
-use LaravelEnso\Files\App\Models\File;
-use LaravelEnso\Files\App\Models\Upload;
-use LaravelEnso\Files\App\Policies\File as FilePolicy;
-use LaravelEnso\Files\App\Policies\Upload as UploadPolicy;
+use LaravelEnso\Files\Models\File;
+use LaravelEnso\Files\Models\Upload;
+use LaravelEnso\Files\Policies\File as FilePolicy;
+use LaravelEnso\Files\Policies\Upload as UploadPolicy;
 
 class AuthServiceProvider extends ServiceProvider
 {

src/App/Contracts/Attachable.php → src/Contracts/Attachable.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace LaravelEnso\Files\App\Contracts;
+namespace LaravelEnso\Files\Contracts;
 
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\File;
 use Illuminate\Http\UploadedFile;
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 interface Attachable

src/App/Contracts/AuthorizesFileAccess.php → src/Contracts/AuthorizesFileAccess.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Contracts;
+namespace LaravelEnso\Files\Contracts;
 
-use LaravelEnso\Core\App\Models\User;
+use LaravelEnso\Core\Models\User;
 
 interface AuthorizesFileAccess
 {

src/DynamicRelations/Uploads.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace LaravelEnso\Files\DynamicsRelations;
+
+use Closure;
+use LaravelEnso\DynamicMethods\Contracts\Method;
+use LaravelEnso\Files\Models\Upload;
+
+class Uploads implements Method
+{
+    public function name(): string
+    {
+        return 'uploads';
+    }
+
+    public function closure(): Closure
+    {
+        return fn () => $this->hasMany(Upload::class, 'created_by');
+    }
+}

src/App/Exceptions/File.php → src/Exceptions/File.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Files\App\Exceptions;
+namespace LaravelEnso\Files\Exceptions;
 
-use LaravelEnso\Helpers\App\Exceptions\EnsoException;
+use LaravelEnso\Helpers\Exceptions\EnsoException;
 
 class File extends EnsoException
 {

src/App/Facades/FileBrowser.php → src/Facades/FileBrowser.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Files\App\Facades;
+namespace LaravelEnso\Files\Facades;
 
 use Illuminate\Support\Facades\Facade;
 

src/FileServiceProvider.php

@@ -3,7 +3,7 @@
 namespace LaravelEnso\Files;
 
 use Illuminate\Support\ServiceProvider;
-use LaravelEnso\Files\App\Facades\FileBrowser;
+use LaravelEnso\Files\Facades\FileBrowser;
 
 class FileServiceProvider extends ServiceProvider
 {

src/App/Http/Controllers/File/Destroy.php → src/Http/Controllers/File/Destroy.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Destroy extends Controller
 {

src/App/Http/Controllers/File/Download.php → src/Http/Controllers/File/Download.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Download extends Controller
 {

src/App/Http/Controllers/File/Index.php → src/Http/Controllers/File/Index.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Http\Responses\Files;
+use LaravelEnso\Files\Http\Responses\Files;
 
 class Index extends Controller
 {

src/App/Http/Controllers/File/Link.php → src/Http/Controllers/File/Link.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Link extends Controller
 {

src/App/Http/Controllers/File/Share.php → src/Http/Controllers/File/Share.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Share extends Controller
 {

src/App/Http/Controllers/File/Show.php → src/Http/Controllers/File/Show.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\File;
+namespace LaravelEnso\Files\Http\Controllers\File;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Models\File;
 
 class Show extends Controller
 {

src/App/Http/Controllers/Upload/Destroy.php → src/Http/Controllers/Upload/Destroy.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\Upload;
+namespace LaravelEnso\Files\Http\Controllers\Upload;
 
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Models\Upload;
 
 class Destroy extends Controller
 {

src/App/Http/Controllers/Upload/Store.php → src/Http/Controllers/Upload/Store.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Controllers\Upload;
+namespace LaravelEnso\Files\Http\Controllers\Upload;
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use LaravelEnso\Files\App\Models\Upload;
+use LaravelEnso\Files\Models\Upload;
 
 class Store extends Controller
 {

src/App/Http/Resources/Collection.php → src/Http/Resources/Collection.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Resources;
+namespace LaravelEnso\Files\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
-use LaravelEnso\Files\App\Facades\FileBrowser;
+use LaravelEnso\Files\Facades\FileBrowser;
 
 class Collection extends ResourceCollection
 {

src/App/Http/Resources/File.php → src/Http/Resources/File.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Resources;
+namespace LaravelEnso\Files\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
-use LaravelEnso\Core\App\Http\Resources\User;
+use LaravelEnso\Core\Http\Resources\User;
 
 class File extends JsonResource
 {

src/App/Http/Responses/Files.php → src/Http/Responses/Files.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace LaravelEnso\Files\App\Http\Responses;
+namespace LaravelEnso\Files\Http\Responses;
 
 use Illuminate\Contracts\Support\Responsable;
-use LaravelEnso\Files\App\Http\Resources\Collection;
-use LaravelEnso\Files\App\Http\Resources\File as Resource;
-use LaravelEnso\Files\App\Models\File;
+use LaravelEnso\Files\Http\Resources\Collection;
+use LaravelEnso\Files\Http\Resources\File as Resource;
+use LaravelEnso\Files\Models\File;
 
 class Files implements Responsable
 {