diff options
author | Remi Collet <fedora@famillecollet.com> | 2012-10-30 18:56:17 +0100 |
---|---|---|
committer | Remi Collet <fedora@famillecollet.com> | 2012-10-30 18:56:17 +0100 |
commit | 9c8af1dacbef4df66fc4448f71b7e3910e688f1a (patch) | |
tree | adab9c4d2b3bcecbea6411a5d591ec82c8bdcf69 /php-symfony2-HttpFoundation-tests-bootstrap.patch | |
parent | 8a6614cd17f2da21e2bba7bdc9f47b2613571c95 (diff) |
php-symfony2-HttpFoundation: sync with rawhide, update to 2.1.3
Diffstat (limited to 'php-symfony2-HttpFoundation-tests-bootstrap.patch')
-rw-r--r-- | php-symfony2-HttpFoundation-tests-bootstrap.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/php-symfony2-HttpFoundation-tests-bootstrap.patch b/php-symfony2-HttpFoundation-tests-bootstrap.patch new file mode 100644 index 0000000..b64af48 --- /dev/null +++ b/php-symfony2-HttpFoundation-tests-bootstrap.patch @@ -0,0 +1,44 @@ +--- Symfony/Component/HttpFoundation/Tests/bootstrap.php 2012-09-20 03:42:11.000000000 -0400 ++++ Symfony/Component/HttpFoundation/Tests/bootstrap.php 2012-10-21 00:45:21.962629147 -0400 +@@ -9,14 +9,38 @@ + * file that was distributed with this source code. + */ + ++date_default_timezone_set('UTC'); + spl_autoload_register(function ($class) { + if (ltrim('SessionHandlerInterface', '/') === $class) { +- require_once __DIR__.'/../Resources/stubs/SessionHandlerInterface.php'; ++ $file = '/Resources/stubs/SessionHandlerInterface.php'; ++ if (file_exists(__DIR__.'/..'.$file)) { ++ // Load from source tree ++ require_once __DIR__.'/..'.$file; ++ } else { ++ try { ++ // Try loading from include path ++ require_once 'Symfony/Component/HttpFoundation'.$file; ++ } catch (Exception $e) { ++ // Fail silently so class not found fatal error still raised ++ } ++ } + } + +- if (0 !== strpos(ltrim($class, '/'), 'Symfony\Component\HttpFoundation')) { ++ if (0 !== strpos(ltrim($class, '/'), 'Symfony\Component')) { + return; + } + +- require_once __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\HttpFoundation')).'.php'; ++ $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 ++ } ++ } + }); |