Skip to content

Commit d588908

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Update event_dispatcher.rst Update routing.rst
2 parents 78ec303 + d6c959b commit d588908

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
@@ -1524,7 +1524,6 @@ host name:
15241524
;
15251525
};
15261526
1527-
return $routes;
15281527
15291528
The value of the ``host`` option can include parameters (which is useful in
15301529
multi-tenant applications) and these parameters can be validated too with
@@ -2078,7 +2077,7 @@ each route explicitly:
20782077

20792078
.. code-block:: php-annotations
20802079
2081-
// src/Controller/MainController.php
2080+
// src/Controller/SecurityController.php
20822081
namespace App\Controller;
20832082
20842083
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -2172,7 +2171,7 @@ defined as annotations:
21722171
https://symfony.com/schema/routing/routing-1.0.xsd">
21732172
21742173
<import resource="../src/Controller/" type="annotation">
2175-
<default locale="schemes">HTTPS</prefix>
2174+
<default key="schemes">HTTPS</default>
21762175
</import>
21772176
</routes>
21782177

0 commit comments

Comments
 (0)