tweaks

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

src/Core/src/User/src/Entity/UserDetail.php

@@ -53,7 +53,7 @@ public function getFirstName(): ?string
         return $this->firstName;
     }
 
-    public function setFirstName(string $firstName): self
+    public function setFirstName(?string $firstName): self
     {
         $this->firstName = $firstName;
 
@@ -65,7 +65,7 @@ public function getLastName(): ?string
         return $this->lastName;
     }
 
-    public function setLastName(string $lastName): self
+    public function setLastName(?string $lastName): self
     {
         $this->lastName = $lastName;
 

src/User/src/Handler/GetUserEditFormHandler.php

@@ -10,6 +10,7 @@
 use Admin\User\Service\UserServiceInterface;
 use Core\App\Exception\NotFoundException;
 use Core\User\Entity\UserRole;
+use Core\User\Enum\UserRoleEnum;
 use Dot\DependencyInjection\Attribute\Inject;
 use Dot\FlashMessenger\FlashMessengerInterface;
 use Fig\Http\Message\StatusCodeInterface;
@@ -21,6 +22,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
+use function array_filter;
 use function array_map;
 
 class GetUserEditFormHandler implements RequestHandlerInterface
@@ -60,6 +62,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'value'    => $userRole->getUuid()->toString(),
             'selected' => $user->hasRole($userRole),
         ], $this->userRoleService->getUserRoleRepository()->findAll());
+        $userRoles = array_filter($userRoles, fn (array $role) => $role['label'] !== UserRoleEnum::Guest->value);
 
         $this->editUserAvatarForm
             ->setAttribute(

src/User/src/Handler/PostUserEditHandler.php

@@ -13,6 +13,7 @@
 use Core\App\Exception\NotFoundException;
 use Core\App\Message;
 use Core\User\Entity\UserRole;
+use Core\User\Enum\UserRoleEnum;
 use Dot\DependencyInjection\Attribute\Inject;
 use Dot\FlashMessenger\FlashMessengerInterface;
 use Dot\Log\Logger;
@@ -26,6 +27,7 @@
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
 
+use function array_filter;
 use function array_map;
 
 class PostUserEditHandler implements RequestHandlerInterface
@@ -67,6 +69,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
             'value'    => $userRole->getUuid()->toString(),
             'selected' => $user->hasRole($userRole),
         ], $this->userRoleService->getUserRoleRepository()->findAll());
+        $userRoles = array_filter($userRoles, fn (array $role) => $role['label'] !== UserRoleEnum::Guest->value);
 
         $this->editUserAvatarForm
             ->setAttribute(

src/User/src/Service/UserAvatarService.php

@@ -79,9 +79,11 @@ public function deleteAvatar(User $user): void
         $this->userAvatarRepository->deleteResource($avatar);
         $this->deleteAvatarFile($path . $avatar->getName());
 
-        $fsIterator = new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS);
-        if (! $fsIterator->valid()) {
-            rmdir($path);
+        if (file_exists($path)) {
+            $fsIterator = new FilesystemIterator($path, FilesystemIterator::SKIP_DOTS);
+            if (! $fsIterator->valid()) {
+                rmdir($path);
+            }
         }
     }