cvs: php-src(PHP_4_4) /pear PEAR.php go-pear-list.php package-PEAR.xml

cellog Wed Aug 17 17:44:33 2005 EDT Modified files: (Branch: PHP_4_4) /php-src/pear PEAR.php go-pear-list.php package-PEAR.xml Log: re-enable XML_RPC 1.4.0 add return by ref from PEAR::raiseError http://cvs.php.net/diff.php/php-src/pear/PEAR.php?r1=1.50.2.19&r2=1.50.2.19.2.1&ty=u Index: php-src/pear/PEAR.php diff -u php-src/pear/PEAR.php:1.50.2.19 php-src/pear/PEAR.php:1.50.2.19.2.1 --- php-src/pear/PEAR.php:1.50.2.19 Mon Mar 28 11:56:58 2005 +++ php-src/pear/PEAR.php Wed Aug 17 17:44:32 2005 @@ -18,7 +18,7 @@ // | Tomas V.V.Cox <cox@idecnet.com> | // +--------------------------------------------------------------------+ // -// $Id: PEAR.php,v 1.50.2.19 2005/03/28 16:56:58 cellog Exp $ +// $Id: PEAR.php,v 1.50.2.19.2.1 2005/08/17 21:44:32 cellog Exp $ // define('PEAR_ERROR_RETURN', 1); @@ -492,7 +492,7 @@ * @see PEAR::setErrorHandling * @since PHP 4.0.5 */ - function raiseError($message = null, + function &raiseError($message = null, $code = null, $mode = null, $options = null, @@ -537,9 +537,11 @@ $ec = 'PEAR_Error'; } if ($skipmsg) { - return new $ec($code, $mode, $options, $userinfo); + $a = &new $ec($code, $mode, $options, $userinfo); + return $a; } else { - return new $ec($message, $code, $mode, $options, $userinfo); + $a = &new $ec($message, $code, $mode, $options, $userinfo); + return $a; } } @@ -553,14 +555,16 @@ * @param string $message * */ - function throwError($message = null, + function &throwError($message = null, $code = null, $userinfo = null) { if (isset($this) && is_a($this, 'PEAR')) { - return $this->raiseError($message, $code, null, null, $userinfo); + $a = &$this->raiseError($message, $code, null, null, $userinfo); + return $a; } else { - return PEAR::raiseError($message, $code, null, null, $userinfo); + $a = &PEAR::raiseError($message, $code, null, null, $userinfo); + return $a; } } http://cvs.php.net/diff.php/php-src/pear/go-pear-list.php?r1=1.12.2.3.2.1&r2=1.12.2.3.2.2&ty=u Index: php-src/pear/go-pear-list.php diff -u php-src/pear/go-pear-list.php:1.12.2.3.2.1 php-src/pear/go-pear-list.php:1.12.2.3.2.2 --- php-src/pear/go-pear-list.php:1.12.2.3.2.1 Fri Jul 1 05:41:04 2005 +++ php-src/pear/go-pear-list.php Wed Aug 17 17:44:32 2005 @@ -3,14 +3,14 @@ * that will be used to create the PEAR folder * in the windows snapshot. * See win32/build/mkdist.php for more details - * $Id: go-pear-list.php,v 1.12.2.3.2.1 2005/07/01 09:41:04 pajoye Exp $ + * $Id: go-pear-list.php,v 1.12.2.3.2.2 2005/08/17 21:44:32 cellog Exp $ */ $packages = array( // required packages for the installer "PEAR" => "1.3.5", -"XML_RPC" => "1.3.1", +"XML_RPC" => "1.4.0", "Console_Getopt" => "1.2", -"Archive_Tar" => "1.3.1", +"Archive_Tar" => "1.3.2", // required packages for the web frontend "PEAR_Frontend_Web" => "0.4", http://cvs.php.net/diff.php/php-src/pear/package-PEAR.xml?r1=1.28.2.39&r2=1.28.2.39.2.1&ty=u Index: php-src/pear/package-PEAR.xml diff -u php-src/pear/package-PEAR.xml:1.28.2.39 php-src/pear/package-PEAR.xml:1.28.2.39.2.1 --- php-src/pear/package-PEAR.xml:1.28.2.39 Mon Mar 28 11:56:58 2005 +++ php-src/pear/package-PEAR.xml Wed Aug 17 17:44:32 2005 @@ -48,14 +48,13 @@ </maintainer> </maintainers> <release> - <version>1.3.5</version> - <date>2005-02-18</date> + <version>1.3.6</version> + <date>2005-08-17</date> <state>stable</state> <license>PHP License</license> <notes> - * fix Bug #3505: pecl can't install PDO - * enhance pear run-tests dramatically - * fix Bug #3506: pear install should export the pear version into the environment + * Bump XML_RPC dependency to 1.4.0 + * return by reference from PEAR::raiseError() </notes> <provides type="class" name="OS_Guess" /> <provides type="class" name="System" /> @@ -124,7 +123,7 @@ <dep type="php" rel="ge" version="4.2"/> <dep type="pkg" rel="ge" version="1.1">Archive_Tar</dep> <dep type="pkg" rel="ge" version="1.2">Console_Getopt</dep> - <dep type="pkg" rel="ge" version="1.0.4">XML_RPC</dep> + <dep type="pkg" rel="ge" version="1.4.0">XML_RPC</dep> <dep type="ext" rel="has">xml</dep> <dep type="ext" rel="has">pcre</dep> </deps> @@ -197,5 +196,15 @@ * make pear help listing more useful (put how-to-use info at the bottom of the listing) </notes> </release> + <release> + <version>1.3.5</version> + <date>2005-02-18</date> + <state>stable</state> + <notes> + * fix Bug #3505: pecl can't install PDO + * enhance pear run-tests dramatically + * fix Bug #3506: pear install should export the pear version into the environment + </notes> + </release> </changelog> </package>