--- Symfony/Component/Validator/Tests/bootstrap.php 2012-09-20 03:42:20.000000000 -0400 +++ Symfony/Component/Validator/Tests/bootstrap.php 2012-10-23 21:36:52.088489051 -0400 @@ -9,10 +9,20 @@ * file that was distributed with this source code. */ +date_default_timezone_set('UTC'); spl_autoload_register(function ($class) { - if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Validator')) { - if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Validator')).'.php')) { - require_once $file; + if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) { + $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php'; + if (file_exists(__DIR__.'/../..'.$file)) { + // Load from source tree + require_once __DIR__.'/../..'.$file; + } else { + try { + // Try loading from incude path + require_once 'Symfony/Component'.$file; + } catch (Exception $e) { + // Fail silently so class not found fatal error still raised + } } } }); @@ -23,9 +33,18 @@ if (class_exists($annotationRegistry = 'Doctrine\Common\Annotations\AnnotationRegistry')) { $annotationRegistry::registerLoader(function($class) { - if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Validator')) { - if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Validator')).'.php')) { - require_once $file; + if (0 === strpos(ltrim($class, '/'), 'Symfony\Component')) { + $file = substr(str_replace('\\', '/', $class), strlen('Symfony\Component')).'.php'; + if (file_exists(__DIR__.'/../..'.$file)) { + // Load from source tree + require_once __DIR__.'/../..'.$file; + } else { + try { + // Try loading from incude path + require_once 'Symfony/Component'.$file; + } catch (Exception $e) { + // Fail silently for fall-through + } } }