php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove pear/XML_RPC dependency for the pear installer

Browse Source 
PEAR guys, please doublecheck this.
This commit is contained in:
Rasmus Lerdorf
2005-08-11 16:43:26 +00:00
parent 9aa81a786b
commit c792839d8f
9 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Aug 2005, PHP 5.1 Release Candidate 1
- Unbundled XML_RPC pear class and force ext/xmlrpc dependency on pear (Rasmus)
- Updated bundled libraries in Windows distribution. (Edin)
. zlib 1.2.3
. curl 7.14.0

13
configure.in
View File

@@ -874,15 +874,10 @@ if test "$PHP_PEAR" != "no"; then
pear_error_msg="$pear_error_msg
PEAR requires XML to be enabled. Add --enable-xml to the configure line. (or --without-pear)"
fi
dnl
dnl ext/xmlrpc is not really there yet to be a requirement..
dnl
dnl if test "$PHP_XMLRPC" = "no"; then
dnl pear_error_msg="$pear_error_msg
dnl PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)"
dnl fi
dnl
if test "$PHP_XMLRPC" = "no"; then
pear_error_msg="$pear_error_msg
PEAR requires XML-RPC to be enabled. Add --with-xmlrpc to the configure line. (or --without-pear)"
fi
if test "$pear_error_msg"; then
AC_MSG_ERROR([$pear_error_msg])

5
pear/PEAR/Remote.php
View File

@@ -115,9 +115,8 @@ class PEAR_Remote extends PEAR
$this->saveCache($_args, $result);
};
return $result;
}
if (!@include_once("XML/RPC.php")) {
return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
} else {
return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension");
}
array_shift($args);
$server_host = $this->config->get('master_server');

1
pear/go-pear-list.php
View File

@@ -8,7 +8,6 @@
$packages = array(
// required packages for the installer
"PEAR" => "1.3.5",
"XML_RPC" => "1.3.1",
"Console_Getopt" => "1.2",
"Archive_Tar" => "1.3.1",

2
pear/package-PEAR.xml
View File

@@ -124,7 +124,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="ext" rel="has">xmlrpc</dep>
<dep type="ext" rel="has">xml</dep>
<dep type="ext" rel="has">pcre</dep>
</deps>

BIN
pear/packages/XML_RPC-1.3.1.tar
View File

Binary file not shown.

3
pear/tests/PEAR_test_mock_pearweb.php.inc
View File

@@ -1,5 +1,4 @@
<?php
require_once 'XML/RPC/Server.php';
class PEAR_test_mock_pearweb {
var $_config;
@@ -231,4 +230,4 @@ class PEAR_test_mock_pearweb {
return $newval;
}
}
?>
?>

7
pear/tests/download_test_classes.php.inc
View File

@@ -1,5 +1,4 @@
<?php
require_once 'XML/RPC.php';
require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'PEAR_test_mock_pearweb.php.inc';
$GLOBALS['pearweb'] = new PEAR_test_mock_pearweb;
class test_XML_RPC_Client extends XML_RPC_Client {
@@ -94,8 +93,8 @@ class test_PEAR_Remote extends PEAR_Remote {
};
return $result;
}
if (!@include_once("XML/RPC.php")) {
return $this->raiseError("For this remote PEAR operation you need to install the XML_RPC package");
if (!extension_loaded("xmlrpc")) {
return $this->raiseError("For this remote PEAR operation you need to install the xmlrpc extension");
}
array_shift($args);
$server_host = $this->_registry->channelInfo($server_channel, 'server');
@@ -401,4 +400,4 @@ class test_PEAR_Downloader extends PEAR_Downloader {
return $dest_file;
}
}
?>
?>

2
pear/tests/package-PEARtests.xml
View File

@@ -22,7 +22,7 @@
<dep type="pkg" rel="ge" version="1.4.0dev6">PEAR</dep>
<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.1.0">XML_RPC</dep>
<dep type="ext" rel="has">xmlrpc</dep>
<dep type="ext" rel="has">xml</dep>
<dep type="ext" rel="has">pcre</dep>
</deps>