feature #26504 [FrameworkBundle] framework.php_errors.log now accept a log level (Simperfit)

fabpot · fabpot · commit 44a6f60fdb02 · 2018-03-27T20:27:43.000+02:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [FrameworkBundle] framework.php_errors.log now accept a log level | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes  | BC breaks? | no  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | #26267  | License | MIT | Doc PR | todo  We are testing that `framework.php_errors.log` is either a bool or an int (set the value of the log level you want). This fixes #26267, so it gives a way to not log some level on production. Commits ------- 664f821 [FrameworkBundle] framework.php_errors.log now accept a log level
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -888,10 +888,14 @@ private function addPhpErrorsSection(ArrayNodeDefinition $rootNode)
                     ->info('PHP errors handling configuration')
                     ->addDefaultsIfNotSet()
                     ->children()
-                        ->booleanNode('log')
+                        ->scalarNode('log')
                             ->info('Use the app logger instead of the PHP logger for logging PHP errors.')
                             ->defaultValue($this->debug)
                             ->treatNullLike($this->debug)
+                            ->validate()
+                            ->ifTrue(function ($v) { return !(\is_int($v) || \is_bool($v)); })
+                            ->thenInvalid('The "php_errors.log" parameter should be either an integer or a boolean.')
+                           ->end()
                         ->end()
                         ->booleanNode('throw')
                             ->info('Throw PHP errors as \ErrorException instances.')
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -655,6 +655,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con
             $definition->replaceArgument(1, null);
         }
 
+        if (\is_int($config['log']) && $config['log']) {
+            $definition->replaceArgument(4, $config['log']);
+        }
+
         if (!$config['throw']) {
             $container->setParameter('debug.error_handler.throw_at', 0);
         }

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,10 @@ private function registerDebugConfiguration(array $config, ContainerBuilder $con`
`655`	`655`	`$definition->replaceArgument(1, null);`
`656`	`656`	`}`
`657`	`657`
	`658`	`+ if (\is_int($config['log']) && $config['log']) {`
	`659`	`+ $definition->replaceArgument(4, $config['log']);`
	`660`	`+ }`
	`661`	`+`
`658`	`662`	`if (!$config['throw']) {`
`659`	`663`	`$container->setParameter('debug.error_handler.throw_at', 0);`
`660`	`664`	`}`