[Framework] fix ClassCollectionLoader not taking interfaces into account

This commit is contained in:
Fabien Potencier 2010-08-20 13:12:06 +02:00
parent f92accb9b7
commit 2c1fb7b3ec

View File

@ -38,18 +38,18 @@ class ClassCollectionLoader
return;
}
self::$loaded[$name] = true;
$classes = array_unique($classes);
if ($adaptive) {
// don't include already declared classes
$classes = array_diff($classes, get_declared_classes());
$classes = array_diff($classes, get_declared_classes(), get_declared_interfaces());
// the cache is different depending on which classes are already declared
$name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5);
}
self::$loaded[$name] = true;
$cache = $cacheDir.'/'.$name.'.php';
// auto-reload