Permalink
Browse files

Merge remote-tracking branch 'origin/2.4' into 2.5

* origin/2.4:
  Remove horizontal scrollbar
  minor #4285 Update security.rst (placid2000)
  Update security.rst
  • Loading branch information...
weaverryan committed Oct 15, 2014
2 parents bbcb866 + 228111b commit 459052d431dcda538cc6430fc0692994c894896f
Showing with 11 additions and 5 deletions.
  1. +1 −1 book/security.rst
  2. +10 −4 components/event_dispatcher/introduction.rst
@@ -939,7 +939,7 @@ will match any ``ip``, ``host`` or ``method``:
.....................
Once Symfony has decided which ``access_control`` entry matches (if any),
it then *enforces* access restrictions based on the ``roles`` and ``requires_channel``
it then *enforces* access restrictions based on the ``roles``, ``allow_if`` and ``requires_channel``
options:
* ``role`` If the user does not have the given role(s), then access is denied
@@ -509,8 +509,11 @@ Lazy loading listeners::
{
private $started = false;
public function myLazyListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
{
public function myLazyListener(
Event $event,
$eventName,
EventDispatcherInterface $dispatcher
) {
if (false === $this->started) {
$subscriber = new StoreSubscriber();
$dispatcher->addSubscriber($subscriber);
@@ -529,8 +532,11 @@ Dispatching another event from within a listener::
class Foo
{
public function myFooListener(Event $event, $eventName, EventDispatcherInterface $dispatcher)
{
public function myFooListener(
Event $event,
$eventName,
EventDispatcherInterface $dispatcher
) {
$dispatcher->dispatch('log', $event);
// ... more code

0 comments on commit 459052d

Please sign in to comment.