Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd92865d

Browse files
committed
Replace$this->getUser() with#[CurrentUser]
1 parenteae18d7 commitd92865d

File tree

4 files changed

+27
-20
lines changed

4 files changed

+27
-20
lines changed

‎src/Controller/Activity/ActivityController.php

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
useApp\Entity\Activity\PriceOption;
88
useApp\Entity\Activity\Registration;
99
useApp\Entity\Group\Group;
10+
useApp\Entity\Security\LocalAccount;
1011
useApp\Event\RegistrationAddedEvent;
1112
useApp\Event\RegistrationRemovedEvent;
1213
useApp\Template\Attribute\MenuItem;
@@ -18,6 +19,7 @@
1819
useSymfony\Component\HttpFoundation\Request;
1920
useSymfony\Component\HttpFoundation\Response;
2021
useSymfony\Component\Routing\Annotation\Route;
22+
useSymfony\Component\Security\Http\Attribute\CurrentUser;
2123
useSymfony\Contracts\EventDispatcher\EventDispatcherInterface;
2224

2325
/**
@@ -48,10 +50,10 @@ public function __construct(EventDispatcherInterface $events, EntityManagerInter
4850
#[MenuItem(title:"Terug naar frontend", menu:"admin-profile", class:"mobile")]
4951
#[MenuItem(title:"Activiteiten")]
5052
#[Route("/", name:"index", methods: ["GET"])]
51-
publicfunctionindexAction():Response
53+
publicfunctionindexAction(#[CurrentUser] ?LocalAccount$user):Response
5254
{
5355
$groups = [];
54-
if ($user =$this->getUser()) {
56+
if ($user) {
5557
$groups =$this->em->getRepository(Group::class)->findAllFor($user);
5658
}
5759

@@ -105,7 +107,8 @@ public function callIcal(
105107
#[Route("/activity/{id}/register", name:"register", methods: ["POST"])]
106108
publicfunctionregisterAction(
107109
Request$request,
108-
Activity$activity
110+
Activity$activity,
111+
#[CurrentUser] ?LocalAccount$user
109112
):Response {
110113
$form =$this->createRegisterForm($activity);
111114

@@ -124,7 +127,7 @@ public function registerAction(
124127
// currently only a single registration per person is allowed, this check enforces that
125128
$registrations =$this->em->getRepository(Registration::class)->count([
126129
'activity' =>$activity,
127-
'person' =>$this->getUser(),
130+
'person' =>$user,
128131
'deletedate' =>null,
129132
]);
130133
if ($registrations >0) {
@@ -147,7 +150,7 @@ public function registerAction(
147150
$registration
148151
->setActivity($activity)
149152
->setOption($option)
150-
->setPerson($this->getUser())
153+
->setPerson($user)
151154
->setReservePosition($reserve ?$this->em->getRepository(Registration::class)->findAppendPosition($activity) :null)
152155
;
153156

@@ -165,7 +168,7 @@ public function registerAction(
165168
* Finds and displays a activity entity.
166169
*/
167170
#[Route("/activity/{id}", name:"show", methods: ["GET"])]
168-
publicfunctionshowAction(Activity$activity):Response
171+
publicfunctionshowAction(Activity$activity, #[CurrentUser] ?LocalAccount$user):Response
169172
{
170173
$regs =$this->em->getRepository(Registration::class)->findBy([
171174
'activity' =>$activity,
@@ -175,7 +178,7 @@ public function showAction(Activity $activity): Response
175178
$reserve =$this->em->getRepository(Registration::class)->findReserve($activity);
176179
$hasReserve =$activity->hasCapacity() && (count($regs) >=$activity->getCapacity() ||count($reserve) >0);
177180
$groups = [];
178-
if ($user =$this->getUser()) {
181+
if ($user) {
179182
$groups =$this->em->getRepository(Group::class)->findAllFor($user);
180183
}
181184
$targetoptions =$this->em->getRepository(PriceOption::class)->findUpcomingByGroup($activity,$groups);
@@ -187,10 +190,10 @@ public function showAction(Activity $activity): Response
187190
];
188191
}
189192
$unregister =null;
190-
if (null !==$this->getUser()) {
193+
if (null !==$user) {
191194
$registration =$this->em->getRepository(Registration::class)->findOneBy([
192195
'activity' =>$activity,
193-
'person' =>$this->getUser(),
196+
'person' =>$user,
194197
'deletedate' =>null,
195198
]);
196199
if (null !==$registration) {

‎src/Controller/Admin/ActivityController.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
useSymfony\Component\HttpFoundation\Request;
2121
useSymfony\Component\HttpFoundation\Response;
2222
useSymfony\Component\Routing\Annotation\Route;
23+
useSymfony\Component\Security\Http\Attribute\CurrentUser;
2324

2425
/**
2526
* Activity controller.
@@ -64,13 +65,11 @@ public function __construct(
6465
*/
6566
#[MenuItem(title:"Activiteiten", menu:"admin", activeCriteria:"admin_activity_")]
6667
#[Route("/", name:"index", methods: ["GET"])]
67-
publicfunctionindexAction():Response
68+
publicfunctionindexAction(#[CurrentUser]LocalAccount$user):Response
6869
{
6970
if ($this->isGranted('ROLE_ADMIN')) {
7071
$activities =$this->activitiesRepo->findBy([], ['start' =>'DESC']);
7172
}else {
72-
/** @var LocalAccount */
73-
$user =$this->getUser();
7473
$groups =$this->groupsRepo->findSubGroupsForPerson($user);
7574
$activities =$this->activitiesRepo->findAuthor($groups);
7675
}

‎src/Controller/Admin/AdminController.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
useSymfony\Bundle\FrameworkBundle\Controller\AbstractController;
1212
useSymfony\Component\HttpFoundation\Response;
1313
useSymfony\Component\Routing\Annotation\Route;
14+
useSymfony\Component\Security\Http\Attribute\CurrentUser;
1415

1516
/**
1617
* Activity controller.
@@ -23,13 +24,15 @@ class AdminController extends AbstractController
2324
*/
2425
#[MenuItem(title:"Overzicht", menu:"admin", activeCriteria:"admin_index", order: -1)]
2526
#[Route("/", name:"index", methods: ["GET"])]
26-
publicfunctionindexAction(ActivityRepository$activitiesRepo,GroupRepository$groupsRepo):Response
27+
publicfunctionindexAction(
28+
ActivityRepository$activitiesRepo,
29+
GroupRepository$groupsRepo,
30+
#[CurrentUser]LocalAccount$user
31+
):Response
2732
{
2833
if ($this->isGranted('ROLE_ADMIN')) {
2934
$activities =$activitiesRepo->findBy([], ['start' =>'DESC']);
3035
}else {
31-
$user =$this->getUser();
32-
assert($userinstanceof LocalAccount);
3336
$groups =$groupsRepo->findSubGroupsForPerson($user);
3437
$activities =$activitiesRepo->findAuthor($groups);
3538
}

‎src/Controller/Admin/GroupController.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
useSymfony\Component\HttpFoundation\Request;
1616
useSymfony\Component\HttpFoundation\Response;
1717
useSymfony\Component\Routing\Annotation\Route;
18+
useSymfony\Component\Security\Http\Attribute\CurrentUser;
1819

1920
/**
2021
* Group category controller.
@@ -65,11 +66,12 @@ public function newAction(Request $request, ?Group $parent): Response
6566
*/
6667
#[MenuItem(title:"Groepen", menu:"admin")]
6768
#[Route("/{id?}", name:"show", methods: ["GET"])]
68-
publicfunctionshowAction(Request$request, ?Group$group,GroupRepository$groupRepo):Response
69-
{
70-
/** @var LocalAccount */
71-
$user =$this->getUser();
72-
69+
publicfunctionshowAction(
70+
Request$request,
71+
?Group$group,
72+
GroupRepository$groupRepo,
73+
#[CurrentUser]LocalAccount$user
74+
):Response {
7375
if (null ===$group) {
7476
$this->denyAccessUnlessGranted('any_group');
7577

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp