Index: branches/version-2_12-dev/data/module/PEAR.php =================================================================== --- branches/version-2_12-dev/data/module/PEAR.php (revision 20116) +++ branches/version-2_12-dev/data/module/PEAR.php (revision 21494) @@ -7,10 +7,4 @@ * PHP versions 4 and 5 * - * LICENSE: This source file is subject to version 3.0 of the PHP license - * that is available through the world-wide-web at the following URI: - * http://www.php.net/license/3_0.txt. If you did not receive a copy of - * the PHP License and are unable to obtain it through the web, please - * send a note to license@php.net so we can mail you a copy immediately. - * * @category pear * @package PEAR @@ -19,7 +13,7 @@ * @author Tomas V.V.Cox * @author Greg Beaver - * @copyright 1997-2006 The PHP Group - * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id$ + * @copyright 1997-2010 The Authors + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: commit 01071ee7b71e4d38c4e96fdf0ae5e411841eaec7 * @link http://pear.php.net/package/PEAR * @since File available since Release 0.1 @@ -51,13 +45,4 @@ define('OS_UNIX', true); define('PEAR_OS', 'Unix'); // blatant assumption -} - -// instant backwards compatibility -if (!defined('PATH_SEPARATOR')) { - if (OS_WINDOWS) { - define('PATH_SEPARATOR', ';'); - } else { - define('PATH_SEPARATOR', ':'); - } } @@ -93,6 +78,6 @@ * @author Greg Beaver * @copyright 1997-2006 The PHP Group - * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.4.6 + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version Release: @package_version@ * @link http://pear.php.net/package/PEAR * @see PEAR_Error @@ -102,6 +87,4 @@ class PEAR { - // {{{ properties - /** * Whether to enable internal debug messages. @@ -153,8 +136,4 @@ */ var $_expected_errors = array(); - - // }}} - - // {{{ constructor /** @@ -174,7 +153,9 @@ print "PEAR constructor called, class=$classname\n"; } + if ($error_class !== null) { $this->_error_class = $error_class; } + while ($classname && strcasecmp($classname, "pear")) { $destructor = "_$classname"; @@ -193,7 +174,4 @@ } - // }}} - // {{{ destructor - /** * Destructor (the emulated type of...). Does nothing right now, @@ -212,7 +190,4 @@ } } - - // }}} - // {{{ getStaticProperty() /** @@ -231,9 +206,14 @@ { static $properties; + if (!isset($properties[$class])) { + $properties[$class] = array(); + } + + if (!array_key_exists($var, $properties[$class])) { + $properties[$class][$var] = null; + } + return $properties[$class][$var]; } - - // }}} - // {{{ registerShutdownFunc() /** @@ -248,9 +228,12 @@ function registerShutdownFunc($func, $args = array()) { + // if we are called statically, there is a potential + // that no shutdown func is registered. Bug #6445 + if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) { + register_shutdown_function("_PEAR_call_destructors"); + $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true; + } $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args); } - - // }}} - // {{{ isError() /** @@ -267,18 +250,19 @@ function isError($data, $code = null) { - if (is_a($data, 'PEAR_Error')) { - if (is_null($code)) { - return true; - } elseif (is_string($code)) { - return $data->getMessage() == $code; - } else { - return $data->getCode() == $code; - } - } - return false; - } - - // }}} - // {{{ setErrorHandling() + if (!is_object($data)) { + return false; + } + if (!is_a($data, 'PEAR_Error')) { + return false; + } + + if (is_null($code)) { + return true; + } elseif (is_string($code)) { + return $data->getMessage() == $code; + } + + return $data->getCode() == $code; + } /** @@ -320,5 +304,4 @@ * @since PHP 4.0.5 */ - function setErrorHandling($mode = null, $options = null) { @@ -358,7 +341,4 @@ } - // }}} - // {{{ expectError() - /** * This method is used to tell which errors you expect to get. @@ -383,9 +363,6 @@ array_push($this->_expected_errors, array($code)); } - return sizeof($this->_expected_errors); - } - - // }}} - // {{{ popExpect() + return count($this->_expected_errors); + } /** @@ -399,7 +376,4 @@ return array_pop($this->_expected_errors); } - - // }}} - // {{{ _checkDelExpect() /** @@ -414,6 +388,5 @@ { $deleted = false; - - foreach ($this->_expected_errors AS $key => $error_array) { + foreach ($this->_expected_errors as $key => $error_array) { if (in_array($error_code, $error_array)) { unset($this->_expected_errors[$key][array_search($error_code, $error_array)]); @@ -426,9 +399,7 @@ } } + return $deleted; } - - // }}} - // {{{ delExpect() /** @@ -444,16 +415,11 @@ { $deleted = false; - if ((is_array($error_code) && (0 != count($error_code)))) { - // $error_code is a non-empty array here; - // we walk through it trying to unset all - // values - foreach($error_code as $key => $error) { - if ($this->_checkDelExpect($error)) { - $deleted = true; - } else { - $deleted = false; - } - } + // $error_code is a non-empty array here; we walk through it trying + // to unset all values + foreach ($error_code as $key => $error) { + $deleted = $this->_checkDelExpect($error) ? true : false; + } + return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME } elseif (!empty($error_code)) { @@ -461,15 +427,12 @@ if ($this->_checkDelExpect($error_code)) { return true; - } else { - return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME - } - } else { - // $error_code is empty - return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME - } - } - - // }}} - // {{{ raiseError() + } + + return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME + } + + // $error_code is empty + return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME + } /** @@ -525,13 +488,26 @@ $message->error_message_prefix = ''; $message = $message->getMessage(); - } - - if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) { + + // Make sure right data gets passed. + $r = new ReflectionClass($error_class); + $c = $r->getConstructor(); + $p = array_shift($c->getParameters()); + $skipmsg = ($p->getName() != 'message'); + } + + if ( + isset($this) && + isset($this->_expected_errors) && + count($this->_expected_errors) > 0 && + count($exp = end($this->_expected_errors)) + ) { if ($exp[0] == "*" || (is_int(reset($exp)) && in_array($code, $exp)) || - (is_string(reset($exp)) && in_array($message, $exp))) { + (is_string(reset($exp)) && in_array($message, $exp)) + ) { $mode = PEAR_ERROR_RETURN; } } + // No mode given, try global ones if ($mode === null) { @@ -554,15 +530,19 @@ $ec = 'PEAR_Error'; } + + if (intval(PHP_VERSION) < 5) { + // little non-eval hack to fix bug #12147 + include 'PEAR/FixPHP5PEARWarnings.php'; + return $a; + } + if ($skipmsg) { - $a = &new $ec($code, $mode, $options, $userinfo); - return $a; - } else { - $a = &new $ec($message, $code, $mode, $options, $userinfo); - return $a; - } - } - - // }}} - // {{{ throwError() + $a = new $ec($code, $mode, $options, $userinfo); + } else { + $a = new $ec($message, $code, $mode, $options, $userinfo); + } + + return $a; + } /** @@ -570,24 +550,30 @@ * message, code and userinfo are enough. * - * @param string $message - * - */ - function &throwError($message = null, - $code = null, - $userinfo = null) + * @param mixed $message a text error message or a PEAR error object + * + * @param int $code a numeric error code (it is up to your class + * to define these if you want to use codes) + * + * @param string $userinfo If you need to pass along for example debug + * information, this parameter is meant for that. + * + * @access public + * @return object a PEAR error object + * @see PEAR::raiseError + */ + function &throwError($message = null, $code = null, $userinfo = null) { if (isset($this) && is_a($this, 'PEAR')) { $a = &$this->raiseError($message, $code, null, null, $userinfo); return $a; - } else { - $a = &PEAR::raiseError($message, $code, null, null, $userinfo); - return $a; - } - } - - // }}} + } + + $a = &PEAR::raiseError($message, $code, null, null, $userinfo); + return $a; + } + function staticPushErrorHandling($mode, $options = null) { - $stack = &$GLOBALS['_PEAR_error_handler_stack']; + $stack = &$GLOBALS['_PEAR_error_handler_stack']; $def_mode = &$GLOBALS['_PEAR_default_error_mode']; $def_options = &$GLOBALS['_PEAR_default_error_options']; @@ -658,6 +644,4 @@ } - // {{{ pushErrorHandling() - /** * Push a new error handler on top of the error handler options stack. With this @@ -692,7 +676,4 @@ return true; } - - // }}} - // {{{ popErrorHandling() /** @@ -717,7 +698,4 @@ } - // }}} - // {{{ loadExtension() - /** * OS independant PHP extension load. Remember to take care @@ -729,29 +707,36 @@ function loadExtension($ext) { - if (!extension_loaded($ext)) { - // if either returns true dl() will produce a FATAL error, stop that - if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) { - return false; - } - if (OS_WINDOWS) { - $suffix = '.dll'; - } elseif (PHP_OS == 'HP-UX') { - $suffix = '.sl'; - } elseif (PHP_OS == 'AIX') { - $suffix = '.a'; - } elseif (PHP_OS == 'OSX') { - $suffix = '.bundle'; - } else { - $suffix = '.so'; - } - return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix); - } - return true; - } - - // }}} + if (extension_loaded($ext)) { + return true; + } + + // if either returns true dl() will produce a FATAL error, stop that + if ( + function_exists('dl') === false || + ini_get('enable_dl') != 1 || + ini_get('safe_mode') == 1 + ) { + return false; + } + + if (OS_WINDOWS) { + $suffix = '.dll'; + } elseif (PHP_OS == 'HP-UX') { + $suffix = '.sl'; + } elseif (PHP_OS == 'AIX') { + $suffix = '.a'; + } elseif (PHP_OS == 'OSX') { + $suffix = '.bundle'; + } else { + $suffix = '.so'; + } + + return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix); + } } -// {{{ _PEAR_call_destructors() +if (PEAR_ZE2) { + include_once 'PEAR5.php'; +} function _PEAR_call_destructors() @@ -762,7 +747,14 @@ { reset($_PEAR_destructor_object_list); - if (@PEAR::getStaticProperty('PEAR', 'destructlifo')) { + if (PEAR_ZE2) { + $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo'); + } else { + $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo'); + } + + if ($destructLifoExists) { $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list); } + while (list($k, $objref) = each($_PEAR_destructor_object_list)) { $classname = get_class($objref); @@ -783,5 +775,9 @@ // Now call the shutdown functions - if (is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) { + if ( + isset($GLOBALS['_PEAR_shutdown_funcs']) && + is_array($GLOBALS['_PEAR_shutdown_funcs']) && + !empty($GLOBALS['_PEAR_shutdown_funcs']) + ) { foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) { call_user_func_array($value[0], $value[1]); @@ -790,5 +786,4 @@ } -// }}} /** * Standard PEAR error class for PHP 4 @@ -802,6 +797,6 @@ * @author Gregory Beaver * @copyright 1997-2006 The PHP Group - * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version Release: 1.4.6 + * @license http://opensource.org/licenses/bsd-license.php New BSD License + * @version Release: @package_version@ * @link http://pear.php.net/manual/en/core.pear.pear-error.php * @see PEAR::raiseError(), PEAR::throwError() @@ -810,6 +805,4 @@ class PEAR_Error { - // {{{ properties - var $error_message_prefix = ''; var $mode = PEAR_ERROR_RETURN; @@ -820,7 +813,4 @@ var $backtrace = null; - // }}} - // {{{ constructor - /** * PEAR_Error constructor @@ -853,9 +843,18 @@ $this->mode = $mode; $this->userinfo = $userinfo; - if (function_exists("debug_backtrace")) { - if (@!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) { - $this->backtrace = debug_backtrace(); - } - } + + if (PEAR_ZE2) { + $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace'); + } else { + $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace'); + } + + if (!$skiptrace) { + $this->backtrace = debug_backtrace(); + if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) { + unset($this->backtrace[0]['object']); + } + } + if ($mode & PEAR_ERROR_CALLBACK) { $this->level = E_USER_NOTICE; @@ -865,7 +864,9 @@ $options = E_USER_NOTICE; } + $this->level = $options; $this->callback = null; } + if ($this->mode & PEAR_ERROR_PRINT) { if (is_null($options) || is_int($options)) { @@ -874,9 +875,12 @@ $format = $options; } + printf($format, $this->getMessage()); } + if ($this->mode & PEAR_ERROR_TRIGGER) { trigger_error($this->getMessage(), $this->level); } + if ($this->mode & PEAR_ERROR_DIE) { $msg = $this->getMessage(); @@ -891,9 +895,9 @@ die(sprintf($format, $msg)); } - if ($this->mode & PEAR_ERROR_CALLBACK) { - if (is_callable($this->callback)) { - call_user_func($this->callback, $this); - } - } + + if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) { + call_user_func($this->callback, $this); + } + if ($this->mode & PEAR_ERROR_EXCEPTION) { trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING); @@ -902,7 +906,4 @@ } - // }}} - // {{{ getMode() - /** * Get the error mode from an error object. @@ -911,11 +912,9 @@ * @access public */ - function getMode() { + function getMode() + { return $this->mode; } - // }}} - // {{{ getCallback() - /** * Get the callback function/method from an error object. @@ -924,12 +923,9 @@ * @access public */ - function getCallback() { + function getCallback() + { return $this->callback; } - // }}} - // {{{ getMessage() - - /** * Get the error message from an error object. @@ -942,8 +938,4 @@ return ($this->error_message_prefix . $this->message); } - - - // }}} - // {{{ getCode() /** @@ -958,7 +950,4 @@ } - // }}} - // {{{ getType() - /** * Get the name of this error/exception. @@ -972,7 +961,4 @@ } - // }}} - // {{{ getUserInfo() - /** * Get additional user-supplied information. @@ -986,7 +972,4 @@ } - // }}} - // {{{ getDebugInfo() - /** * Get additional debug information supplied by the application. @@ -999,7 +982,4 @@ return $this->getUserInfo(); } - - // }}} - // {{{ getBacktrace() /** @@ -1022,7 +1002,4 @@ } - // }}} - // {{{ addUserInfo() - function addUserInfo($info) { @@ -1034,6 +1011,8 @@ } - // }}} - // {{{ toString() + function __toString() + { + return $this->getMessage(); + } /** @@ -1043,5 +1022,6 @@ * @access public */ - function toString() { + function toString() + { $modes = array(); $levels = array(E_USER_NOTICE => 'notice', @@ -1082,6 +1062,4 @@ $this->userinfo); } - - // }}} } @@ -1093,3 +1071,2 @@ * End: */ -?> Index: branches/version-2_12-dev/data/module/PEAR5.php =================================================================== --- branches/version-2_12-dev/data/module/PEAR5.php (revision 21494) +++ branches/version-2_12-dev/data/module/PEAR5.php (revision 21494) @@ -0,0 +1,33 @@ +