Skip to content

Commit 62912ab

Browse files
committed
Merge branch '4.0' into 4.1
* 4.0: fixed typo [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 00c7398 + e2a2fae commit 62912ab

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
@@ -606,10 +606,10 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
606606
* the parameters passed to the container constructor to have precedence
607607
* over the loaded ones.
608608
*
609-
* $container = new ContainerBuilder(array('foo' => 'bar'));
609+
* $container = new ContainerBuilder(new ParameterBag(array('foo' => 'bar')));
610610
* $loader = new LoaderXXX($container);
611611
* $loader->load('resource_name');
612-
* $container->register('foo', new stdClass());
612+
* $container->register('foo', 'stdClass');
613613
*
614614
* In the above example, even if the loaded resource defines a foo
615615
* parameter, the value will still be 'bar' as defined in the ContainerBuilder

0 commit comments

Comments
 (0)