diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-30 18:12:33 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-30 18:12:33 +0100 |
commit | 450662b4d1ce8e3bac3cd99a84d15caa0eec4087 (patch) | |
tree | ae2f842b3b3ceb7dbb4c8c63ebd7bac2adb7586b /php-symfony2-OptionsResolver-tests-bootstrap.patch | |
parent | 68c97cf240af30103f1257952a4f7281a70fad0d (diff) |
php-symfony2-OptionsResolver: sync with rawhide, update to 2.1.3
Diffstat (limited to 'php-symfony2-OptionsResolver-tests-bootstrap.patch')
-rw-r--r-- | php-symfony2-OptionsResolver-tests-bootstrap.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/php-symfony2-OptionsResolver-tests-bootstrap.patch b/php-symfony2-OptionsResolver-tests-bootstrap.patch new file mode 100644 index 0000000..e4f64b8 --- /dev/null +++ b/php-symfony2-OptionsResolver-tests-bootstrap.patch @@ -0,0 +1,24 @@ +--- Symfony/Component/OptionsResolver/Tests/bootstrap.php 2012-09-20 03:42:16.000000000 -0400 ++++ Symfony/Component/OptionsResolver/Tests/bootstrap.php 2012-10-08 17:43:39.793922871 -0400 +@@ -10,9 +10,18 @@ + */ + + spl_autoload_register(function ($class) { +- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\OptionsResolver')) { +- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\OptionsResolver')).'.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 ++ } + } + } + }); |