diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-30 19:54:41 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-30 19:54:41 +0100 |
commit | 9410c772133286c7fb160799f3b19f52d2404340 (patch) | |
tree | 79e8284df7bc717e97d89fb62c6a956c228df44e /php-symfony2-Validator-tests-bootstrap.patch | |
parent | 61be78110e6a819937f341d372fcc5efe07ae69b (diff) |
php-symfony2-Validator: sync with rawhide, update to 2.1.3
Diffstat (limited to 'php-symfony2-Validator-tests-bootstrap.patch')
-rw-r--r-- | php-symfony2-Validator-tests-bootstrap.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/php-symfony2-Validator-tests-bootstrap.patch b/php-symfony2-Validator-tests-bootstrap.patch new file mode 100644 index 0000000..567f679 --- /dev/null +++ b/php-symfony2-Validator-tests-bootstrap.patch @@ -0,0 +1,48 @@ +--- 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 ++ } + } + } + |