Refactors for ensoV4

aocneanu · aocneanu · commit 8d60eeba1f33 · 2020-06-23T17:24:38.000+03:00
- drops App folder &amp; namespace
- adds abilities trait
- removes tutorial permission (added dyanmically from the tutorials package)
- updates deps
diff --git a/composer.json b/composer.json
@@ -9,23 +9,20 @@
     "homepage": "https://github.com/laravel-enso/permissions",
     "type": "library",
     "license": "MIT",
-    "authors": [
-        {
-            "name": "Adrian Ocneanu",
-            "email": "aocneanu@gmail.com",
-            "homepage": "https://laravel-enso.com",
-            "role": "Developer"
-        }
-    ],
+    "authors": [{
+        "name": "Adrian Ocneanu",
+        "email": "aocneanu@gmail.com",
+        "homepage": "https://laravel-enso.com",
+        "role": "Developer"
+    }],
     "require": {
-        "laravel-enso/core": "4.8.*",
-        "laravel-enso/enums": "1.2.*",
-        "laravel-enso/forms": "3.4.*",
-        "laravel-enso/helpers": "1.15.*",
-        "laravel-enso/roles": "3.4.*",
-        "laravel-enso/migrator": "1.1.*",
-        "laravel-enso/tutorials": "3.3.*",
-        "laravel-enso/tables": "3.2.*"
+        "laravel-enso/core": "^5.0",
+        "laravel-enso/enums": "^2.0",
+        "laravel-enso/forms": "^4.0",
+        "laravel-enso/helpers": "^2.0",
+        "laravel-enso/migrator": "^2.0",
+        "laravel-enso/roles": "^4.0",
+        "laravel-enso/tables": "^4.0"
     },
     "autoload": {
         "psr-4": {
@@ -42,4 +39,4 @@
             "aliases": {}
         }
     }
-}
+}
diff --git a/database/factories/PermissionFactory.php b/database/factories/PermissionFactory.php
@@ -1,7 +1,7 @@
 <?php
 
 use Faker\Generator as Faker;
