minor symfony#9664 [HttpKernel] minor optimalization at bundle initialization (fabpot)

fabpot · fabpot · commit c922d672add9 · 2013-11-30T18:33:48.000+01:00
This PR was merged into the 2.2 branch. Discussion ---------- [HttpKernel] minor optimalization at bundle initialization fast check to avoid six array method calls | Q | A | ------------- | --- | Bug fix? | [no] | New feature? | [no] | BC breaks? | [no] | Deprecations? | [|no] | Tests pass? | [yes] | Fixed tickets | symfony#9657 | License | MIT | Doc PR | That's a rebased version of symfony#9657 on 2.2 + another optimization suggested by @GromNaN Commits ------- 3330c40 [HttpKernel] made a small optimization to Bundle initialization 4ba6c0b minor optimalization at bundle initialization
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -495,7 +495,9 @@ protected function initializeBundles()
         }
 
         // look for orphans
-        if (count($diff = array_values(array_diff(array_keys($directChildren), array_keys($this->bundles))))) {
+        if (!empty($directChildren) && count($diff = array_diff_key($directChildren, $this->bundles))) {
+            $diff = array_keys($diff);
+
             throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,9 @@ protected function initializeBundles()`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`// 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`	`+`
`499`	`501`	`throw new \LogicException(sprintf('Bundle "%s" extends bundle "%s", which is not registered.', $directChildren[$diff[0]], $diff[0]));`
`500`	`502`	`}`
`501`	`503`