Skip to content

Commit bffad9e

Browse files
committed
Merge branch '2.4'
* 2.4: (52 commits) Fix #8205 : Deprecate file mode update when calling dumpFile Fix #10437: Catch exceptions when reloading a no-cache request Fix libxml_use_internal_errors and libxml_disable_entity_loader usage removed ini check to make uploadedfile work on gae Update OptionsResolver.php fixed comment in forms.xml file Clean KernelInterface docblocks Cast the group name as a string Fixed doc of InitAclCommand [Form] Fix "Array was modified outside object" in ResizeFormListener. Fix IBAN validator [Process] Remove unreachable code + avoid skipping tests in sigchild environment Fixed bug that incorrectly causes the "required" attribute to be omitted from select even though it contains the "multiple" attribute Added travis_retry to .travis.yml [Process] fix some typos and refactor some code [Process] Fix unit tests in sigchild disabled environment [Process] Trow exceptions in case a Process method is supposed to be called after termination fixed typo [Process] fixed fatal errors in getOutput and getErrorOutput when process was not started [Process] Fix escaping on Windows ... Conflicts: src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php src/Symfony/Component/Form/Extension/Core/EventListener/ResizeFormListener.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2 parents 7a96fdd + 041be2d commit bffad9e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

Authentication/DefaultAuthenticationSuccessHandler.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
/**
1919
* Class with the default authentication success handling logic.
2020
*
21-
* Can be optionally be extended from by the developer to alter the behaviour
22-
* while keeping the default behaviour.
23-
*
2421
* @author Fabien Potencier <fabien@symfony.com>
2522
* @author Johannes M. Schmitt <schmittjoh@gmail.com>
2623
* @author Alexander <iam.asm89@gmail.com>

Firewall.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ public function onKernelRequest(GetResponseEvent $event)
5858
}
5959

6060
// register listeners for this firewall
61-
list($listeners, $exception) = $this->map->getListeners($event->getRequest());
62-
if (null !== $exception) {
63-
$this->exceptionListeners[$event->getRequest()] = $exception;
64-
$exception->register($this->dispatcher);
61+
list($listeners, $exceptionListener) = $this->map->getListeners($event->getRequest());
62+
if (null !== $exceptionListener) {
63+
$this->exceptionListeners[$event->getRequest()] = $exceptionListener;
64+
$exceptionListener->register($this->dispatcher);
6565
}
6666

6767
// initiate the listener chain

0 commit comments

Comments
 (0)