Skip to content

Commit bcdcafa

Browse files
Merge branch '2.7' into 2.8
Conflicts: src/Symfony/Component/Security/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php src/Symfony/Component/Security/composer.json
2 parents 953561e + ae53b65 commit bcdcafa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Resources/config/debug_prod.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<service id="debug.debug_handlers_listener" class="%debug.debug_handlers_listener.class%">
1515
<tag name="kernel.event_subscriber" />
1616
<tag name="monolog.logger" channel="php" />
17-
<argument /><!-- Exception handler -->
17+
<argument>null</argument><!-- Exception handler -->
1818
<argument type="service" id="logger" on-invalid="null" />
1919
<argument>null</argument><!-- Log levels map for enabled error levels -->
2020
<argument>null</argument>

0 commit comments

Comments
 (0)