Skip to content

Commit 247bc5c

Browse files
Merge branch '2.8' into 3.1
* 2.8: Relax 1 test failing with latest PHP versions bumped Symfony version to 2.8.10 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.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 Minor fixes [Console] Overcomplete argument exception message tweak. fixed bad auto merge Console table cleanup undefined offset fix (#19406) [EventDispatcher] Removed unused variable Conflicts: CHANGELOG-2.7.md CHANGELOG-3.0.md src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php src/Symfony/Component/Console/Tests/Helper/LegacyDialogHelperTest.php src/Symfony/Component/Console/Tests/Helper/TableTest.php src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/legacy-container9.php src/Symfony/Component/EventDispatcher/Tests/AbstractEventDispatcherTest.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/LegacyPdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents f7cd71b + c493699 commit 247bc5c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Kernel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,8 @@ protected function initializeBundles()
432432
$hierarchy[] = $name;
433433
}
434434

435-
foreach ($hierarchy as $bundle) {
436-
$this->bundleMap[$bundle] = $bundleMap;
435+
foreach ($hierarchy as $hierarchyBundle) {
436+
$this->bundleMap[$hierarchyBundle] = $bundleMap;
437437
array_pop($bundleMap);
438438
}
439439
}

Tests/Fixtures/ExtensionPresentBundle/Command/BarCommand.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command;
44

55
use Symfony\Component\Console\Command\Command;
6-
use Symfony\Component\HttpKernel\Bundle;
76

87
/**
98
* This command has a required parameter on the constructor and will be ignored by the default Bundle implementation.

0 commit comments

Comments
 (0)