diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-30 17:18:20 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-30 17:18:20 +0100 |
commit | 381bdc5921692d7f47cacf28d1038ac71e7b9c46 (patch) | |
tree | 181c44e8382f2cd97edb80571ea2df22fd2d9065 /php-symfony2-ClassLoader-tests-bootstrap.patch | |
parent | 2faf8a306885c36b39e44b0deea8f1238aeb2d2f (diff) |
php-symfony2-ClassLoader: sync with rawhide, update to 2.1.3
Diffstat (limited to 'php-symfony2-ClassLoader-tests-bootstrap.patch')
-rw-r--r-- | php-symfony2-ClassLoader-tests-bootstrap.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/php-symfony2-ClassLoader-tests-bootstrap.patch b/php-symfony2-ClassLoader-tests-bootstrap.patch new file mode 100644 index 0000000..cf7f67c --- /dev/null +++ b/php-symfony2-ClassLoader-tests-bootstrap.patch @@ -0,0 +1,24 @@ +--- Symfony/Component/ClassLoader/Tests/bootstrap.php 2012-09-20 03:42:06.000000000 -0400 ++++ Symfony/Component/ClassLoader/Tests/bootstrap.php 2012-10-20 21:56:18.505220891 -0400 +@@ -10,9 +10,18 @@ + */ + + spl_autoload_register(function ($class) { +- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\ClassLoader')) { +- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\ClassLoader')).'.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 ++ } + } + } + }); |