Skip to content

Commit 3f115cc

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: [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
2 parents b51640d + 1143ebb commit 3f115cc

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
@@ -637,10 +637,10 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
637637
* the parameters passed to the container constructor to have precedence
638638
* over the loaded ones.
639639
*
640-
* $container = new ContainerBuilder(array('foo' => 'bar'));
640+
* $container = new ContainerBuilder(new ParameterBag(array('foo' => 'bar')));
641641
* $loader = new LoaderXXX($container);
642642
* $loader->load('resource_name');
643-
* $container->register('foo', new stdClass());
643+
* $container->register('foo', 'stdClass');
644644
*
645645
* In the above example, even if the loaded resource defines a foo
646646
* parameter, the value will still be 'bar' as defined in the ContainerBuilder

0 commit comments

Comments
 (0)