Skip to content

Commit b6d817d

Browse files
committed
Merge branch '6.3' into 6.4
* 6.3: Improving list formating Update doctrine.rst
2 parents 20f04e8 + 9a5fd75 commit b6d817d

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

doctrine.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,15 +691,15 @@ will automatically fetch them::
691691
* Fetch via primary key because {id} is in the route.
692692
*/
693693
#[Route('/product/{id}')]
694-
public function showByPk(Post $post): Response
694+
public function showByPk(Product $product): Response
695695
{
696696
}
697697

698698
/**
699699
* Perform a findOneBy() where the slug property matches {slug}.
700700
*/
701701
#[Route('/product/{slug}')]
702-
public function showBySlug(Post $post): Response
702+
public function showBySlug(Product $product): Response
703703
{
704704
}
705705

routing.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2234,8 +2234,11 @@ It will help you understand and hopefully fixing unexpected behavior in your app
22342234
Generating URLs
22352235
---------------
22362236

2237-
Routing systems are bidirectional: 1) they associate URLs with controllers (as
2238-
explained in the previous sections); 2) they generate URLs for a given route.
2237+
Routing systems are bidirectional:
2238+
2239+
1. they associate URLs with controllers (as explained in the previous sections);
2240+
2. they generate URLs for a given route.
2241+
22392242
Generating URLs from routes allows you to not write the ``<a href="...">``
22402243
values manually in your HTML templates. Also, if the URL of some route changes,
22412244
you only have to update the route configuration and all links will be updated.

0 commit comments

Comments
 (0)