Skip to content

upgraded to native enums #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/EnumServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
namespace LaravelEnso\Permissions;

use LaravelEnso\Enums\EnumServiceProvider as ServiceProvider;
use LaravelEnso\Permissions\Enums\Types;

class EnumServiceProvider extends ServiceProvider
{
public $register = [
'permissionTypes' => Types::class,
];
public $register = [];
}
19 changes: 19 additions & 0 deletions src/Enums/Type.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

namespace LaravelEnso\Permissions\Enums;

use LaravelEnso\Enums\Contracts\Frontend;

enum Type: string implements Frontend
{
case Read = 'Read';
case Write = 'Write';
case Delete = 'Delete';
case Link = 'Link';
case Menu = 'Menu';

public static function registerBy(): string
{
return 'permissionTypes';
}
}
14 changes: 0 additions & 14 deletions src/Enums/Types.php

This file was deleted.

21 changes: 21 additions & 0 deletions src/Enums/Verb.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?php

namespace LaravelEnso\Permissions\Enums;

use LaravelEnso\Enums\Contracts\Mappable;

enum Verb implements Mappable
{
public function map(): string
{
return match ($this) {
'HEAD' => Type::Read->value,
'OPTIONS' => Type::Read->value,
'GET' => Type::Read->value,
'POST' => Type::Write->value,
'PATCH' => Type::Write->value,
'PUT' => Type::Write->value,
'DELETE' => Type::Delete->value,
};
}
}
21 changes: 0 additions & 21 deletions src/Enums/Verbs.php

This file was deleted.

8 changes: 4 additions & 4 deletions src/Models/Permission.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use Illuminate\Support\Facades\Route;
use LaravelEnso\DynamicMethods\Traits\Abilities;
use LaravelEnso\Menus\Models\Menu;
use LaravelEnso\Permissions\Enums\Types;
use LaravelEnso\Permissions\Enums\Verbs;
use LaravelEnso\Permissions\Enums\Type;
use LaravelEnso\Permissions\Enums\Verb;
use LaravelEnso\Permissions\Exceptions\Permission as Exception;
use LaravelEnso\Roles\Traits\HasRoles;
use LaravelEnso\Tables\Traits\TableCache;
Expand All @@ -32,10 +32,10 @@ public function getTypeAttribute()
public function type(): string
{
if ($this->relationLoaded('menu') && $this->menu !== null) {
return __(Types::Menu);
return __(Type::Menu->value);
}

return Verbs::get($this->method()) ?? __(Types::Link);
return Verb::tryFrom($this->method())?->map() ?? __(Type::Link->value);
}

public function method()
Expand Down
7 changes: 4 additions & 3 deletions src/Tables/Templates/permissions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"appends": [
"type"
],
"columns": [{
"columns": [
{
"label": "Name",
"name": "name",
"data": "permissions.name",
Expand All @@ -32,7 +33,7 @@
"label": "Type",
"name": "type",
"data": "type",
"enum": "LaravelEnso\\Permissions\\Enums\\Types",
"enum": "LaravelEnso\\Permissions\\Enums\\Type",
"meta": [
"slot"
]
Expand All @@ -56,4 +57,4 @@
]
}
]
}
}