Skip to content

Commit 147e648

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: updated VERSION for 2.2.11 update CONTRIBUTORS for 2.2.11 updated CHANGELOG for 2.2.11 [HttpKernel] made a small optimization to Bundle initialization minor optimalization at bundle initialization [EventDispatcher] tweaked README removed observer pattern, in favour of mediator [DoctrineBridge] normalized class names in the ORM type guesser Fix `extract` method to avoid recalculating count() for each iteration. use the correct class name to retrieve mapped class' metadata and repository [WebProfilerBundle] Fixed js escaping in time.html.twig Conflicts: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig src/Symfony/Component/HttpKernel/Kernel.php
2 parents 46aa5b5 + f32008b commit 147e648

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Kernel.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,9 @@ protected function initializeBundles()
497497
}
498498

499499
// look for orphans
500-
if (count($diff = array_values(array_diff(array_keys($directChildren), array_keys($this->bundles))))) {
500+
if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
501+
$diff = array_keys($diff);
502+
501503
throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
502504
}
503505

0 commit comments

Comments
 (0)