Skip to content

Commit c493699

Browse files
Merge branch '2.7' into 2.8
* 2.7: 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 2.7.17 updated VERSION for 2.7.16 update CONTRIBUTORS for 2.7.16 updated CHANGELOG for 2.7.16 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 0321552 + da04980 commit c493699

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
@@ -466,8 +466,8 @@ protected function initializeBundles()
466466
$hierarchy[] = $name;
467467
}
468468

469-
foreach ($hierarchy as $bundle) {
470-
$this->bundleMap[$bundle] = $bundleMap;
469+
foreach ($hierarchy as $hierarchyBundle) {
470+
$this->bundleMap[$hierarchyBundle] = $bundleMap;
471471
array_pop($bundleMap);
472472
}
473473
}

0 commit comments

Comments
 (0)