Browse Source

new pear, 5.3 bug fix

tags/v1.5.5
Paweł Bukowski 11 years ago
parent
commit
0344fde5c9
2 changed files with 99 additions and 47 deletions
  1. +98
    -46
      PEAR.php
  2. +1
    -1
      include/database.php

+ 98
- 46
PEAR.php View File

@@ -6,21 +6,15 @@
*
* 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
* @author Sterling Hughes <sterling@php.net>
* @author Stig Bakken <ssb@php.net>
* @author Tomas V.V.Cox <cox@idecnet.com>
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version CVS: $Id: PEAR.php,v 1.101 2006/04/25 02:41:03 cellog Exp $
* @copyright 1997-2009 The Authors
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version CVS: $Id: PEAR.php,v 1.111 2009/04/08 23:32:04 dufuz Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -52,15 +46,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
define('PEAR_OS', 'Unix'); // blatant assumption
}

// instant backwards compatibility
if (!defined('PATH_SEPARATOR')) {
if (OS_WINDOWS) {
define('PATH_SEPARATOR', ';');
} else {
define('PATH_SEPARATOR', ':');
}
}

$GLOBALS['_PEAR_default_error_mode'] = PEAR_ERROR_RETURN;
$GLOBALS['_PEAR_default_error_options'] = E_USER_NOTICE;
$GLOBALS['_PEAR_destructor_object_list'] = array();
@@ -92,8 +77,8 @@ $GLOBALS['_PEAR_error_handler_stack'] = array();
* @author Tomas V.V. Cox <cox@idecnet.com>
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version Release: 1.6.2
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version Release: 1.8.0
* @link http://pear.php.net/package/PEAR
* @see PEAR_Error
* @since Class available since PHP 4.0.2
@@ -233,9 +218,11 @@ class PEAR
if (!isset($properties[$class])) {
$properties[$class] = array();
}

if (!array_key_exists($var, $properties[$class])) {
$properties[$class][$var] = null;
}

return $properties[$class][$var];
}

@@ -278,16 +265,17 @@ class PEAR
*/
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;
}
if (!is_a($data, 'PEAR_Error')) {
return false;
}
return false;

if (is_null($code)) {
return true;
} elseif (is_string($code)) {
return $data->getMessage() == $code;
}

return $data->getCode() == $code;
}

// }}}
@@ -455,7 +443,6 @@ class PEAR
function delExpect($error_code)
{
$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
@@ -475,10 +462,10 @@ class PEAR
} 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
}

// $error_code is empty
return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
}

// }}}
@@ -545,6 +532,7 @@ class PEAR
$mode = PEAR_ERROR_RETURN;
}
}

// No mode given, try global ones
if ($mode === null) {
// Class error handler
@@ -565,13 +553,20 @@ class PEAR
} else {
$ec = 'PEAR_Error';
}
if ($skipmsg) {
$a = &new $ec($code, $mode, $options, $userinfo);

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);
} else {
$a = &new $ec($message, $code, $mode, $options, $userinfo);
return $a;
$a = new $ec($message, $code, $mode, $options, $userinfo);
}

return $a;
}

// }}}
@@ -591,10 +586,10 @@ class PEAR
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;
}

// }}}
@@ -745,6 +740,7 @@ class PEAR
if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
return false;
}

if (OS_WINDOWS) {
$suffix = '.dll';
} elseif (PHP_OS == 'HP-UX') {
@@ -756,14 +752,51 @@ class PEAR
} else {
$suffix = '.so';
}

return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
}

return true;
}

// }}}
}

if (PEAR_ZE2) {
/**
* This is only meant for PHP 5 to get rid of certain strict warning
* that doesn't get hidden since it's in the shutdown function
*/
class PEAR5
{
/**
* If you have a class that's mostly/entirely static, and you need static
* properties, you can use this method to simulate them. Eg. in your method(s)
* do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
* You MUST use a reference, or they will not persist!
*
* @access public
* @param string $class The calling classname, to prevent clashes
* @param string $var The variable to retrieve.
* @return mixed A reference to the variable. If not set it will be
* auto initialised to NULL.
*/
static function &getStaticProperty($class, $var)
{
static $properties;
if (!isset($properties[$class])) {
$properties[$class] = array();
}

if (!array_key_exists($var, $properties[$class])) {
$properties[$class][$var] = null;
}

return $properties[$class][$var];
}
}
}

// {{{ _PEAR_call_destructors()

function _PEAR_call_destructors()
@@ -773,9 +806,16 @@ function _PEAR_call_destructors()
sizeof($_PEAR_destructor_object_list))
{
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);
while ($classname) {
@@ -813,8 +853,8 @@ function _PEAR_call_destructors()
* @author Tomas V.V. Cox <cox@idecnet.com>
* @author Gregory Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version Release: 1.6.2
* @license http://opensource.org/licenses/bsd-license.php New BSD License
* @version Release: 1.8.0
* @link http://pear.php.net/manual/en/core.pear.pear-error.php
* @see PEAR::raiseError(), PEAR::throwError()
* @since Class available since PHP 4.0.2
@@ -864,7 +904,14 @@ class PEAR_Error
$this->code = $code;
$this->mode = $mode;
$this->userinfo = $userinfo;
if (!PEAR::getStaticProperty('PEAR_Error', 'skiptrace')) {

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']);
@@ -1048,6 +1095,12 @@ class PEAR_Error

// }}}
// {{{ toString()
function __toString()
{
return $this->getMessage();
}
// }}}
// {{{ toString()

/**
* Make a string representation of this object.
@@ -1104,5 +1157,4 @@ class PEAR_Error
* tab-width: 4
* c-basic-offset: 4
* End:
*/
?>
*/

+ 1
- 1
include/database.php View File

@@ -905,6 +905,6 @@ return $ret;

}

set_magic_quotes_runtime(false);
@set_magic_quotes_runtime(false);
DB::connect();
?>

Loading…
Cancel
Save