-use LaravelEnso\Permissions\App\Models\Permission;
+use LaravelEnso\Permissions\Models\Permission;
 
 $factory->define(Permission::class, fn (Faker $faker) => [
     'name' => $faker->unique()->word,
diff --git a/database/migrations/2017_01_01_101000_create_permissions_table.php b/database/migrations/2017_01_01_101000_create_permissions_table.php
diff --git a/database/migrations/2017_01_01_124000_create_structure_for_permissions.php b/database/migrations/2017_01_01_124000_create_structure_for_permissions.php
@@ -1,10 +1,10 @@
 <?php
 
-use LaravelEnso\Migrator\App\Database\Migration;
+use LaravelEnso\Migrator\Database\Migration;
 
 class CreateStructureForPermissions extends Migration
 {
-    protected $permissions = [
+    protected array $permissions = [
         ['name' => 'system.permissions.index', 'description' => 'Permissions index', 'is_default' => false],
         ['name' => 'system.permissions.create', 'description' => 'Create a new permission', 'is_default' => false],
         ['name' => 'system.permissions.edit', 'description' => 'Edit existing permissions', 'is_default' => false],
@@ -16,9 +16,9 @@ class CreateStructureForPermissions extends Migration
         ['name' => 'system.permissions.initTable', 'description' => 'Init table data for permissions', 'is_default' => false],
     ];
 
-    protected $menu = [
+    protected array $menu = [
         'name' => 'Permissions', 'icon' => 'exclamation-triangle', 'route' => 'system.permissions.index', 'order_index' => 999, 'has_children' => false,
     ];
 
-    protected $parentMenu = 'System';
+    protected string $parentMenu = 'System';
 }
diff --git a/routes/api.php b/routes/api.php
@@ -4,7 +4,7 @@
 
 Route::middleware(['web', 'auth', 'core'])
     ->prefix('api/system/permissions')->as('system.permissions.')
-    ->namespace('LaravelEnso\Permissions\App\Http\Controllers')
+    ->namespace('LaravelEnso\Permissions\Http\Controllers')
     ->group(function () {
         Route::get('create', 'Create')->name('create');
         Route::post('', 'Store')->name('store');
diff --git a/src/App/Http/Controllers/ExportExcel.php b/src/App/Http/Controllers/ExportExcel.php
diff --git a/src/App/Http/Controllers/InitTable.php b/src/App/Http/Controllers/InitTable.php
diff --git a/src/App/Http/Controllers/TableData.php b/src/App/Http/Controllers/TableData.php
diff --git a/src/AppServiceProvider.php b/src/AppServiceProvider.php
@@ -3,33 +3,32 @@
 namespace LaravelEnso\Permissions;
 
 use Illuminate\Support\ServiceProvider;
-use LaravelEnso\Permissions\App\Http\Middleware\VerifyRouteAccess;
+use LaravelEnso\Permissions\Http\Middleware\VerifyRouteAccess;
 
 class AppServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        $this->app['router']->aliasMiddleware(
-            'verify-route-access', VerifyRouteAccess::class
-        );
+        $this->app['router']
+            ->aliasMiddleware('verify-route-access', VerifyRouteAccess::class);
 
         $this->load()
             ->publish();
     }
 
     private function load()
     {
-        $this->loadRoutesFrom(__DIR__.'/routes/api.php');
+        $this->loadRoutesFrom(__DIR__.'/../routes/api.php');
 
-        $this->loadMigrationsFrom(__DIR__.'/database/migrations');
+        $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
         return $this;
     }
 
     private function publish()
     {
         $this->publishes([
-            __DIR__.'/database/factories' => database_path('factories'),
+            __DIR__.'/../database/factories' => database_path('factories'),
         ], ['permissions-factories', 'enso-factories']);
     }
 }
diff --git a/src/EnumServiceProvider.php b/src/EnumServiceProvider.php
@@ -3,7 +3,7 @@
 namespace LaravelEnso\Permissions;
 
 use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;
-use LaravelEnso\Permissions\App\Enums\Types;
+use LaravelEnso\Permissions\Enums\Types;
 
 class EnumServiceProvider extends ServiceProvider
 {
diff --git a/src/Enums/Types.php b/src/Enums/Types.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Enums;
+namespace LaravelEnso\Permissions\Enums;
 
-use LaravelEnso\Enums\App\Services\Enum;
+use LaravelEnso\Enums\Services\Enum;
 
 class Types extends Enum
 {
diff --git a/src/Enums/Verbs.php b/src/Enums/Verbs.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Enums;
+namespace LaravelEnso\Permissions\Enums;
 
-use LaravelEnso\Enums\App\Services\Enum;
+use LaravelEnso\Enums\Services\Enum;
 
 class Verbs extends Enum
 {
diff --git a/src/Exceptions/Permission.php b/src/Exceptions/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Exceptions;
+namespace LaravelEnso\Permissions\Exceptions;
 
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 
diff --git a/src/Forms/Builders/PermissionForm.php b/src/Forms/Builders/PermissionForm.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Forms\Builders;
+namespace LaravelEnso\Permissions\Forms\Builders;
 
-use LaravelEnso\Forms\App\Services\Form;
-use LaravelEnso\Permissions\App\Models\Permission;
-use LaravelEnso\Roles\App\Models\Role;
+use LaravelEnso\Forms\Services\Form;
+use LaravelEnso\Permissions\Models\Permission;
+use LaravelEnso\Roles\Models\Role;
 
 class PermissionForm
 {
diff --git a/src/Forms/Templates/permission.json b/src/Forms/Templates/permission.json
diff --git a/src/Http/Controllers/Create.php b/src/Http/Controllers/Create.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Controllers;
+namespace LaravelEnso\Permissions\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Permissions\App\Forms\Builders\PermissionForm;
+use LaravelEnso\Permissions\Forms\Builders\PermissionForm;
 
 class Create extends Controller
 {
diff --git a/src/Http/Controllers/Destroy.php b/src/Http/Controllers/Destroy.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Controllers;
+namespace LaravelEnso\Permissions\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Permissions\App\Models\Permission;
+use LaravelEnso\Permissions\Models\Permission;
 
 class Destroy extends Controller
 {
diff --git a/src/Http/Controllers/Edit.php b/src/Http/Controllers/Edit.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Controllers;
+namespace LaravelEnso\Permissions\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Permissions\App\Forms\Builders\PermissionForm;
-use LaravelEnso\Permissions\App\Models\Permission;
+use LaravelEnso\Permissions\Forms\Builders\PermissionForm;
+use LaravelEnso\Permissions\Models\Permission;
 
 class Edit extends Controller
 {
diff --git a/src/Http/Controllers/ExportExcel.php b/src/Http/Controllers/ExportExcel.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace LaravelEnso\Permissions\Http\Controllers;
+
+use Illuminate\Routing\Controller;
+use LaravelEnso\Permissions\Tables\Builders\PermissionTable;
+use LaravelEnso\Tables\Traits\Excel;
+
+class ExportExcel extends Controller
+{
+    use Excel;
+
+    protected $tableClass = PermissionTable::class;
+}
diff --git a/src/Http/Controllers/InitTable.php b/src/Http/Controllers/InitTable.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace LaravelEnso\Permissions\Http\Controllers;
+
+use Illuminate\Routing\Controller;
+use LaravelEnso\Permissions\Tables\Builders\PermissionTable;
+use LaravelEnso\Tables\Traits\Init;
+
+class InitTable extends Controller
+{
+    use Init;
+
+    protected $tableClass = PermissionTable::class;
+}
diff --git a/src/Http/Controllers/Store.php b/src/Http/Controllers/Store.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Controllers;
+namespace LaravelEnso\Permissions\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Permissions\App\Http\Requests\ValidatePermissionRequest;
-use LaravelEnso\Permissions\App\Models\Permission;
+use LaravelEnso\Permissions\Http\Requests\ValidatePermissionRequest;
+use LaravelEnso\Permissions\Models\Permission;
 
 class Store extends Controller
 {
diff --git a/src/Http/Controllers/TableData.php b/src/Http/Controllers/TableData.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace LaravelEnso\Permissions\Http\Controllers;
+
+use Illuminate\Routing\Controller;
+use LaravelEnso\Permissions\Tables\Builders\PermissionTable;
+use LaravelEnso\Tables\Traits\Data;
+
+class TableData extends Controller
+{
+    use Data;
+
+    protected $tableClass = PermissionTable::class;
+}
diff --git a/src/Http/Controllers/Update.php b/src/Http/Controllers/Update.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Controllers;
+namespace LaravelEnso\Permissions\Http\Controllers;
 
 use Illuminate\Routing\Controller;
-use LaravelEnso\Permissions\App\Http\Requests\ValidatePermissionRequest;
-use LaravelEnso\Permissions\App\Models\Permission;
+use LaravelEnso\Permissions\Http\Requests\ValidatePermissionRequest;
+use LaravelEnso\Permissions\Models\Permission;
 
 class Update extends Controller
 {
diff --git a/src/Http/Middleware/VerifyRouteAccess.php b/src/Http/Middleware/VerifyRouteAccess.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Middleware;
+namespace LaravelEnso\Permissions\Http\Middleware;
 
 use Closure;
 use Illuminate\Auth\Access\AuthorizationException;
diff --git a/src/Http/Requests/ValidatePermissionRequest.php b/src/Http/Requests/ValidatePermissionRequest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Requests;
+namespace LaravelEnso\Permissions\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
diff --git a/src/Http/Resources/Permission.php b/src/Http/Resources/Permission.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace LaravelEnso\Permissions\App\Http\Resources;
+namespace LaravelEnso\Permissions\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
diff --git a/src/Models/Permission.php b/src/Models/Permission.php
diff --git a/src/Tables/Builders/PermissionTable.php b/src/Tables/Builders/PermissionTable.php
diff --git a/src/Tables/Templates/permissions.json b/src/Tables/Templates/permissions.json
diff --git a/tests/features/PermissionTest.php b/tests/features/PermissionTest.php

Original file line number	Diff line number	Diff line change
`@@ -3,33 +3,32 @@`
`3`	`3`	`namespace LaravelEnso\Permissions;`
`4`	`4`
`5`	`5`	`use Illuminate\Support\ServiceProvider;`
`6`		`-use LaravelEnso\Permissions\App\Http\Middleware\VerifyRouteAccess;`
	`6`	`+use LaravelEnso\Permissions\Http\Middleware\VerifyRouteAccess;`
`7`	`7`
`8`	`8`	`class AppServiceProvider extends ServiceProvider`
`9`	`9`	`{`
`10`	`10`	`public function boot()`
`11`	`11`	`{`
`12`		`- $this->app['router']->aliasMiddleware(`
`13`		`- 'verify-route-access', VerifyRouteAccess::class`
`14`		`- );`
	`12`	`+ $this->app['router']`
	`13`	`+ ->aliasMiddleware('verify-route-access', VerifyRouteAccess::class);`
`15`	`14`
`16`	`15`	`$this->load()`
`17`	`16`	`->publish();`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`private function load()`
`21`	`20`	`{`
`22`		`- $this->loadRoutesFrom(__DIR__.'/routes/api.php');`
	`21`	`+ $this->loadRoutesFrom(__DIR__.'/../routes/api.php');`
`23`	`22`
`24`		`- $this->loadMigrationsFrom(__DIR__.'/database/migrations');`
	`23`	`+ $this->loadMigrationsFrom(__DIR__.'/../database/migrations');`
`25`	`24`
`26`	`25`	`return $this;`
`27`	`26`	`}`
`28`	`27`
`29`	`28`	`private function publish()`
`30`	`29`	`{`
`31`	`30`	`$this->publishes([`
`32`		`- __DIR__.'/database/factories' => database_path('factories'),`
	`31`	`+ __DIR__.'/../database/factories' => database_path('factories'),`
`33`	`32`	`], ['permissions-factories', 'enso-factories']);`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace LaravelEnso\Permissions;`
`4`	`4`
`5`	`5`	`use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;`
`6`		`-use LaravelEnso\Permissions\App\Enums\Types;`
	`6`	`+use LaravelEnso\Permissions\Enums\Types;`
`7`	`7`
`8`	`8`	`class EnumServiceProvider extends ServiceProvider`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace LaravelEnso\Permissions\App\Enums;`
	`3`	`+namespace LaravelEnso\Permissions\Enums;`
`4`	`4`
`5`		`-use LaravelEnso\Enums\App\Services\Enum;`
	`5`	`+use LaravelEnso\Enums\Services\Enum;`
`6`	`6`
`7`	`7`	`class Types extends Enum`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace LaravelEnso\Permissions\App\Http\Controllers;`
	`3`	`+namespace LaravelEnso\Permissions\Http\Controllers;`
`4`	`4`
`5`	`5`	`use Illuminate\Routing\Controller;`
`6`		`-use LaravelEnso\Permissions\App\Forms\Builders\PermissionForm;`
	`6`	`+use LaravelEnso\Permissions\Forms\Builders\PermissionForm;`
`7`	`7`
`8`	`8`	`class Create extends Controller`
`9`	`9`	`{`