From 7ffac6efc8ee49de5d34dfe65abc2c3c6c37c75f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 20 Aug 2010 23:28:50 +0200 Subject: [PATCH] updated bootstrap --- src/Symfony/Framework/bootstrap.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Framework/bootstrap.php b/src/Symfony/Framework/bootstrap.php index 2bc7cb0c6c..a6032d8c48 100644 --- a/src/Symfony/Framework/bootstrap.php +++ b/src/Symfony/Framework/bootstrap.php @@ -138,14 +138,14 @@ class ErrorHandler { namespace Symfony\Framework; class ClassCollectionLoader { static protected $loaded; - static public function load($classes, $cacheDir, $name, $autoReload, $strict = false) { + static public function load($classes, $cacheDir, $name, $autoReload, $adaptive = false) { if (isset(self::$loaded[$name])) { return; } - $classes = array_unique($classes); - if ($strict) { - $classes = array_diff($classes, get_declared_classes()); - $name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5); } self::$loaded[$name] = true; + $classes = array_unique($classes); + if ($adaptive) { + $classes = array_diff($classes, get_declared_classes(), get_declared_interfaces()); + $name = $name.'-'.substr(md5(implode('|', $classes)), 0, 5); } $cache = $cacheDir.'/'.$name.'.php'; $reload = false; if ($autoReload) {