Skip to content

Commit 8f540ba

Browse files
committed
Merge branch '2.8' into 3.2
* 2.8: [Console] Do not duplicate Helper::strlen() code [FrameworkBundle] Adding the extension XML [Form] Minor: Fix comment in ChoiceType [FrameworkBundle] AbstractConfigCommand: do not try registering bundles twice
2 parents 6e1f694 + 6646ee1 commit 8f540ba

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Command/AbstractConfigCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private function initializeBundles()
117117
// Re-build bundle manually to initialize DI extensions that can be extended by other bundles in their build() method
118118
// as this method is not called when the container is loaded from the cache.
119119
$container = $this->getContainerBuilder();
120-
$bundles = $this->getContainer()->get('kernel')->registerBundles();
120+
$bundles = $this->getContainer()->get('kernel')->getBundles();
121121
foreach ($bundles as $bundle) {
122122
if ($extension = $bundle->getContainerExtension()) {
123123
$container->registerExtension($extension);

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.5.9",
20+
"ext-xml": "*",
2021
"symfony/cache": "~3.2.2|~3.3",
2122
"symfony/class-loader": "~3.2",
2223
"symfony/dependency-injection": "~3.2.1|~3.3",

0 commit comments

Comments
 (0)