Skip to content

Commit f8df03e

Browse files
blued-gearblued-gear
committed
fix deprecation of controller function entities without explicit MapEntity
1 parent c253dd2 commit f8df03e

35 files changed

+284
-103
lines changed

‎src/Controller/AjaxController.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
use Doctrine\DBAL\ParameterType;
3131
use Doctrine\ORM\EntityManagerInterface;
3232
use Psr\Log\LoggerInterface;
33+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
3334
use Symfony\Bundle\SecurityBundle\Security;
3435
use Symfony\Component\Emoji\EmojiTransliterator;
3536
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -106,7 +107,7 @@ public function fetchEmbed(Embed $embed, Request $request): JsonResponse
106107
);
107108
}
108109

109-
public function fetchEntry(Entry $entry, Request $request): JsonResponse
110+
public function fetchEntry(#[MapEntity(id: 'id')] Entry $entry, Request $request): JsonResponse
110111
{
111112
return new JsonResponse(
112113
[
@@ -123,7 +124,7 @@ public function fetchEntry(Entry $entry, Request $request): JsonResponse
123124
);
124125
}
125126

126-
public function fetchEntryComment(EntryComment $comment): JsonResponse
127+
public function fetchEntryComment(#[MapEntity(id: 'id')] EntryComment $comment): JsonResponse
127128
{
128129
return new JsonResponse(
129130
[
@@ -142,7 +143,7 @@ public function fetchEntryComment(EntryComment $comment): JsonResponse
142143
);
143144
}
144145

145-
public function fetchPost(Post $post): JsonResponse
146+
public function fetchPost(#[MapEntity(id: 'id')] Post $post): JsonResponse
146147
{
147148
return new JsonResponse(
148149
[
@@ -159,7 +160,7 @@ public function fetchPost(Post $post): JsonResponse
159160
);
160161
}
161162

162-
public function fetchPostComment(PostComment $comment): JsonResponse
163+
public function fetchPostComment(#[MapEntity(id: 'id')] PostComment $comment): JsonResponse
163164
{
164165
return new JsonResponse(
165166
[
@@ -176,7 +177,7 @@ public function fetchPostComment(PostComment $comment): JsonResponse
176177
);
177178
}
178179

179-
public function fetchPostComments(Post $post, PostCommentRepository $repository): JsonResponse
180+
public function fetchPostComments(#[MapEntity(id: 'id')] Post $post, PostCommentRepository $repository): JsonResponse
180181
{
181182
$criteria = new PostCommentPageView(1, $this->security);
182183
$criteria->post = $post;
@@ -218,7 +219,7 @@ public function fetchOnline(
218219
]);
219220
}
220221

221-
public function fetchUserPopup(User $user, UserNoteManager $manager): JsonResponse
222+
public function fetchUserPopup(#[MapEntity(mapping: ['username' => 'username'])] User $user, UserNoteManager $manager): JsonResponse
222223
{
223224
if ($this->getUser()) {
224225
$dto = $manager->createDto($this->getUserOrThrow(), $user);

‎src/Controller/Domain/DomainBlockController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Domain;
99
use App\Service\DomainManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\JsonResponse;
1112
use Symfony\Component\HttpFoundation\Request;
1213
use Symfony\Component\HttpFoundation\Response;
@@ -20,7 +21,7 @@ public function __construct(
2021
}
2122

2223
#[IsGranted('ROLE_USER')]
23-
public function block(Domain $domain, Request $request): Response
24+
public function block(#[MapEntity(mapping: ['name' => 'name'])] Domain $domain, Request $request): Response
2425
{
2526
$this->manager->block($domain, $this->getUserOrThrow());
2627

@@ -32,7 +33,7 @@ public function block(Domain $domain, Request $request): Response
3233
}
3334

3435
#[IsGranted('ROLE_USER')]
35-
public function unblock(Domain $domain, Request $request): Response
36+
public function unblock(#[MapEntity(mapping: ['name' => 'name'])] Domain $domain, Request $request): Response
3637
{
3738
$this->manager->unblock($domain, $this->getUserOrThrow());
3839

‎src/Controller/Domain/DomainSubController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Domain;
99
use App\Service\DomainManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\JsonResponse;
1112
use Symfony\Component\HttpFoundation\Request;
1213
use Symfony\Component\HttpFoundation\Response;
@@ -20,7 +21,7 @@ public function __construct(
2021
}
2122

2223
#[IsGranted('ROLE_USER')]
23-
public function subscribe(Domain $domain, Request $request): Response
24+
public function subscribe(#[MapEntity(mapping: ['name' => 'name'])] Domain $domain, Request $request): Response
2425
{
2526
$this->manager->subscribe($domain, $this->getUserOrThrow());
2627

@@ -32,7 +33,7 @@ public function subscribe(Domain $domain, Request $request): Response
3233
}
3334

3435
#[IsGranted('ROLE_USER')]
35-
public function unsubscribe(Domain $domain, Request $request): Response
36+
public function unsubscribe(#[MapEntity(mapping: ['name' => 'name'])] Domain $domain, Request $request): Response
3637
{
3738
$this->manager->unsubscribe($domain, $this->getUserOrThrow());
3839

‎src/Controller/Entry/Comment/EntryCommentFrontController.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,13 @@ public function __construct(
2323
) {
2424
}
2525

26-
public function front(?Magazine $magazine, ?string $sortBy, ?string $time, Request $request, #[MapQueryParameter] ?string $federation): Response
27-
{
26+
public function front(
27+
?Magazine $magazine,
28+
?string $sortBy,
29+
?string $time,
30+
Request $request,
31+
#[MapQueryParameter] ?string $federation,
32+
): Response {
2833
$params = [];
2934
$criteria = new EntryCommentPageView($this->getPageNb($request), $this->security);
3035
$criteria->showSortOption($criteria->resolveSort($sortBy ?? Criteria::SORT_DEFAULT))

‎src/Controller/Magazine/MagazineBlockController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Magazine;
99
use App\Service\MagazineManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\JsonResponse;
1112
use Symfony\Component\HttpFoundation\Request;
1213
use Symfony\Component\HttpFoundation\Response;
@@ -20,7 +21,7 @@ public function __construct(private readonly MagazineManager $manager)
2021

2122
#[IsGranted('ROLE_USER')]
2223
#[IsGranted('block', subject: 'magazine')]
23-
public function block(Magazine $magazine, Request $request): Response
24+
public function block(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
2425
{
2526
$this->manager->block($magazine, $this->getUserOrThrow());
2627

@@ -33,7 +34,7 @@ public function block(Magazine $magazine, Request $request): Response
3334

3435
#[IsGranted('ROLE_USER')]
3536
#[IsGranted('block', subject: 'magazine')]
36-
public function unblock(Magazine $magazine, Request $request): Response
37+
public function unblock(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
3738
{
3839
$this->manager->unblock($magazine, $this->getUserOrThrow());
3940

‎src/Controller/Magazine/MagazineDeleteController.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Magazine;
99
use App\Service\MagazineManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\Request;
1112
use Symfony\Component\HttpFoundation\Response;
1213
use Symfony\Component\Security\Http\Attribute\IsGranted;
@@ -19,7 +20,7 @@ public function __construct(private readonly MagazineManager $manager)
1920

2021
#[IsGranted('ROLE_USER')]
2122
#[IsGranted('delete', subject: 'magazine')]
22-
public function delete(Magazine $magazine, Request $request): Response
23+
public function delete(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
2324
{
2425
$this->validateCsrf('magazine_delete', $request->getPayload()->get('token'));
2526

@@ -30,7 +31,7 @@ public function delete(Magazine $magazine, Request $request): Response
3031

3132
#[IsGranted('ROLE_USER')]
3233
#[IsGranted('delete', subject: 'magazine')]
33-
public function restore(Magazine $magazine, Request $request): Response
34+
public function restore(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
3435
{
3536
$this->validateCsrf('magazine_restore', $request->getPayload()->get('token'));
3637

@@ -41,7 +42,7 @@ public function restore(Magazine $magazine, Request $request): Response
4142

4243
#[IsGranted('ROLE_USER')]
4344
#[IsGranted('purge', subject: 'magazine')]
44-
public function purge(Magazine $magazine, Request $request): Response
45+
public function purge(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
4546
{
4647
$this->validateCsrf('magazine_purge', $request->getPayload()->get('token'));
4748

@@ -52,7 +53,7 @@ public function purge(Magazine $magazine, Request $request): Response
5253

5354
#[IsGranted('ROLE_USER')]
5455
#[IsGranted('purge', subject: 'magazine')]
55-
public function purgeContent(Magazine $magazine, Request $request): Response
56+
public function purgeContent(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
5657
{
5758
$this->validateCsrf('magazine_purge_content', $request->getPayload()->get('token'));
5859

‎src/Controller/Magazine/MagazineModController.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,18 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Magazine;
99
use App\Repository\MagazineRepository;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\Request;
1112
use Symfony\Component\HttpFoundation\Response;
1213

1314
class MagazineModController extends AbstractController
1415
{
15-
public function __invoke(Magazine $magazine, MagazineRepository $repository, Request $request): Response
16-
{
16+
public function __invoke(
17+
#[MapEntity(mapping: ['name' => 'name'])]
18+
Magazine $magazine,
19+
MagazineRepository $repository,
20+
Request $request,
21+
): Response {
1722
$moderators = $repository->findModerators($magazine, $this->getPageNb($request));
1823

1924
return $this->render(

‎src/Controller/Magazine/MagazineModeratorRequestController.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Magazine;
99
use App\Service\MagazineManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\Request;
1112
use Symfony\Component\HttpFoundation\Response;
1213
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -20,7 +21,7 @@ public function __construct(private readonly MagazineManager $manager)
2021

2122
#[IsGranted('ROLE_USER')]
2223
#[IsGranted('subscribe', subject: 'magazine')]
23-
public function __invoke(Magazine $magazine, Request $request): Response
24+
public function __invoke(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
2425
{
2526
// applying to be a moderator is only supported for local magazines
2627
if ($magazine->apId) {

‎src/Controller/Magazine/MagazineOwnershipRequestController.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Controller\AbstractController;
88
use App\Entity\Magazine;
99
use App\Service\MagazineManager;
10+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1011
use Symfony\Component\HttpFoundation\Request;
1112
use Symfony\Component\HttpFoundation\Response;
1213
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
@@ -20,7 +21,7 @@ public function __construct(private readonly MagazineManager $manager)
2021

2122
#[IsGranted('ROLE_USER')]
2223
#[IsGranted('subscribe', subject: 'magazine')]
23-
public function toggle(Magazine $magazine, Request $request): Response
24+
public function toggle(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
2425
{
2526
// applying to be owner is only supported for local magazines
2627
if ($magazine->apId) {
@@ -35,7 +36,7 @@ public function toggle(Magazine $magazine, Request $request): Response
3536
}
3637

3738
#[IsGranted('ROLE_ADMIN')]
38-
public function accept(Magazine $magazine, Request $request): Response
39+
public function accept(#[MapEntity(mapping: ['name' => 'name'])] Magazine $magazine, Request $request): Response
3940
{
4041
$this->validateCsrf('magazine_ownership_request', $request->getPayload()->get('token'));
4142

‎src/Controller/Magazine/MagazinePeopleFrontController.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use App\Entity\Magazine;
99
use App\Repository\MagazineRepository;
1010
use App\Repository\UserRepository;
11+
use Symfony\Bridge\Doctrine\Attribute\MapEntity;
1112
use Symfony\Component\HttpFoundation\Request;
1213
use Symfony\Component\HttpFoundation\Response;
1314

@@ -20,6 +21,7 @@ public function __construct(
2021
}
2122

2223
public function __invoke(
24+
#[MapEntity(mapping: ['name' => 'name'])]
2325
Magazine $magazine,
2426
?string $category,
2527
Request $request,

0 commit comments

Comments
 (0)