Merge branch 'fix-user-menu-with-counter' into 'master'

Refactor `UserMenuBuilder` to include `User` type check for better type safety

See merge request Chill-Projet/chill-bundles!938
This commit is contained in:
2025-12-05 14:50:06 +00:00

View File

@@ -12,40 +12,45 @@ declare(strict_types=1);
namespace Chill\CalendarBundle\Menu; namespace Chill\CalendarBundle\Menu;
use Chill\CalendarBundle\Repository\InviteRepository; use Chill\CalendarBundle\Repository\InviteRepository;
use Chill\MainBundle\Entity\User;
use Chill\MainBundle\Routing\LocalMenuBuilderInterface; use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
use Chill\MainBundle\Security\ChillSecurity;
use Knp\Menu\MenuItem; use Knp\Menu\MenuItem;
use Symfony\Component\Security\Core\Security;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
final readonly class UserMenuBuilder implements LocalMenuBuilderInterface final readonly class UserMenuBuilder implements LocalMenuBuilderInterface
{ {
public function __construct( public function __construct(
private ChillSecurity $security, private Security $security,
private TranslatorInterface $translator, private TranslatorInterface $translator,
private InviteRepository $inviteRepository, private InviteRepository $inviteRepository,
) {} ) {}
public function buildMenu($menuId, MenuItem $menu, array $parameters): void public function buildMenu($menuId, MenuItem $menu, array $parameters): void
{ {
$invitationsPending = $this->inviteRepository->countPendingInvitesByUser($this->security->getUser()); $user = $this->security->getUser();
if ($this->security->isGranted('ROLE_USER')) { if ($user instanceof User) {
$menu->addChild('My calendar list', [ $invitationsPending = $this->inviteRepository->countPendingInvitesByUser($user);
'route' => 'chill_calendar_calendar_list_my',
]) if ($this->security->isGranted('ROLE_USER')) {
->setExtras([ $menu->addChild('My calendar list', [
'order' => 8, 'route' => 'chill_calendar_calendar_list_my',
'icon' => 'tasks', ])
]); ->setExtras([
$menu->addChild( 'order' => 8,
$this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]), 'icon' => 'tasks',
['route' => 'chill_calendar_invitations_list_my'] ]);
) $menu->addChild(
->setExtras([ $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
'order' => 9, ['route' => 'chill_calendar_invitations_list_my']
'icon' => 'tasks', )
'counter' => 0 < $invitationsPending ? $invitationsPending : null, ->setExtras([
]); 'order' => 9,
'icon' => 'tasks',
'counter' => 0 < $invitationsPending ? $invitationsPending : null,
]);
}
} }
} }