cvs: pear-core(PEAR_1_3) / PEAR.php go-pear-list.php package-PEAR.xml /PEAR Remote.php

cellog Wed Aug 17 18:02:01 2005 EDT Modified files: (Branch: PEAR_1_3) /pear-core PEAR.php go-pear-list.php package-PEAR.xml /pear-core/PEAR Remote.php Log: re-enable XML_RPC 1.4.0 add return by ref from PEAR::raiseError http://cvs.php.net/diff.php/pear-core/PEAR.php?r1=1.82.2.6&r2=1.82.2.7&ty=u Index: pear-core/PEAR.php diff -u pear-core/PEAR.php:1.82.2.6 pear-core/PEAR.php:1.82.2.7 --- pear-core/PEAR.php:1.82.2.6 Sat Jan 1 00:24:51 2005 +++ pear-core/PEAR.php Wed Aug 17 18:01:58 2005 @@ -18,7 +18,7 @@ // | Tomas V.V.Cox <cox@idecnet.com> | // +--------------------------------------------------------------------+ // -// $Id: PEAR.php,v 1.82.2.6 2005/01/01 05:24:51 cellog Exp $ +// $Id: PEAR.php,v 1.82.2.7 2005/08/17 22:01:58 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; } } @@ -558,9 +560,11 @@ $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/pear-core/go-pear-list.php?r1=1.9.2.6&r2=1.9.2.7&ty=u Index: pear-core/go-pear-list.php diff -u pear-core/go-pear-list.php:1.9.2.6 pear-core/go-pear-list.php:1.9.2.7 --- pear-core/go-pear-list.php:1.9.2.6 Fri Jul 1 22:27:47 2005 +++ pear-core/go-pear-list.php Wed Aug 17 18:01:58 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.9.2.6 2005/07/02 02:27:47 cellog Exp $ + * $Id: go-pear-list.php,v 1.9.2.7 2005/08/17 22:01:58 cellog Exp $ */ $packages = array( // required packages for the installer -"PEAR" => "1.3.5", -"XML_RPC" => "1.3.1", +"PEAR" => "1.3.6", +"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/pear-core/package-PEAR.xml?r1=1.106.2.25&r2=1.106.2.26&ty=u Index: pear-core/package-PEAR.xml diff -u pear-core/package-PEAR.xml:1.106.2.25 pear-core/package-PEAR.xml:1.106.2.26 --- pear-core/package-PEAR.xml:1.106.2.25 Sat Aug 13 06:14:08 2005 +++ pear-core/package-PEAR.xml Wed Aug 17 18:01:59 2005 @@ -49,11 +49,12 @@ </maintainers> <release> <version>1.3.6</version> - <date>2005-08-13</date> + <date>2005-08-16</date> <state>stable</state> <license>PHP License</license> <notes> - * remove XML_RPC dependency. The xmlrpc is required now. + * 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" /> @@ -122,9 +123,10 @@ <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.4.0">XML_RPC</dep> <dep type="ext" rel="has">xml</dep> <dep type="ext" rel="has">pcre</dep> - <dep type="ext" rel="has">xmlrpc</dep> + <dep type="ext" rel="has" optional="yes">xmlrpc</dep> </deps> </release> <changelog> http://cvs.php.net/diff.php/pear-core/PEAR/Remote.php?r1=1.50.2.1&r2=1.50.2.2&ty=u Index: pear-core/PEAR/Remote.php diff -u pear-core/PEAR/Remote.php:1.50.2.1 pear-core/PEAR/Remote.php:1.50.2.2 --- pear-core/PEAR/Remote.php:1.50.2.1 Thu Aug 11 17:46:59 2005 +++ pear-core/PEAR/Remote.php Wed Aug 17 18:02:01 2005 @@ -16,7 +16,7 @@ // | Author: Stig Bakken <ssb@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Remote.php,v 1.50.2.1 2005/08/11 21:46:59 pajoye Exp $ +// $Id: Remote.php,v 1.50.2.2 2005/08/17 22:02:01 cellog Exp $ require_once 'PEAR.php'; require_once 'PEAR/Config.php'; @@ -115,9 +115,9 @@ $this->saveCache($_args, $result); }; return $result; - } else { - return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension"); } + if (!@include_once("XML/RPC.php")) { + return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package"); array_shift($args); $server_host = $this->config->get('master_server'); $username = $this->config->get('username');