Skip to content

Commit 1091bc7

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Update event_dispatcher.rst Update routing.rst
2 parents a80c1a1 + d588908 commit 1091bc7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

components/event_dispatcher.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ from being called. In other words, the listener needs to be able to tell
404404
the dispatcher to stop all propagation of the event to future listeners
405405
(i.e. to not notify any more listeners). This can be accomplished from
406406
inside a listener via the
407-
:method:`Symfony\\Component\\EventDispatcher\\Event::stopPropagation` method::
407+
:method:`Symfony\\Contracts\\EventDispatcher\\Event::stopPropagation` method::
408408

409409
use Acme\Store\Event\OrderPlacedEvent;
410410

routing.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,6 @@ host name:
15031503
;
15041504
};
15051505
1506-
return $routes;
15071506
15081507
The value of the ``host`` option can include parameters (which is useful in
15091508
multi-tenant applications) and these parameters can be validated too with
@@ -2057,7 +2056,7 @@ each route explicitly:
20572056

20582057
.. code-block:: php-annotations
20592058
2060-
// src/Controller/MainController.php
2059+
// src/Controller/SecurityController.php
20612060
namespace App\Controller;
20622061
20632062
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -2151,7 +2150,7 @@ defined as annotations:
21512150
https://symfony.com/schema/routing/routing-1.0.xsd">
21522151
21532152
<import resource="../src/Controller/" type="annotation">
2154-
<default locale="schemes">HTTPS</prefix>
2153+
<default key="schemes">HTTPS</default>
21552154
</import>
21562155
</routes>
21572156

0 commit comments

Comments
 (0)