update libs

Author: mstodulski

composer.json

@@ -3,7 +3,7 @@
 	"license": "MIT",
 	"description": "",
 	"require": {
-		"php": ">=8.1",
+		"php": ">=8.3",
 		"phpunit/phpunit": "*"
 	},
 	"keywords": ["rbac", "permissions"],
@@ -21,7 +21,7 @@
 		}
 	},
 	"require-dev": {
-		"vimeo/psalm": "^5.15",
-		"psalm/plugin-symfony": "^5.0"
+		"vimeo/psalm": "^6.11",
+		"psalm/plugin-symfony": "^5.2"
 	}
 }

src/entities/Permission.php

@@ -11,7 +11,13 @@
 namespace mstodulski\RbacWithPermissions\entities;
 
 use mstodulski\RbacWithPermissions\interfaces\PermissionInterface;
+use Override;
 
+/**
+ * psalm notice: https://psalm.dev/361
+ * wyjaśnienie: psalm nie wie tego, że ta klasa może być nadpisana w projekcie używającym tej biblioteki
+ * @psalm-suppress ClassMustBeFinal
+ */
 class Permission implements PermissionInterface
 {
     /** @var ?Permission|?PermissionInterface */
@@ -25,6 +31,7 @@ public function setCode(string $code): void
         $this->code = $code;
     }
 
+    #[Override]
     public function getCode(): string
     {
         return $this->code;
@@ -40,6 +47,7 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
+    #[Override]
     public function getParent(): ?PermissionInterface
     {
         return $this->parent;

src/entities/Role.php

@@ -12,7 +12,13 @@
 
 use mstodulski\RbacWithPermissions\interfaces\PermissionInterface;
 use mstodulski\RbacWithPermissions\interfaces\RoleInterface;
+use Override;
 
+/**
+ * psalm notice: https://psalm.dev/361
+ * wyjaśnienie: psalm nie wie tego, że ta klasa może być nadpisana w projekcie używającym tej biblioteki
+ * @psalm-suppress ClassMustBeFinal
+ */
 class Role implements RoleInterface
 {
     private string $code = '';
@@ -24,6 +30,7 @@ class Role implements RoleInterface
     private bool $hasAllPermissions = false;
     public mixed $children = null;
 
+    #[Override]
     public function getCode(): string
     {
         return $this->code;
@@ -44,6 +51,7 @@ public function setName(string $name): void
         $this->name = $name;
     }
 
+    #[Override]
     public function getParent(): ?RoleInterface
     {
         return $this->parent;
@@ -54,6 +62,7 @@ public function setParent(?RoleInterface $parent): void
         $this->parent = $parent;
     }
 
+    #[Override]
     public function getPermissions(): array
     {
         return $this->permissions;
@@ -69,6 +78,7 @@ public function addPermission(PermissionInterface $permission): void
         $this->permissions[$permission->getCode()] = $permission;
     }
 
+    #[Override]
     public function isHasAllPermissions(): bool
     {
         return $this->hasAllPermissions;

src/services/Authorization.php

@@ -15,6 +15,11 @@
 use mstodulski\RbacWithPermissions\interfaces\PermissionInterface;
 use mstodulski\RbacWithPermissions\interfaces\RoleInterface;
 
+/**
+ * psalm notice: https://psalm.dev/361
+ * wyjaśnienie: psalm nie wie tego, że ta klasa może być nadpisana w projekcie używającym tej biblioteki
+ * @psalm-suppress ClassMustBeFinal
+ */
 class Authorization {
 
     private array $roles = [];
@@ -106,10 +111,14 @@ public function getAllSubRolesAndPermissionsForRole(RoleInterface $role): array
         return [$rolesArray, $permissionsArray];
     }
 
-    private function getSubPermissionsForPermissions(array &$permissionsArray, array $permissionsTree = null) : void
+    /**
+     * @param array<array-key, string> $permissionsArray
+     * @param null|array<array-key, PermissionInterface> $permissionsTree
+     * @return void
+     */
+    private function getSubPermissionsForPermissions(array &$permissionsArray, ?array $permissionsTree = null) : void
     {
-        if (!empty($permissionsTree)) {
-            /** @var PermissionInterface $permission */
+        if (is_array($permissionsTree) && count($permissionsTree) > 0) {
             foreach ($permissionsTree as $permission) {
                 if (in_array($permission->getCode(), $permissionsArray)) {
                     /** @var Permission $permission */
@@ -129,10 +138,15 @@ private function getSubPermissionsForPermissions(array &$permissionsArray, array
         }
     }
 
-    private function getSubRolesCodes(array &$rolesArray, array &$permissionsArray, array $rolesTree = null) : void
+    /**
+     * @param array<array-key, string> $rolesArray
+     * @param array<array-key, mixed|string> $permissionsArray
+     * @param null|array<array-key, RoleInterface> $rolesTree
+     * @return void
+     */
+    private function getSubRolesCodes(array &$rolesArray, array &$permissionsArray, ?array $rolesTree = null) : void
     {
-        if (!empty($rolesTree)) {
-            /** @var RoleInterface $role */
+        if (is_array($rolesTree) && count($rolesTree) > 0) {
             foreach ($rolesTree as $role) {
                 if (in_array($role->getCode(), $rolesArray)) {
                     foreach ($role->getPermissions() as $permission) {