Skip to content

Commit e2a2fae

Browse files
committed
Merge branch '3.4' into 4.0
* 3.4: [FrameworkBundle] fixed brackets position in method calls [Form] Fix PHPDoc for FormConfigBuilder $dataClass argument [Security] Update user phpdoc on tokens [WebProfilerBundle] Fixed icon alignment issue using Bootstrap 4.1.2 suppress side effects in 'get' or 'has' methods of NamespacedAttributeBag [HttpFoundation] reset callback on StreamedResponse when setNotModified() is called [HttpFoundation] Fixed phpdoc for get method of HeaderBag fix typo in ContainerBuilder docblock [Form/Profiler] Massively reducing memory footprint of form profiling pages by removing redundant 'form' variable from view variables. [Console] correctly return parameter's default value on "--"
2 parents 4fe862b + 3f115cc commit e2a2fae

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ContainerBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,10 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
602602
* the parameters passed to the container constructor to have precedence
603603
* over the loaded ones.
604604
*
605-
* $container = new ContainerBuilder(array('foo' => 'bar'));
605+
* $container = new ContainerBuilder(new ParameterBag(array('foo' => 'bar')));
606606
* $loader = new LoaderXXX($container);
607607
* $loader->load('resource_name');
608-
* $container->register('foo', new stdClass());
608+
* $container->register('foo', 'stdClass');
609609
*
610610
* In the above example, even if the loaded resource defines a foo
611611
* parameter, the value will still be 'bar' as defined in the ContainerBuilder

0 commit comments

Comments
 (0)