Merge pull request vyuldashev#161 from dualklip/master

vyuldashev · web-flow · commit 102938097fab · 2021-05-17T11:56:00.000+02:00
Adding PHP 7.4 compatibility
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.2|^8.0",
+        "php": "^7.4|^8.0",
         "spatie/laravel-permission": "^3.0|^4.0"
     },
     "autoload": {
diff --git a/src/AttachToRole.php b/src/AttachToRole.php
@@ -17,8 +17,8 @@ class AttachToRole extends Action
     /**
      * Perform the action on the given models.
      *
-     * @param  \Laravel\Nova\Fields\ActionFields  $fields
-     * @param  \Illuminate\Support\Collection  $models
+     * @param ActionFields $fields
+     * @param Collection $models
      * @return mixed
      */
     public function handle(ActionFields $fields, Collection $models)
diff --git a/src/NovaPermissionTool.php b/src/NovaPermissionTool.php
@@ -8,11 +8,11 @@
 
 class NovaPermissionTool extends Tool
 {
-    public $roleResource = Role::class;
-    public $permissionResource = Permission::class;
+    public string $roleResource = Role::class;
+    public string $permissionResource = Permission::class;
 
-    public $rolePolicy = RolePolicy::class;
-    public $permissionPolicy = PermissionPolicy::class;
+    public string $rolePolicy = RolePolicy::class;
+    public string $permissionPolicy = PermissionPolicy::class;
 
     /**
      * Perform any tasks that need to happen when the tool is booted.
@@ -30,21 +30,21 @@ public function boot()
         Gate::policy(config('permission.models.role'), $this->rolePolicy);
     }
 
-    public function roleResource(string $roleResource)
+    public function roleResource(string $roleResource): NovaPermissionTool
     {
         $this->roleResource = $roleResource;
 
         return $this;
     }
 
-    public function permissionResource(string $permissionResource)
+    public function permissionResource(string $permissionResource): NovaPermissionTool
     {
         $this->permissionResource = $permissionResource;
 
         return $this;
     }
 
-    public function rolePolicy(string $rolePolicy)
+    public function rolePolicy(string $rolePolicy): NovaPermissionTool
     {
         $this->rolePolicy = $rolePolicy;
 
diff --git a/src/Permission.php b/src/Permission.php
@@ -21,21 +21,21 @@ class Permission extends Resource
      *
      * @var string
      */
-    public static $model = \Spatie\Permission\Models\Permission::class;
+    public static string $model = \Spatie\Permission\Models\Permission::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
      *
      * @var string
      */
-    public static $title = 'name';
+    public static string $title = 'name';
 
     /**
      * The columns that should be searched.
      *
      * @var array
      */
-    public static $search = [
+    public static array $search = [
         'name',
     ];
 
@@ -49,7 +49,7 @@ public static function getModel()
      *
      * @return string
      */
-    public static function group()
+    public static function group(): string
     {
         return __('nova-permission-tool::navigation.sidebar-label');
     }
@@ -60,7 +60,7 @@ public static function group()
      * @param Request $request
      * @return bool
      */
-    public static function availableForNavigation(Request $request)
+    public static function availableForNavigation(Request $request): bool
     {
         return Gate::allows('viewAny', app(PermissionRegistrar::class)->getPermissionClass());
     }
@@ -81,7 +81,7 @@ public static function singularLabel()
      * @param Request $request
      * @return array
      */
-    public function fields(Request $request)
+    public function fields(Request $request): array
     {
         $guardOptions = collect(config('auth.guards'))->mapWithKeys(function ($value, $key) {
             return [$key => $key];
@@ -124,7 +124,7 @@ public function fields(Request $request)
      * @param Request $request
      * @return array
      */
-    public function cards(Request $request)
+    public function cards(Request $request): array
     {
         return [];
     }
@@ -135,7 +135,7 @@ public function cards(Request $request)
      * @param Request $request
      * @return array
      */
-    public function filters(Request $request)
+    public function filters(Request $request): array
     {
         return [];
     }
@@ -146,7 +146,7 @@ public function filters(Request $request)
      * @param Request $request
      * @return array
      */
-    public function lenses(Request $request)
+    public function lenses(Request $request): array
     {
         return [];
     }
@@ -157,7 +157,7 @@ public function lenses(Request $request)
      * @param Request $request
      * @return array
      */
-    public function actions(Request $request)
+    public function actions(Request $request): array
     {
         return [
             new AttachToRole,
diff --git a/src/Role.php b/src/Role.php
@@ -21,21 +21,21 @@ class Role extends Resource
      *
      * @var string
      */
-    public static $model = \Spatie\Permission\Models\Role::class;
+    public static string $model = \Spatie\Permission\Models\Role::class;
 
     /**
      * The single value that should be used to represent the resource when being displayed.
      *
      * @var string
      */
-    public static $title = 'name';
+    public static string $title = 'name';
 
     /**
      * The columns that should be searched.
      *
      * @var array
      */
-    public static $search = [
+    public static array $search = [
         'name',
     ];
 
diff --git a/src/RoleBooleanGroup.php b/src/RoleBooleanGroup.php
@@ -36,7 +36,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback
      * @param HasPermissions $model
      * @param string $attribute
      */
-    protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)
+    protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)
     {
         if (! $request->exists($requestAttribute)) {
             return;
diff --git a/src/RoleSelect.php b/src/RoleSelect.php
@@ -33,7 +33,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback
      * @param HasPermissions $model
      * @param string $attribute
      */
-    protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)
+    protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)
     {
         if (! $request->exists($requestAttribute)) {
             return;
@@ -53,7 +53,7 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
      *
      * @return $this
      */
-    public function displayUsingLabels()
+    public function displayUsingLabels(): RoleSelect
     {
         return $this->displayUsing(function ($value) {
             return collect($this->meta['options'])

Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@`
`8`	`8`
`9`	`9`	`class NovaPermissionTool extends Tool`
`10`	`10`	`{`
`11`		`- public $roleResource = Role::class;`
`12`		`- public $permissionResource = Permission::class;`
	`11`	`+ public string $roleResource = Role::class;`
	`12`	`+ public string $permissionResource = Permission::class;`
`13`	`13`
`14`		`- public $rolePolicy = RolePolicy::class;`
`15`		`- public $permissionPolicy = PermissionPolicy::class;`
	`14`	`+ public string $rolePolicy = RolePolicy::class;`
	`15`	`+ public string $permissionPolicy = PermissionPolicy::class;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* Perform any tasks that need to happen when the tool is booted.`
`@@ -30,21 +30,21 @@ public function boot()`
`30`	`30`	`Gate::policy(config('permission.models.role'), $this->rolePolicy);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public function roleResource(string $roleResource)`
	`33`	`+ public function roleResource(string $roleResource): NovaPermissionTool`
`34`	`34`	`{`
`35`	`35`	`$this->roleResource = $roleResource;`
`36`	`36`
`37`	`37`	`return $this;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function permissionResource(string $permissionResource)`
	`40`	`+ public function permissionResource(string $permissionResource): NovaPermissionTool`
`41`	`41`	`{`
`42`	`42`	`$this->permissionResource = $permissionResource;`
`43`	`43`
`44`	`44`	`return $this;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public function rolePolicy(string $rolePolicy)`
	`47`	`+ public function rolePolicy(string $rolePolicy): NovaPermissionTool`
`48`	`48`	`{`
`49`	`49`	`$this->rolePolicy = $rolePolicy;`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -21,21 +21,21 @@ class Permission extends Resource`
`21`	`21`	`*`
`22`	`22`	`* @var string`
`23`	`23`	`*/`
`24`		`- public static $model = \Spatie\Permission\Models\Permission::class;`
	`24`	`+ public static string $model = \Spatie\Permission\Models\Permission::class;`
`25`	`25`
`26`	`26`	`/**`
`27`	`27`	`* The single value that should be used to represent the resource when being displayed.`
`28`	`28`	`*`
`29`	`29`	`* @var string`
`30`	`30`	`*/`
`31`		`- public static $title = 'name';`
	`31`	`+ public static string $title = 'name';`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* The columns that should be searched.`
`35`	`35`	`*`
`36`	`36`	`* @var array`
`37`	`37`	`*/`
`38`		`- public static $search = [`
	`38`	`+ public static array $search = [`
`39`	`39`	`'name',`
`40`	`40`	`];`
`41`	`41`
`@@ -49,7 +49,7 @@ public static function getModel()`
`49`	`49`	`*`
`50`	`50`	`* @return string`
`51`	`51`	`*/`
`52`		`- public static function group()`
	`52`	`+ public static function group(): string`
`53`	`53`	`{`
`54`	`54`	`return __('nova-permission-tool::navigation.sidebar-label');`
`55`	`55`	`}`
`@@ -60,7 +60,7 @@ public static function group()`
`60`	`60`	`* @param Request $request`
`61`	`61`	`* @return bool`
`62`	`62`	`*/`
`63`		`- public static function availableForNavigation(Request $request)`
	`63`	`+ public static function availableForNavigation(Request $request): bool`
`64`	`64`	`{`
`65`	`65`	`return Gate::allows('viewAny', app(PermissionRegistrar::class)->getPermissionClass());`
`66`	`66`	`}`
`@@ -81,7 +81,7 @@ public static function singularLabel()`
`81`	`81`	`* @param Request $request`
`82`	`82`	`* @return array`
`83`	`83`	`*/`
`84`		`- public function fields(Request $request)`
	`84`	`+ public function fields(Request $request): array`
`85`	`85`	`{`
`86`	`86`	`$guardOptions = collect(config('auth.guards'))->mapWithKeys(function ($value, $key) {`
`87`	`87`	`return [$key => $key];`
`@@ -124,7 +124,7 @@ public function fields(Request $request)`
`124`	`124`	`* @param Request $request`
`125`	`125`	`* @return array`
`126`	`126`	`*/`
`127`		`- public function cards(Request $request)`
	`127`	`+ public function cards(Request $request): array`
`128`	`128`	`{`
`129`	`129`	`return [];`
`130`	`130`	`}`
`@@ -135,7 +135,7 @@ public function cards(Request $request)`
`135`	`135`	`* @param Request $request`
`136`	`136`	`* @return array`
`137`	`137`	`*/`
`138`		`- public function filters(Request $request)`
	`138`	`+ public function filters(Request $request): array`
`139`	`139`	`{`
`140`	`140`	`return [];`
`141`	`141`	`}`
`@@ -146,7 +146,7 @@ public function filters(Request $request)`
`146`	`146`	`* @param Request $request`
`147`	`147`	`* @return array`
`148`	`148`	`*/`
`149`		`- public function lenses(Request $request)`
	`149`	`+ public function lenses(Request $request): array`
`150`	`150`	`{`
`151`	`151`	`return [];`
`152`	`152`	`}`
`@@ -157,7 +157,7 @@ public function lenses(Request $request)`
`157`	`157`	`* @param Request $request`
`158`	`158`	`* @return array`
`159`	`159`	`*/`
`160`		`- public function actions(Request $request)`
	`160`	`+ public function actions(Request $request): array`
`161`	`161`	`{`
`162`	`162`	`return [`
`163`	`163`	`new AttachToRole,`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback`
`36`	`36`	`* @param HasPermissions $model`
`37`	`37`	`* @param string $attribute`
`38`	`38`	`*/`
`39`		`- protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)`
	`39`	`+ protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)`
`40`	`40`	`{`
`41`	`41`	`if (! $request->exists($requestAttribute)) {`
`42`	`42`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback`
`33`	`33`	`* @param HasPermissions $model`
`34`	`34`	`* @param string $attribute`
`35`	`35`	`*/`
`36`		`- protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)`
	`36`	`+ protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)`
`37`	`37`	`{`
`38`	`38`	`if (! $request->exists($requestAttribute)) {`
`39`	`39`	`return;`
`@@ -53,7 +53,7 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib`
`53`	`53`	`*`
`54`	`54`	`* @return $this`
`55`	`55`	`*/`
`56`		`- public function displayUsingLabels()`
	`56`	`+ public function displayUsingLabels(): RoleSelect`
`57`	`57`	`{`
`58`	`58`	`return $this->displayUsing(function ($value) {`
`59`	`59`	`return collect($this->meta['options'])`