Skip to content

Commit 6dfbc44

Browse files
authoredJun 21, 2021
Merge pull request vyuldashev#164 from RVxLab/master
Fix incompatible types
2 parents 1029380 + c874e5a commit 6dfbc44

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed
 

‎src/Permission.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ class Permission extends Resource
2121
*
2222
* @var string
2323
*/
24-
public static string $model = \Spatie\Permission\Models\Permission::class;
24+
public static $model = \Spatie\Permission\Models\Permission::class;
2525

2626
/**
2727
* The single value that should be used to represent the resource when being displayed.
2828
*
2929
* @var string
3030
*/
31-
public static string $title = 'name';
31+
public static $title = 'name';
3232

3333
/**
3434
* The columns that should be searched.
3535
*
3636
* @var array
3737
*/
38-
public static array $search = [
38+
public static $search = [
3939
'name',
4040
];
4141

‎src/Role.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@ class Role extends Resource
2121
*
2222
* @var string
2323
*/
24-
public static string $model = \Spatie\Permission\Models\Role::class;
24+
public static $model = \Spatie\Permission\Models\Role::class;
2525

2626
/**
2727
* The single value that should be used to represent the resource when being displayed.
2828
*
2929
* @var string
3030
*/
31-
public static string $title = 'name';
31+
public static $title = 'name';
3232

3333
/**
3434
* The columns that should be searched.
3535
*
3636
* @var array
3737
*/
38-
public static array $search = [
38+
public static $search = [
3939
'name',
4040
];
4141

‎src/RoleBooleanGroup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback
3636
* @param HasPermissions $model
3737
* @param string $attribute
3838
*/
39-
protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)
39+
protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)
4040
{
4141
if (! $request->exists($requestAttribute)) {
4242
return;

‎src/RoleSelect.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function __construct($name, $attribute = null, callable $resolveCallback
3333
* @param HasPermissions $model
3434
* @param string $attribute
3535
*/
36-
protected function fillAttributeFromRequest(NovaRequest $request, string $requestAttribute, HasPermissions $model, string $attribute)
36+
protected function fillAttributeFromRequest(NovaRequest $request, $requestAttribute, $model, $attribute)
3737
{
3838
if (! $request->exists($requestAttribute)) {
3939
return;

0 commit comments

Comments
 (0)