Skip to content

Commit 860b954

Browse files
committed
feature #1472 Improve routes requirements (HeahDude)
This PR was merged into the main branch. Discussion ---------- Improve routes requirements Commits ------- c5d6dca Improve routes requirements
2 parents 4d9888d + c5d6dca commit 860b954

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/Controller/Admin/BlogController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use Symfony\Component\HttpFoundation\Request;
2424
use Symfony\Component\HttpFoundation\Response;
2525
use Symfony\Component\Routing\Attribute\Route;
26+
use Symfony\Component\Routing\Requirement\Requirement;
2627
use Symfony\Component\Security\Http\Attribute\CurrentUser;
2728
use Symfony\Component\Security\Http\Attribute\IsGranted;
2829

@@ -118,7 +119,7 @@ public function new(
118119
/**
119120
* Finds and displays a Post entity.
120121
*/
121-
#[Route('/{id<\d+>}', name: 'admin_post_show', methods: ['GET'])]
122+
#[Route('/{id}', name: 'admin_post_show', requirements: ['id' => Requirement::POSITIVE_INT], methods: ['GET'])]
122123
public function show(Post $post): Response
123124
{
124125
// This security check can also be performed
@@ -133,7 +134,7 @@ public function show(Post $post): Response
133134
/**
134135
* Displays a form to edit an existing Post entity.
135136
*/
136-
#[Route('/{id<\d+>}/edit', name: 'admin_post_edit', methods: ['GET', 'POST'])]
137+
#[Route('/{id}/edit', name: 'admin_post_edit', requirements: ['id' => Requirement::POSITIVE_INT], methods: ['GET', 'POST'])]
137138
#[IsGranted('edit', subject: 'post', message: 'Posts can only be edited by their authors.')]
138139
public function edit(Request $request, Post $post, EntityManagerInterface $entityManager): Response
139140
{
@@ -156,7 +157,7 @@ public function edit(Request $request, Post $post, EntityManagerInterface $entit
156157
/**
157158
* Deletes a Post entity.
158159
*/
159-
#[Route('/{id}/delete', name: 'admin_post_delete', methods: ['POST'])]
160+
#[Route('/{id}/delete', name: 'admin_post_delete', requirements: ['id' => Requirement::POSITIVE_INT], methods: ['POST'])]
160161
#[IsGranted('delete', subject: 'post')]
161162
public function delete(Request $request, Post $post, EntityManagerInterface $entityManager): Response
162163
{

src/Controller/BlogController.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
use Symfony\Component\HttpFoundation\Response;
2727
use Symfony\Component\HttpKernel\Attribute\Cache;
2828
use Symfony\Component\Routing\Attribute\Route;
29+
use Symfony\Component\Routing\Requirement\Requirement;
2930
use Symfony\Component\Security\Http\Attribute\CurrentUser;
3031
use Symfony\Component\Security\Http\Attribute\IsGranted;
3132

@@ -46,7 +47,7 @@ final class BlogController extends AbstractController
4647
*/
4748
#[Route('/', name: 'blog_index', defaults: ['page' => '1', '_format' => 'html'], methods: ['GET'])]
4849
#[Route('/rss.xml', name: 'blog_rss', defaults: ['page' => '1', '_format' => 'xml'], methods: ['GET'])]
49-
#[Route('/page/{page<[1-9]\d{0,8}>}', name: 'blog_index_paginated', defaults: ['_format' => 'html'], methods: ['GET'])]
50+
#[Route('/page/{page}', name: 'blog_index_paginated', defaults: ['_format' => 'html'], requirements: ['page' => Requirement::POSITIVE_INT], methods: ['GET'])]
5051
#[Cache(smaxage: 10)]
5152
public function index(Request $request, int $page, string $_format, PostRepository $posts, TagRepository $tags): Response
5253
{
@@ -74,7 +75,7 @@ public function index(Request $request, int $page, string $_format, PostReposito
7475
*
7576
* See https://symfony.com/doc/current/doctrine.html#automatically-fetching-objects-entityvalueresolver
7677
*/
77-
#[Route('/posts/{slug}', name: 'blog_post', methods: ['GET'])]
78+
#[Route('/posts/{slug}', name: 'blog_post', requirements: ['slug' => Requirement::ASCII_SLUG], methods: ['GET'])]
7879
public function postShow(Post $post): Response
7980
{
8081
// Symfony's 'dump()' function is an improved version of PHP's 'var_dump()' but
@@ -100,7 +101,7 @@ public function postShow(Post $post): Response
100101
*
101102
* See https://symfony.com/doc/current/doctrine.html#doctrine-entity-value-resolver
102103
*/
103-
#[Route('/comment/{postSlug}/new', name: 'comment_new', methods: ['POST'])]
104+
#[Route('/comment/{postSlug}/new', name: 'comment_new', requirements: ['postSlug' => Requirement::ASCII_SLUG], methods: ['POST'])]
104105
#[IsGranted('IS_AUTHENTICATED')]
105106
public function commentNew(
106107
#[CurrentUser] User $user,

0 commit comments

Comments
 (0)