Index: PEAR_Downloader_Package/test_initialize_abstractpackage.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_initialize_abstractpackage.phpt,v retrieving revision 1.6 diff -u -r1.6 test_initialize_abstractpackage.phpt --- PEAR_Downloader_Package/test_initialize_abstractpackage.phpt 26 May 2007 00:00:58 -0000 1.6 +++ PEAR_Downloader_Package/test_initialize_abstractpackage.phpt 24 Jan 2009 04:43:30 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => Index: PEAR_Downloader_Package/test_initialize_invalidabstractpackage1.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_initialize_invalidabstractpackage1.phpt,v retrieving revision 1.7 diff -u -r1.7 test_initialize_invalidabstractpackage1.phpt --- PEAR_Downloader_Package/test_initialize_invalidabstractpackage1.phpt 26 May 2007 00:00:58 -0000 1.7 +++ PEAR_Downloader_Package/test_initialize_invalidabstractpackage1.phpt 24 Jan 2009 04:43:30 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net'), 'stable'), false); $dp = &newDownloaderPackage(array()); Index: PEAR_Downloader_Package/test_initialize_invalidabstractpackage2.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_initialize_invalidabstractpackage2.phpt,v retrieving revision 1.8 diff -u -r1.8 test_initialize_invalidabstractpackage2.phpt --- PEAR_Downloader_Package/test_initialize_invalidabstractpackage2.phpt 26 May 2007 00:00:58 -0000 1.8 +++ PEAR_Downloader_Package/test_initialize_invalidabstractpackage2.phpt 24 Jan 2009 04:43:30 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net'), 'stable'), array('version' => '0.2.0', 'info' => Index: PEAR_Downloader_Package/test_initialize_invalidabstractpackage3.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_initialize_invalidabstractpackage3.phpt,v retrieving revision 1.7 diff -u -r1.7 test_initialize_invalidabstractpackage3.phpt --- PEAR_Downloader_Package/test_initialize_invalidabstractpackage3.phpt 26 May 2007 00:00:58 -0000 1.7 +++ PEAR_Downloader_Package/test_initialize_invalidabstractpackage3.phpt 24 Jan 2009 04:43:30 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net', 'version' => '1.0'), 'stable'), array('version' => '0.2.0', 'info' => Index: PEAR_Downloader_Package/test_initialize_invalidabstractpackage4.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_initialize_invalidabstractpackage4.phpt,v retrieving revision 1.7 diff -u -r1.7 test_initialize_invalidabstractpackage4.phpt --- PEAR_Downloader_Package/test_initialize_invalidabstractpackage4.phpt 26 May 2007 00:00:58 -0000 1.7 +++ PEAR_Downloader_Package/test_initialize_invalidabstractpackage4.phpt 24 Jan 2009 04:43:31 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net', 'state' => 'stable'), 'stable'), array('version' => '0.2.0', 'info' => Index: PEAR_Downloader_Package/test_mergeDependencies_basic_groupdefault2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_groupdefault2.0.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_groupdefault2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_groupdefault2.0.phpt 26 May 2007 00:00:58 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_groupdefault2.0.phpt 24 Jan 2009 04:43:31 -0000 @@ -18,7 +18,7 @@ $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub1-1.0.tgz', $sub1package); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub2-1.0.tgz', $sub2package); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -104,7 +104,7 @@ ', 'url' => 'http://www.example.com/main-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub1', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', @@ -176,7 +176,7 @@ ', 'url' => 'http://www.example.com/sub1-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub2', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_groupnotspecified_2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_groupnotspecified_2.0.phpt,v retrieving revision 1.6 diff -u -r1.6 test_mergeDependencies_basic_groupnotspecified_2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_groupnotspecified_2.0.phpt 26 May 2007 00:00:58 -0000 1.6 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_groupnotspecified_2.0.phpt 24 Jan 2009 04:43:31 -0000 @@ -18,7 +18,7 @@ $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub1-1.0.tgz', $sub1package); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub2-1.0.tgz', $sub2package); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -104,7 +104,7 @@ ', 'url' => 'http://www.example.com/main-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub1', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', @@ -176,7 +176,7 @@ ', 'url' => 'http://www.example.com/sub1-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub2', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified2.0.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_groupspecified2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified2.0.phpt 26 May 2007 00:00:58 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified2.0.phpt 24 Jan 2009 04:43:31 -0000 @@ -18,7 +18,7 @@ $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub1-1.0.tgz', $sub1package); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub2-1.0.tgz', $sub2package); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net', 'group' => 'test'), 'stable'), array('version' => '1.0', 'info' => @@ -104,7 +104,7 @@ ', 'url' => 'http://www.example.com/main-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub1', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', @@ -176,7 +176,7 @@ ', 'url' => 'http://www.example.com/sub1-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub2', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified_notfound2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified_notfound2.0.phpt,v retrieving revision 1.6 diff -u -r1.6 test_mergeDependencies_basic_groupspecified_notfound2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified_notfound2.0.phpt 26 May 2007 00:00:59 -0000 1.6 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_groupspecified_notfound2.0.phpt 24 Jan 2009 04:43:31 -0000 @@ -18,7 +18,7 @@ $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub1-1.0.tgz', $sub1package); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/sub2-1.0.tgz', $sub2package); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net', 'group' => 'foo'), 'stable'), array('version' => '1.0', 'info' => @@ -104,7 +104,7 @@ ', 'url' => 'http://www.example.com/main-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub1', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', @@ -176,7 +176,7 @@ ', 'url' => 'http://www.example.com/sub1-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'sub2', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.0'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_optional_1.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0.phpt 26 May 2007 00:00:59 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0.phpt 24 Jan 2009 04:43:31 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_alldeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_alldeps.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_optional_1.0_alldeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_alldeps.phpt 26 May 2007 00:00:59 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_alldeps.phpt 24 Jan 2009 04:43:31 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_onlyreqdeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_onlyreqdeps.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_optional_1.0_onlyreqdeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_onlyreqdeps.phpt 26 May 2007 00:00:59 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_1.0_onlyreqdeps.phpt 24 Jan 2009 04:43:31 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_optional_2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0.phpt 26 May 2007 00:00:59 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -71,7 +71,7 @@ ', 'url' => 'http://www.example.com/main-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'required', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.1'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_alldeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_alldeps.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_optional_2.0_alldeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_alldeps.phpt 26 May 2007 00:00:59 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_alldeps.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -71,7 +71,7 @@ ', 'url' => 'http://www.example.com/main-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'required', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.1'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_onlyreqdeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_onlyreqdeps.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_optional_2.0_onlyreqdeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_onlyreqdeps.phpt 26 May 2007 00:00:59 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_optional_2.0_onlyreqdeps.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.1.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -71,7 +71,7 @@ ', 'url' => 'http://www.example.com/main-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'required', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.1'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_required_1.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0.phpt 26 May 2007 00:00:59 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_alldeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_alldeps.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_required_1.0_alldeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_alldeps.phpt 26 May 2007 00:00:59 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_alldeps.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps.phpt,v retrieving revision 1.5 diff -u -r1.5 test_mergeDependencies_basic_required_1.0_onlyreqdeps.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps.phpt 26 May 2007 00:00:59 -0000 1.5 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps_installed.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps_installed.phpt,v retrieving revision 1.9 diff -u -r1.9 test_mergeDependencies_basic_required_1.0_onlyreqdeps_installed.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps_installed.phpt 26 May 2007 00:00:59 -0000 1.9 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_1.0_onlyreqdeps_installed.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/mainold-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'mainold', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.0', 'info' => @@ -66,7 +66,7 @@ ', 'url' => 'http://www.example.com/mainold-1.0')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('1.0', array( 'type' => "pkg", Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0.phpt,v retrieving revision 1.6 diff -u -r1.6 test_mergeDependencies_basic_required_2.0.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0.phpt 26 May 2007 00:00:59 -0000 1.6 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -69,7 +69,7 @@ ', 'url' => 'http://www.example.com/main-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'required', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.1'), 'stable'), array('version' => '1.1', Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0_installed.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0_installed.phpt,v retrieving revision 1.9 diff -u -r1.9 test_mergeDependencies_basic_required_2.0_installed.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0_installed.phpt 26 May 2007 00:00:59 -0000 1.9 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_2.0_installed.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'required-1.1.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/required-1.1.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => @@ -69,7 +69,7 @@ ', 'url' => 'http://www.example.com/main-1.1')); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDepDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDepDownloadURL', array('2.0', array('name' => 'required', 'channel' => 'pear.php.net', 'min' => '1.1'), array('channel' => 'pear.php.net', 'package' => 'main', 'version' => '1.1'), 'stable', '1.0'), Index: PEAR_Downloader_Package/test_mergeDependencies_basic_required_uri.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_mergeDependencies_basic_required_uri.phpt,v retrieving revision 1.7 diff -u -r1.7 test_mergeDependencies_basic_required_uri.phpt --- PEAR_Downloader_Package/test_mergeDependencies_basic_required_uri.phpt 26 May 2007 01:34:01 -0000 1.7 +++ PEAR_Downloader_Package/test_mergeDependencies_basic_required_uri.phpt 24 Jan 2009 04:43:32 -0000 @@ -15,7 +15,7 @@ 'test_mergeDependencies'. DIRECTORY_SEPARATOR . 'foo-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/main-1.0.tgz', $mainpackage); $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/foo-1.0.tgz', $requiredpackage); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'main', 'channel' => 'pear.php.net'), 'stable'), array('version' => '1.1', 'info' => Index: PEAR_Downloader_Package/test_removeDuplicates.phpt =================================================================== RCS file: /repository/pear-core/tests/PEAR_Downloader_Package/test_removeDuplicates.phpt,v retrieving revision 1.5 diff -u -r1.5 test_removeDuplicates.phpt --- PEAR_Downloader_Package/test_removeDuplicates.phpt 26 May 2007 00:00:59 -0000 1.5 +++ PEAR_Downloader_Package/test_removeDuplicates.phpt 24 Jan 2009 04:43:33 -0000 @@ -12,7 +12,7 @@ $pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'test_initialize_downloadurl'. DIRECTORY_SEPARATOR . 'test-1.0.tgz'; $GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml); -$GLOBALS['pearweb']->addXmlrpcConfig('pear.php.net', 'package.getDownloadURL', +$GLOBALS['pearweb']->addRestConfig('pear.php.net', 'package.getDownloadURL', array(array('package' => 'test', 'channel' => 'pear.php.net', 'group' => 'subgroup'), 'stable'), array('version' => '1.0', 'info' =>