Skip to content

Commit 60cddb2

Browse files
committed
Merge branch '2.3' into 2.4
* 2.3: updated VERSION for 2.2.11 update CONTRIBUTORS for 2.2.11 updated CHANGELOG for 2.2.11 Fixed typo in phpdoc Handled the scenario when no entity manager is passed with closure query builder. [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. [Debug] ensured that a fatal PHP error is actually fatal after being handled by our error handler use the correct class name to retrieve mapped class' metadata and repository [WebProfilerBundle] Fixed js escaping in time.html.twig Conflicts: src/Symfony/Component/Debug/ErrorHandler.php
2 parents 64f3cb1 + 147e648 commit 60cddb2

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
@@ -495,7 +495,9 @@ protected function initializeBundles()
495495
}
496496

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

0 commit comments

Comments
 (0)