8000 tweaked previous merge (refs #6474) · symfony/symfony@4dcee0a · GitHub
[go: up one dir, main page]
Skip to content

Commit 4dcee0a

Browse files
fabpotfabpot
committed
tweaked previous merge (refs #6474)
1 parent 9d5f10c commit 4dcee0a

File tree

4 files changed

+23
-13
lines changed

4 files changed

+23
-13
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,17 @@ public function load(array $configs, ContainerBuilder $container)
4848
// will be used and everything will still work as expected.
4949
$loader->load('translation.xml');
5050

51-
$loader->load('debug.xml');
51+
$loader->load('debug_prod.xml');
5252

5353
if ($container->getParameter('kernel.debug')) {
54+
$loader->load('debug.xml');
55+
5456
// only HttpKernel needs the debug event dispatcher
5557
$definition = $container->findDefinition('http_kernel');
5658
$arguments = $definition->getArguments();
5759
$arguments[0] = new Reference('debug.event_dispatcher');
5860
$arguments[2] = new Reference('debug.controller_resolver');
5961
$definition->setArguments($arguments);
60-
} else {
61-
$container->removeDefinition('debug.deprecation_logger_listener');
62-
$container->setParameter('debug.container.dump', null);
6362
}
6463

6564
$configuration = $this->getConfiguration($configs, $container);

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<parameter key="debug.stopwatch.class">Symfony\Component\Stopwatch\Stopwatch</parameter>
1010
<parameter key="debug.container.dump">%kernel.cache_dir%/%kernel.container_class%.xml</parameter>
1111
<parameter key="debug.controller_resolver.class">Symfony\Component\HttpKernel\Controller\TraceableControllerResolver</parameter>
12-
<parameter key="debug.errors_logger_listener.class">Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener</parameter>
1312
</parameters>
1413

1514
<services>
@@ -34,12 +33,5 @@
3433
<argument>deprecation</argument>
3534
<argument type="service" id="logger" on-invalid="null" />
3635
</service>
37-
38-
<service id="debug.emergency_logger_listener" class="%debug.errors_logger_listener.class%">
39-
<tag name="kernel.event_subscriber" />
40-
<tag name="monolog.logger" channel="emergency" />
41-
<argument>emergency</argument>
42-
<argument type="service" id="logger" on-invalid="null" />
43-
</service>
4436
</services>
4537
</container>

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/debug_prod.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" ?>
2+
3+
<container xmlns="http://symfony.com/schema/dic/services"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
6+
7+
<parameters>
8+
<parameter key="debug.errors_logger_listener.class">Symfony\Component\HttpKernel\EventListener\ErrorsLoggerListener</parameter>
9+
</parameters>
10+
11+
<services>
12+
<service id="debug.emergency_logger_listener" class="%debug.errors_logger_listener.class%">
13+
<tag name="kernel.event_subscriber" />
14+
<tag name="monolog.logger" channel="emergency" />
15+
<argument>emergency</argument>
16+
<argument type="service" id="logger" on-invalid="null" />
17+
</service>
18+
</services>
19+
</container>

‎src/Symfony/Component/Debug/Debug.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class Debug
3131
* class loader is also registered.
3232
*
3333
* @param integer $errorReportingLevel The level of error reporting you want
34-
* @param Boolean $displayErrors Display errors (for dev environment) or just log they (production usage)
34+
* @param Boolean $displayErrors Whether to display errors (for development) or just log them (for production)
3535
*/
3636
public static function enable($errorReportingLevel = null, $displayErrors = true)
3737
{

0 commit comments

Comments
 (0)
0