@@ -23,7 +23,7 @@  | 
                                                    ||
| 23 | 23 |          $this->artisan('cache:model:clear'); | 
                                                        
| 24 | 24 |          $this->artisan('db:seed'); | 
                                                        
| 25 | 25 | |
| 26 | -        $this->beforeApplicationDestroyed(function () { | 
                                                        |
| 26 | +        $this->beforeApplicationDestroyed(function() { | 
                                                        |
| 27 | 27 |              $this->artisan('cache:model:clear'); | 
                                                        
| 28 | 28 |              $this->artisan('migrate:rollback'); | 
                                                        
| 29 | 29 | RefreshDatabaseState::$migrated = false;  | 
                                                        
@@ -16,67 +16,67 @@ discard block  | 
                                                    ||
| 16 | 16 |          $tableNames = config('permission.table_names'); | 
                                                        
| 17 | 17 |          $columnNames = config('permission.column_names'); | 
                                                        
| 18 | 18 | |
| 19 | -        Schema::create($tableNames['permissions'], function (Blueprint $table) { | 
                                                        |
| 19 | +        Schema::create($tableNames[ 'permissions' ], function(Blueprint $table) { | 
                                                        |
| 20 | 20 |              $table->increments('id'); | 
                                                        
| 21 | 21 |              $table->string('name'); | 
                                                        
| 22 | 22 |              $table->string('guard_name'); | 
                                                        
| 23 | 23 | $table->timestamps();  | 
                                                        
| 24 | 24 | });  | 
                                                        
| 25 | 25 | |
| 26 | -        Schema::create($tableNames['roles'], function (Blueprint $table) { | 
                                                        |
| 26 | +        Schema::create($tableNames[ 'roles' ], function(Blueprint $table) { | 
                                                        |
| 27 | 27 |              $table->increments('id'); | 
                                                        
| 28 | 28 |              $table->string('name'); | 
                                                        
| 29 | 29 |              $table->string('guard_name'); | 
                                                        
| 30 | 30 | $table->timestamps();  | 
                                                        
| 31 | 31 | });  | 
                                                        
| 32 | 32 | |
| 33 | -        Schema::create($tableNames['model_has_permissions'], function (Blueprint $table) use ($tableNames, $columnNames) { | 
                                                        |
| 33 | +        Schema::create($tableNames[ 'model_has_permissions' ], function(Blueprint $table) use ($tableNames, $columnNames) { | 
                                                        |
| 34 | 34 |              $table->unsignedInteger('permission_id'); | 
                                                        
| 35 | 35 | |
| 36 | 36 |              $table->string('model_type'); | 
                                                        
| 37 | - $table->unsignedBigInteger($columnNames['model_morph_key']);  | 
                                                        |
| 38 | - $table->index([$columnNames['model_morph_key'], 'model_type', ]);  | 
                                                        |
| 37 | + $table->unsignedBigInteger($columnNames[ 'model_morph_key' ]);  | 
                                                        |
| 38 | + $table->index([ $columnNames[ 'model_morph_key' ], 'model_type', ]);  | 
                                                        |
| 39 | 39 | |
| 40 | 40 |              $table->foreign('permission_id') | 
                                                        
| 41 | 41 |                  ->references('id') | 
                                                        
| 42 | - ->on($tableNames['permissions'])  | 
                                                        |
| 42 | + ->on($tableNames[ 'permissions' ])  | 
                                                        |
| 43 | 43 |                  ->onDelete('cascade'); | 
                                                        
| 44 | 44 | |
| 45 | - $table->primary(['permission_id', $columnNames['model_morph_key'], 'model_type'],  | 
                                                        |
| 45 | + $table->primary([ 'permission_id', $columnNames[ 'model_morph_key' ], 'model_type' ],  | 
                                                        |
| 46 | 46 | 'model_has_permissions_permission_model_type_primary');  | 
                                                        
| 47 | 47 | });  | 
                                                        
| 48 | 48 | |
| 49 | -        Schema::create($tableNames['model_has_roles'], function (Blueprint $table) use ($tableNames, $columnNames) { | 
                                                        |
| 49 | +        Schema::create($tableNames[ 'model_has_roles' ], function(Blueprint $table) use ($tableNames, $columnNames) { | 
                                                        |
| 50 | 50 |              $table->unsignedInteger('role_id'); | 
                                                        
| 51 | 51 | |
| 52 | 52 |              $table->string('model_type'); | 
                                                        
| 53 | - $table->unsignedBigInteger($columnNames['model_morph_key']);  | 
                                                        |
| 54 | - $table->index([$columnNames['model_morph_key'], 'model_type', ]);  | 
                                                        |
| 53 | + $table->unsignedBigInteger($columnNames[ 'model_morph_key' ]);  | 
                                                        |
| 54 | + $table->index([ $columnNames[ 'model_morph_key' ], 'model_type', ]);  | 
                                                        |
| 55 | 55 | |
| 56 | 56 |              $table->foreign('role_id') | 
                                                        
| 57 | 57 |                  ->references('id') | 
                                                        
| 58 | - ->on($tableNames['roles'])  | 
                                                        |
| 58 | + ->on($tableNames[ 'roles' ])  | 
                                                        |
| 59 | 59 |                  ->onDelete('cascade'); | 
                                                        
| 60 | 60 | |
| 61 | - $table->primary(['role_id', $columnNames['model_morph_key'], 'model_type'],  | 
                                                        |
| 61 | + $table->primary([ 'role_id', $columnNames[ 'model_morph_key' ], 'model_type' ],  | 
                                                        |
| 62 | 62 | 'model_has_roles_role_model_type_primary');  | 
                                                        
| 63 | 63 | });  | 
                                                        
| 64 | 64 | |
| 65 | -        Schema::create($tableNames['role_has_permissions'], function (Blueprint $table) use ($tableNames) { | 
                                                        |
| 65 | +        Schema::create($tableNames[ 'role_has_permissions' ], function(Blueprint $table) use ($tableNames) { | 
                                                        |
| 66 | 66 |              $table->unsignedInteger('permission_id'); | 
                                                        
| 67 | 67 |              $table->unsignedInteger('role_id'); | 
                                                        
| 68 | 68 | |
| 69 | 69 |              $table->foreign('permission_id') | 
                                                        
| 70 | 70 |                  ->references('id') | 
                                                        
| 71 | - ->on($tableNames['permissions'])  | 
                                                        |
| 71 | + ->on($tableNames[ 'permissions' ])  | 
                                                        |
| 72 | 72 |                  ->onDelete('cascade'); | 
                                                        
| 73 | 73 | |
| 74 | 74 |              $table->foreign('role_id') | 
                                                        
| 75 | 75 |                  ->references('id') | 
                                                        
| 76 | - ->on($tableNames['roles'])  | 
                                                        |
| 76 | + ->on($tableNames[ 'roles' ])  | 
                                                        |
| 77 | 77 |                  ->onDelete('cascade'); | 
                                                        
| 78 | 78 | |
| 79 | - $table->primary(['permission_id', 'role_id']);  | 
                                                        |
| 79 | + $table->primary([ 'permission_id', 'role_id' ]);  | 
                                                        |
| 80 | 80 | |
| 81 | 81 |              app('cache')->forget('spatie.permission.cache'); | 
                                                        
| 82 | 82 | });  | 
                                                        
@@ -91,10 +91,10 @@ discard block  | 
                                                    ||
| 91 | 91 |      { | 
                                                        
| 92 | 92 |          $tableNames = config('permission.table_names'); | 
                                                        
| 93 | 93 | |
| 94 | - Schema::drop($tableNames['role_has_permissions']);  | 
                                                        |
| 95 | - Schema::drop($tableNames['model_has_roles']);  | 
                                                        |
| 96 | - Schema::drop($tableNames['model_has_permissions']);  | 
                                                        |
| 97 | - Schema::drop($tableNames['roles']);  | 
                                                        |
| 98 | - Schema::drop($tableNames['permissions']);  | 
                                                        |
| 94 | + Schema::drop($tableNames[ 'role_has_permissions' ]);  | 
                                                        |
| 95 | + Schema::drop($tableNames[ 'model_has_roles' ]);  | 
                                                        |
| 96 | + Schema::drop($tableNames[ 'model_has_permissions' ]);  | 
                                                        |
| 97 | + Schema::drop($tableNames[ 'roles' ]);  | 
                                                        |
| 98 | + Schema::drop($tableNames[ 'permissions' ]);  | 
                                                        |
| 99 | 99 | }  | 
                                                        
| 100 | 100 | }  | 
                                                        
@@ -36,6 +36,6 @@  | 
                                                    ||
| 36 | 36 | }  | 
                                                        
| 37 | 37 | |
| 38 | 38 |      public function clearPermissionCache() :void{ | 
                                                        
| 39 | -        app()['cache']->forget('spatie.permission.cache'); | 
                                                        |
| 39 | +        app()[ 'cache' ]->forget('spatie.permission.cache'); | 
                                                        |
| 40 | 40 | }  | 
                                                        
| 41 | 41 | }  | 
                                                        
@@ -25,7 +25,7 @@  | 
                                                    ||
| 25 | 25 | */  | 
                                                        
| 26 | 26 | public function register()  | 
                                                        
| 27 | 27 |      { | 
                                                        
| 28 | -        $this->app->bind(NotificationServiceContract::class, function () { | 
                                                        |
| 28 | +        $this->app->bind(NotificationServiceContract::class, function() { | 
                                                        |
| 29 | 29 | return new NotificationService(new UserService());  | 
                                                        
| 30 | 30 | });  | 
                                                        
| 31 | 31 | }  | 
                                                        
@@ -13,7 +13,7 @@  | 
                                                    ||
| 13 | 13 | */  | 
                                                        
| 14 | 14 | public function up()  | 
                                                        
| 15 | 15 |      { | 
                                                        
| 16 | -        Schema::create('notifications', function (Blueprint $table) { | 
                                                        |
| 16 | +        Schema::create('notifications', function(Blueprint $table) { | 
                                                        |
| 17 | 17 |              $table->uuid('id')->primary(); | 
                                                        
| 18 | 18 |              $table->string('type'); | 
                                                        
| 19 | 19 |              $table->morphs('notifiable'); | 
                                                        
@@ -30,13 +30,15 @@  | 
                                                    ||
| 30 | 30 | |
| 31 | 31 | public function find($id): ?Notification  | 
                                                        
| 32 | 32 |      { | 
                                                        
| 33 | - if ($id instanceof Notification)  | 
                                                        |
| 34 | - return $id;  | 
                                                        |
| 33 | +        if ($id instanceof Notification) { | 
                                                        |
| 34 | + return $id;  | 
                                                        |
| 35 | + }  | 
                                                        |
| 35 | 36 | |
| 36 | 37 | $notification = Notification::find($id);  | 
                                                        
| 37 | 38 | |
| 38 | - if ($notification === null)  | 
                                                        |
| 39 | - throw new NotFoundHttpException();  | 
                                                        |
| 39 | +        if ($notification === null) { | 
                                                        |
| 40 | + throw new NotFoundHttpException();  | 
                                                        |
| 41 | + }  | 
                                                        |
| 40 | 42 | |
| 41 | 43 | return $notification;  | 
                                                        
| 42 | 44 | }  | 
                                                        
@@ -13,9 +13,9 @@  | 
                                                    ||
| 13 | 13 | |
| 14 | 14 | use Modules\Authorization\Entities\Permission;  | 
                                                        
| 15 | 15 | |
| 16 | -Route::get('/{id}', 'MachineController@show')->middleware(['permission:'.Permission::SHOW_MACHINE]); | 
                                                        |
| 17 | -Route::patch('/{id}', 'MachineController@update')->middleware(['permission:'.Permission::UPDATE_MACHINE]); | 
                                                        |
| 18 | -Route::delete('/{id}', 'MachineController@destroy')->middleware(['permission:'.Permission::DELETE_MACHINE]); | 
                                                        |
| 16 | +Route::get('/{id}', 'MachineController@show')->middleware([ 'permission:'.Permission::SHOW_MACHINE ]); | 
                                                        |
| 17 | +Route::patch('/{id}', 'MachineController@update')->middleware([ 'permission:'.Permission::UPDATE_MACHINE ]); | 
                                                        |
| 18 | +Route::delete('/{id}', 'MachineController@destroy')->middleware([ 'permission:'.Permission::DELETE_MACHINE ]); | 
                                                        |
| 19 | 19 | |
| 20 | -Route::post('/', 'MachineController@store')->middleware(['permission:'.Permission::CREATE_MACHINE]); | 
                                                        |
| 21 | -Route::get('/', 'MachineController@index')->middleware(['permission:'.Permission::SHOW_MACHINE]); | 
                                                        |
| 20 | +Route::post('/', 'MachineController@store')->middleware([ 'permission:'.Permission::CREATE_MACHINE ]); | 
                                                        |
| 21 | +Route::get('/', 'MachineController@index')->middleware([ 'permission:'.Permission::SHOW_MACHINE ]); | 
                                                        |
@@ -12,7 +12,7 @@  | 
                                                    ||
| 12 | 12 | */  | 
                                                        
| 13 | 13 | public function up()  | 
                                                        
| 14 | 14 |      { | 
                                                        
| 15 | -        Schema::create('users', function (Blueprint $table) { | 
                                                        |
| 15 | +        Schema::create('users', function(Blueprint $table) { | 
                                                        |
| 16 | 16 |              $table->increments('id'); | 
                                                        
| 17 | 17 |              $table->string('identity_id')->unique(); | 
                                                        
| 18 | 18 |              $table->string('email'); | 
                                                        
@@ -22,13 +22,15 @@  | 
                                                    ||
| 22 | 22 | |
| 23 | 23 | public function find($id): ?User  | 
                                                        
| 24 | 24 |      { | 
                                                        
| 25 | - if ($id instanceof User)  | 
                                                        |
| 26 | - return $id;  | 
                                                        |
| 25 | +        if ($id instanceof User) { | 
                                                        |
| 26 | + return $id;  | 
                                                        |
| 27 | + }  | 
                                                        |
| 27 | 28 | |
| 28 | 29 | $user = User::find($id);  | 
                                                        
| 29 | 30 | |
| 30 | - if ($user === null)  | 
                                                        |
| 31 | - throw new NotFoundHttpException();  | 
                                                        |
| 31 | +        if ($user === null) { | 
                                                        |
| 32 | + throw new NotFoundHttpException();  | 
                                                        |
| 33 | + }  | 
                                                        |
| 32 | 34 | |
| 33 | 35 | return $user;  | 
                                                        
| 34 | 36 | }  |