diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-30 17:26:00 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-30 17:26:00 +0100 |
commit | f20038fab32366de0d2f075e43ff60db997f22d5 (patch) | |
tree | 03df3e374c1098555d2121d5a485e755dc87fe31 /php-symfony2-Config-tests-bootstrap.patch | |
parent | 6bb07470373ec869bd009b67154ba25abd29349b (diff) |
php-symfony2-Config: sync with rawhide, update to 2.1.3
Diffstat (limited to 'php-symfony2-Config-tests-bootstrap.patch')
-rw-r--r-- | php-symfony2-Config-tests-bootstrap.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/php-symfony2-Config-tests-bootstrap.patch b/php-symfony2-Config-tests-bootstrap.patch new file mode 100644 index 0000000..e77afed --- /dev/null +++ b/php-symfony2-Config-tests-bootstrap.patch @@ -0,0 +1,24 @@ +--- Symfony/Component/Config/Tests/bootstrap.php 2012-09-20 03:42:07.000000000 -0400 ++++ Symfony/Component/Config/Tests/bootstrap.php 2012-10-19 22:04:10.869060698 -0400 +@@ -10,9 +10,18 @@ + */ + + spl_autoload_register(function ($class) { +- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Config')) { +- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Config')).'.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 ++ } + } + } + }); |