merged branch mvrhov/patch-1 (PR #4975)

fabpot · fabpot · commit 407246a1da3b · 2013-04-20T23:04:32.000+02:00
This PR was merged into the master branch. Discussion ---------- Classes should be removed only when adaptive is specified This fixes a regression introduced in refactoring done on July 3rd. Commits ------- 92fbb0b Classes should be removed only when adaptive is specified
diff --git a/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php b/src/Symfony/Component/ClassLoader/ClassCollectionLoader.php
@@ -96,7 +96,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =
         $files = array();
         $content = '';
         foreach (self::getOrderedClasses($classes) as $class) {
-            if (in_array($class->getName(), $declared)) {
+            if ($adaptive && in_array($class->getName(), $declared)) {
                 continue;
             }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public static function load($classes, $cacheDir, $name, $autoReload, $adaptive =`
`96`	`96`	`$files = array();`
`97`	`97`	`$content = '';`
`98`	`98`	`foreach (self::getOrderedClasses($classes) as $class) {`
`99`		`- if (in_array($class->getName(), $declared)) {`
	`99`	`+ if ($adaptive && in_array($class->getName(), $declared)) {`
`100`	`100`	`continue;`
`101`	`101`	`}`
`102`	`102`