Skip to content

Commit 9cd5b90

Browse files
Merge branch '3.1'
* 3.1: Relax 1 test failing with latest PHP versions bumped Symfony version to 2.8.10 [Cache] Minor cleanup Remove usage of __CLASS__ outside of a class [HttpKernel] Fix variable conflicting name [Process] Fix double-fread() when reading unix pipes [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) [Validator] Fix dockblock typehint in XmlFileLoader bumped Symfony version to 3.1.4 updated VERSION for 3.1.3 updated CHANGELOG for 3.1.3 bumped Symfony version to 2.8.10 updated VERSION for 2.8.9 updated CHANGELOG for 2.8.9 bumped Symfony version to 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents 2cb967d + 247bc5c commit 9cd5b90

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Kernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@ protected function initializeBundles()
440440
$hierarchy[] = $name;
441441
}
442442

443-
foreach ($hierarchy as $bundle) {
444-
$this->bundleMap[$bundle] = $bundleMap;
443+
foreach ($hierarchy as $hierarchyBundle) {
444+
$this->bundleMap[$hierarchyBundle] = $bundleMap;
445445
array_pop($bundleMap);
446446
}
447447
}

0 commit comments

Comments
 (0)