From c792839d8fa22c31aa5868d0c14fb932bc9604ac Mon Sep 17 00:00:00 2001
From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 11 Aug 2005 16:43:26 +0000
Subject: Remove pear/XML_RPC dependency for the pear installer PEAR guys,
 please doublecheck this.

---
 pear/PEAR/Remote.php                      |   5 ++---
 pear/go-pear-list.php                     |   1 -
 pear/package-PEAR.xml                     |   2 +-
 pear/packages/XML_RPC-1.3.1.tar           | Bin 120832 -> 0 bytes
 pear/tests/PEAR_test_mock_pearweb.php.inc |   3 +--
 pear/tests/download_test_classes.php.inc  |   7 +++----
 pear/tests/package-PEARtests.xml          |   2 +-
 7 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 pear/packages/XML_RPC-1.3.1.tar

(limited to 'pear')

diff --git a/pear/PEAR/Remote.php b/pear/PEAR/Remote.php
index c75b11b5c1..1da25f0815 100644
--- a/pear/PEAR/Remote.php
+++ b/pear/PEAR/Remote.php
@@ -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');
diff --git a/pear/go-pear-list.php b/pear/go-pear-list.php
index 881fcf616b..e23646b879 100755
--- a/pear/go-pear-list.php
+++ b/pear/go-pear-list.php
@@ -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",
 
diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml
index acab881498..5d4e292b50 100644
--- a/pear/package-PEAR.xml
+++ b/pear/package-PEAR.xml
@@ -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>
diff --git a/pear/packages/XML_RPC-1.3.1.tar b/pear/packages/XML_RPC-1.3.1.tar
deleted file mode 100644
index 8fe279b51f..0000000000
Binary files a/pear/packages/XML_RPC-1.3.1.tar and /dev/null differ
diff --git a/pear/tests/PEAR_test_mock_pearweb.php.inc b/pear/tests/PEAR_test_mock_pearweb.php.inc
index f1f7edc9c1..11cb0cc25c 100644
--- a/pear/tests/PEAR_test_mock_pearweb.php.inc
+++ b/pear/tests/PEAR_test_mock_pearweb.php.inc
@@ -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;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pear/tests/download_test_classes.php.inc b/pear/tests/download_test_classes.php.inc
index c27696d48c..0341a28611 100644
--- a/pear/tests/download_test_classes.php.inc
+++ b/pear/tests/download_test_classes.php.inc
@@ -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;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/pear/tests/package-PEARtests.xml b/pear/tests/package-PEARtests.xml
index daceee967b..d4e9113fe6 100644
--- a/pear/tests/package-PEARtests.xml
+++ b/pear/tests/package-PEARtests.xml
@@ -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>
-- 
cgit v1.2.1