Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[FrameworkBundle] fix log level support config handling #26740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 2, 2018
Merged

[FrameworkBundle] fix log level support config handling #26740

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad8c8d0
add PHP errors options to XML schema definition
xabbuh Apr 2, 2018
2ee6bb4
fix log level support config handling
xabbuh Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix log level support config handling
  • Loading branch information
@xabbuh
xabbuh committed Apr 2, 2018
commit 2ee6bb489769290816e43fc8a63a686fd33ea7a1
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
}

if (\is_int($config['log']) && $config['log']) {
$definition->replaceArgument(4, $config['log']);
$definition->replaceArgument(3, $config['log']);
}

if (!$config['throw']) {
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@
</xsd:complexType>

<xsd:complexType name="php-errors">
<xsd:attribute name="log" type="xsd:boolean" />
<xsd:attribute name="log" type="xsd:string" />
<xsd:attribute name="throw" type="xsd:boolean" />
</xsd:complexType>

Expand Down
7 changes: 7 additions & 0 deletions ...ny/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/php_errors_log_level.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?php

$container->loadFromExtension('framework', array(
'php_errors' => array(
'log' => 8,
),
));
11 changes: 11 additions & 0 deletions ...ny/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/php_errors_log_level.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:php-errors log="8" />
</framework:config>
</container>
3 changes: 3 additions & 0 deletions ...ny/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/php_errors_log_level.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
php_errors:
log: 8
7 changes: 7 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,13 @@ public function testDisabledPhpErrorsConfig()
$this->assertSame(0, $container->getParameter('debug.error_handler.throw_at'));
}

public function testPhpErrorsWithLogLevel()
{
$container = $this->createContainerFromFile('php_errors_log_level');

$this->assertEquals(8, $container->getDefinition('debug.debug_handlers_listener')->getArgument(3));
}

public function testRouter()
{
$container = $this->createContainerFromFile('full');
Expand Down