From ab32e657a72a985d954645364cbf3b3e7afa1aab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Mar 2013 10:01:48 +0100 Subject: php-symfony2-Locale: 2.2.0 --- php-symfony2-Locale-tests-bootstrap.patch | 55 ------------------------------- 1 file changed, 55 deletions(-) delete mode 100644 php-symfony2-Locale-tests-bootstrap.patch (limited to 'php-symfony2-Locale-tests-bootstrap.patch') diff --git a/php-symfony2-Locale-tests-bootstrap.patch b/php-symfony2-Locale-tests-bootstrap.patch deleted file mode 100644 index 09e23ed..0000000 --- a/php-symfony2-Locale-tests-bootstrap.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- Symfony/Component/Locale/Tests/bootstrap.php 2012-09-20 03:42:14.000000000 -0400 -+++ Symfony/Component/Locale/Tests/bootstrap.php 2012-10-20 15:25:42.739326649 -0400 -@@ -10,17 +10,47 @@ - */ - - if (!function_exists('intl_get_error_code')) { -- require_once __DIR__.'/../Resources/stubs/functions.php'; -+ $file = 'Resources/stubs/functions.php'; -+ if (file_exists(__DIR__.'/../'.$file)) { -+ require_once __DIR__.'/../'.$file; -+ } else { -+ try { -+ // Try loading from include path -+ require_once 'Symfony/Component/Locale/'.$file; -+ } catch (Exception $e) { -+ // Fail silently so class not found fatal error still raised -+ } -+ } - } - - spl_autoload_register(function ($class) { - if (in_array(ltrim($class, '/'), array('Collator', 'IntlDateFormatter', 'Locale', 'NumberFormatter'))) { -- require_once __DIR__.'/../Resources/stubs/'.ltrim($class, '/').'.php'; -+ $file = 'Resources/stubs/'.ltrim($class, '/').'.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/Locale/'.$file; -+ } catch (Exception $e) { -+ // Fail silently so class not found fatal error still raised -+ } -+ } - } - -- if (0 === strpos(ltrim($class, '/'), 'Symfony\Component\Locale')) { -- if (file_exists($file = __DIR__.'/../'.substr(str_replace('\\', '/', $class), strlen('Symfony\Component\Locale')).'.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 -+ } - } - } - }); -- cgit