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

weaverryan · weaverryan · commit 459052d431dc · 2014-10-15T11:49:09.000-04:00
* origin/2.4: Remove horizontal scrollbar minor #4285 Update security.rst (placid2000) Update security.rst
diff --git a/book/security.rst b/book/security.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
diff --git a/components/event_dispatcher/introduction.rst b/components/event_dispatcher/introduction.rst
@@ -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
