Added voter

Author: devggbb

src/Permission/Interface/PermissionInterface.php

@@ -5,5 +5,4 @@
 interface PermissionInterface
 {
     public function getTitle(): string;
-    public function getUserField(): ?string;
 }

src/Permission/Permission.php

@@ -8,7 +8,6 @@ class Permission implements PermissionInterface
 {
     public function __construct(
         private readonly string $title,
-        private readonly ?string $userField = null,
     )
     {
     }
@@ -17,9 +16,4 @@ public function getTitle(): string
     {
         return $this->title;
     }
-
-    public function getUserField(): ?string
-    {
-        return $this->userField;
-    }
 }

src/Security/Voter/PermissionVoter.php

@@ -27,14 +27,18 @@ protected function supports($attribute, $subject): bool
 
     protected function voteOnAttribute($attribute, $subject, TokenInterface $token): bool
     {
-        if (!$this->permissionService->isPermission($attribute, $subject)) {
+        if (!$this->permissionService->isPermission($attribute)) {
             return false;
         }
 
         /** @var UserRoleFieldInterface $user */
         $user = $this->security->getUser();
         $userRole = $user->getUserRole();
 
+        if ($subject && $subject !== $user) {
+            return false;
+        }
+
         if (!in_array($attribute, $userRole->getPermissions())) {
             return false;
         }

src/Service/PermissionService.php

@@ -22,13 +22,13 @@ public function hisPermission(string $attribute): bool
         return true;
     }
 
-    public function isPermission(string $attribute, mixed $subject = null): bool
+    public function isPermission(string $attribute): bool
     {
         if (!$this->hisPermission($attribute)) {
             return false;
         }
 
-        if (!$this->getPermission($attribute, $subject)) {
+        if (!$this->getPermission($attribute)) {
             return false;
         }
 
@@ -45,7 +45,7 @@ private function getExplodeNamePermission(string $attribute): ?array
         return $attributeParts;
     }
 
-    public function getPermission(string $attribute, mixed $subject = null): ?PermissionInterface
+    public function getPermission(string $attribute): ?PermissionInterface
     {
         $attributeParts = $this->getExplodeNamePermission($attribute);
         if (!$attributeParts) {
@@ -61,11 +61,6 @@ public function getPermission(string $attribute, mixed $subject = null): ?Permis
         $permissionGroup = new $permissionGroupClassName();
         $permission = $permissionGroup->getPermission($attribute);
 
-        if ($permission->getUserField()) {
-            // TODO: Доделать
-            dd('Доделать');
-        }
-
         return $permission;
     }
 }