Merge branch '4.1'

nicolas-grekas · nicolas-grekas · commit 0770f517d955 · 2018-10-31T10:23:02.000+01:00
* 4.1:
  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
@@ -797,10 +797,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
`@@ -797,10 +797,8 @@ private function registerRequestConfiguration(array $config, ContainerBuilder $c`
`797`	`797`	`if ($config['formats']) {`
`798`	`798`	`$loader->load('request.xml');`
`799`	`799`
`800`		`- $container`
`801`		`- ->getDefinition('request.add_request_formats_listener')`
`802`		`- ->replaceArgument(0, $config['formats'])`
`803`		`- ;`
	`800`	`+ $listener = $container->getDefinition('request.add_request_formats_listener');`
	`801`	`+ $listener->replaceArgument(0, $config['formats']);`
`804`	`802`	`}`
`805`	`803`	`}`
`806`	`804`