Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 5f05a52128de · 2018-10-31T10:09:42.000+01:00
* 3.4:
  Fixed typo
  Fix ini_get() for boolean values
  SCA: fixed broken tests
  SCA: applied code style as per guidelines
  SCA: minor code tweaks
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -769,10 +769,8 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c
         if ($config['formats']) {
             $loader->load('request.xml');
 
-            $container
-                ->getDefinition('request.add_request_formats_listener')
-                ->replaceArgument(0, $config['formats'])
-            ;
+            $listener = $container->getDefinition('request.add_request_formats_listener');
+            $listener->replaceArgument(0, $config['formats']);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -769,10 +769,8 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c`
`769`	`769`	`if ($config['formats']) {`
`770`	`770`	`$loader->load('request.xml');`
`771`	`771`
`772`		`- $container`
`773`		`- ->getDefinition('request.add_request_formats_listener')`
`774`		`- ->replaceArgument(0, $config['formats'])`
`775`		`- ;`
	`772`	`+ $listener = $container->getDefinition('request.add_request_formats_listener');`
	`773`	`+ $listener->replaceArgument(0, $config['formats']);`
`776`	`774`	`}`
`777`	`775`	`}`
`778`	`776`