Skip to content

Commit 03fc231

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Update README.markdown Update route from annotation to attribute
2 parents 92adf5f + bdde2b8 commit 03fc231

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

README.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ We love contributors! For more information on how you can contribute, please rea
2323
the [Symfony Docs Contributing Guide](https://symfony.com/doc/current/contributing/documentation/overview.html)
2424

2525
**Important**: use `4.4` branch as the base of your pull requests, unless you are
26-
documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.2).
26+
documenting a feature that was introduced *after* Symfony 4.4 (e.g. in Symfony 5.4).
2727

2828
Build Documentation Locally
2929
---------------------------

mailer.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,9 +289,7 @@ and create an :class:`Symfony\\Component\\Mime\\Email` object::
289289

290290
class MailerController extends AbstractController
291291
{
292-
/**
293-
* @Route("/email")
294-
*/
292+
#[Route('/email')]
295293
public function sendEmail(MailerInterface $mailer): Response
296294
{
297295
$email = (new Email())

0 commit comments

Comments
 (0)