Skip to content

Commit f906124

Browse files
ashnazgashnazg
authored
Merge pull request #159 from remicollet/issue-https3
update tests for https-first behavior
2 parents f155a87 + 4b0e847 commit f906124

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

‎tests/PEAR_Command_Install/install/test_bug5513.phpt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ segfaults with the simplest of files. Generation still works great in PHP4
335335
</r>', 'text/xml');
336336
$pearweb->addRESTConfig("http://pear.php.net/rest/r/phpdocumentor/deps.1.3.0RC3.txt", 'a:3:{i:1;a:4:{s:4:"type";s:3:"php";s:3:"rel";s:2:"ge";s:7:"version";s:5:"4.1.0";s:8:"optional";s:2:"no";}i:2;a:5:{s:4:"type";s:3:"pkg";s:3:"rel";s:2:"ge";s:7:"version";s:3:"1.1";s:8:"optional";s:2:"no";s:4:"name";s:11:"Archive_Tar";}i:3;a:5:{s:4:"type";s:3:"pkg";s:3:"rel";s:2:"ge";s:7:"version";s:3:"1.1";s:8:"optional";s:3:"yes";s:4:"name";s:14:"XML_Beautifier";}}', 'text/xml');
337337
$pearweb->addRESTConfig("http://pear.php.net/rest/r/xdebug/allreleases.xml", false, false);
338-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/xdebug/allreleases.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
338+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/xdebug/allreleases.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
339339
<a xmlns="http://pear.php.net/dtd/rest.allreleases"
340340
xsi:schemaLocation="http://pear.php.net/dtd/rest.allreleases
341341
http://pear.php.net/dtd/rest.allreleases.xsd">
@@ -352,7 +352,7 @@ $pearweb->addRESTConfig("http://pecl.php.net/rest/r/xdebug/allreleases.xml", '<?
352352
<r><v>1.3.0rc1</v><s>beta</s></r>
353353
<r><v>1.2.0</v><s>stable</s></r>
354354
</a>', 'text/xml');
355-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/xdebug/2.0.0beta4.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
355+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/xdebug/2.0.0beta4.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
356356
<r xmlns="http://pear.php.net/dtd/rest.release"
357357
xsi:schemaLocation="http://pear.php.net/dtd/rest.release
358358
http://pear.php.net/dtd/rest.release.xsd">
@@ -402,10 +402,10 @@ Xdebug also provides:
402402
- Fixed bug #133: PHP scripts exits with 0 on PHP error.
403403
- Fixed bug #132: use of eval causes a segmentation fault.</n>
404404
<f>228343</f>
405-
<g>http://pecl.php.net/get/xdebug-2.0.0beta4</g>
405+
<g>https://pecl.php.net/get/xdebug-2.0.0beta4</g>
406406
<x xlink:href="package.2.0.0beta4.xml"/>
407407
</r>', 'text/xml');
408-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/xdebug/2.0.0beta4.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
408+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/xdebug/2.0.0beta4.xml", '<?xml version="1.0" encoding="iso-8859-1" ?>
409409
<r xmlns="http://pear.php.net/dtd/rest.release"
410410
xsi:schemaLocation="http://pear.php.net/dtd/rest.release
411411
http://pear.php.net/dtd/rest.release.xsd">
@@ -455,10 +455,10 @@ Xdebug also provides:
455455
- Fixed bug #133: PHP scripts exits with 0 on PHP error.
456456
- Fixed bug #132: use of eval causes a segmentation fault.</n>
457457
<f>228343</f>
458-
<g>http://pecl.php.net/get/xdebug-2.0.0beta4</g>
458+
<g>https://pecl.php.net/get/xdebug-2.0.0beta4</g>
459459
<x xlink:href="package.2.0.0beta4.xml"/>
460460
</r>', 'text/xml');
461-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/xdebug/deps.2.0.0beta4.txt", 'a:1:{s:8:"required";a:2:{s:3:"php";a:1:{s:3:"min";s:5:"4.3.0";}s:13:"pearinstaller";a:1:{s:3:"min";s:7:"1.4.0b1";}}}', 'text/xml');
461+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/xdebug/deps.2.0.0beta4.txt", 'a:1:{s:8:"required";a:2:{s:3:"php";a:1:{s:3:"min";s:5:"4.3.0";}s:13:"pearinstaller";a:1:{s:3:"min";s:7:"1.4.0b1";}}}', 'text/xml');
462462
$pearweb->addRESTConfig("http://pear.php.net/rest/r/archive_tar/allreleases.xml", '<?xml version="1.0" encoding="UTF-8" ?>
463463
<a xmlns="http://pear.php.net/dtd/rest.allreleases"
464464
xsi:schemaLocation="http://pear.php.net/dtd/rest.allreleases
@@ -678,7 +678,7 @@ $ pear install PhpDocumentor
678678
http://localhost/pear/PhpDocumentor is the web interface</d>
679679
<r xlink:href="/rest/r/phpdocumentor"/>
680680
</p>', 'text/xml');
681-
$pearweb->addRESTConfig("http://pecl.php.net/rest/p/xdebug/info.xml", '<?xml version="1.0" encoding="UTF-8" ?>
681+
$pearweb->addRESTConfig("https://pecl.php.net/rest/p/xdebug/info.xml", '<?xml version="1.0" encoding="UTF-8" ?>
682682
<p xmlns="http://pear.php.net/dtd/rest.package" xsi:schemaLocation="http://pear.php.net/dtd/rest.package http://pear.php.net/dtd/rest.package.xsd">
683683
<n>Xdebug</n>
684684
<c>pecl.php.net</c>
@@ -747,7 +747,7 @@ The new PEAR_PackageFileManager2 class is not.</d>
747747
</p>', 'text/xml');
748748
$pearweb->addRESTConfig("http://pear.php.net/rest/r/pear_packagefilemanager/deps.1.6.0a3.txt", 'a:1:{s:8:"required";a:2:{s:3:"php";a:1:{s:3:"min";s:5:"4.2.0";}s:13:"pearinstaller";a:1:{s:3:"min";s:7:"1.4.0b1";}}}', 'text/xml');
749749
$pearweb->addRESTConfig("http://pear.php.net/rest/r/phing/allreleases.xml", false, false);
750-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/phing/allreleases.xml", false, false);
750+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/phing/allreleases.xml", false, false);
751751
$pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR .
752752
'packages'. DIRECTORY_SEPARATOR . 'phing-current.tgz';
753753
$pathtobarxml = dirname(__FILE__) . DIRECTORY_SEPARATOR .

‎tests/PEAR_Downloader_Package/test_initialize_invalidabstractpackage1.phpt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $reg->updateChannel($chan);
1919

2020
$GLOBALS['pearweb']->addHtmlConfig('http://www.example.com/test-1.0.tgz', $pathtopackagexml);
2121

22-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/test/allreleases.xml", false, false);
22+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/test/allreleases.xml", false, false);
2323
$pearweb->addRESTConfig("http://pear.php.net/rest/r/test/allreleases.xml", false, false);
2424

2525
$dp = newDownloaderPackage(array());
@@ -45,7 +45,7 @@ $phpunit->assertErrors(array(
4545
),
4646
array(
4747
'package' => 'PEAR_Error',
48-
'message' => 'File http://pecl.php.net:80/rest/r/test/allreleases.xml not valid (received: HTTP/1.1 404 http://pecl.php.net/rest/r/test/allreleases.xml Is not valid)',
48+
'message' => 'File https://pecl.php.net:443/rest/r/test/allreleases.xml not valid (received: HTTP/1.1 404 https://pecl.php.net/rest/r/test/allreleases.xml Is not valid)',
4949
),
5050
), 'after initialize');
5151

‎tests/PEAR_Installer/test_bug14702.phpt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ if (!getenv('PHP_PEAR_RUNTESTS')) {
1111
require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'setup.php.inc';
1212

1313
$pathtopackagexml = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'bug14702'. DIRECTORY_SEPARATOR . 'pecl_http-1.6.0.tgz';
14-
$GLOBALS['pearweb']->addHtmlConfig('http://pecl.php.net/get/pecl_http-1.6.0.tgz', $pathtopackagexml);
14+
$GLOBALS['pearweb']->addHtmlConfig('https://pecl.php.net/get/pecl_http-1.6.0.tgz', $pathtopackagexml);
1515

16-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/pecl_http/allreleases.xml", '<?xml version="1.0" encoding="UTF-8" ?>
16+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/pecl_http/allreleases.xml", '<?xml version="1.0" encoding="UTF-8" ?>
1717
<a xmlns="http://pear.php.net/dtd/rest.allreleases"
1818
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://pear.php.net/dtd/rest.allreleases
1919
http://pear.php.net/dtd/rest.allreleases.xsd">
@@ -90,7 +90,7 @@ $pearweb->addRESTConfig("http://pecl.php.net/rest/r/pecl_http/allreleases.xml",
9090
</a>', 'text/xml');
9191

9292

93-
$pearweb->addRESTConfig("http://pecl.php.net/rest/p/pecl_http/info.xml", '<?xml version="1.0" encoding="UTF-8" ?>
93+
$pearweb->addRESTConfig("https://pecl.php.net/rest/p/pecl_http/info.xml", '<?xml version="1.0" encoding="UTF-8" ?>
9494
<p xmlns="http://pear.php.net/dtd/rest.package" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9595
xmlns:xlink="http://www.w3.org/1999/xlink" xsi:schemaLocation="http://pear.php.net/dtd/rest.package http://pear.php.net/dtd/rest.package.xsd">
9696
<n>pecl_http</n>
@@ -111,7 +111,7 @@ support. Parallel requests are available for PHP 5 and greater.</d>
111111
<r xlink:href="/rest/r/pecl_http"/>
112112
</p>', 'text/xml');
113113

114-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/pecl_http/1.6.0.xml", '<?xml version="1.0" encoding="UTF-8" ?>
114+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/pecl_http/1.6.0.xml", '<?xml version="1.0" encoding="UTF-8" ?>
115115
<r xmlns="http://pear.php.net/dtd/rest.release"
116116
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
117117
xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -150,11 +150,11 @@ support. Parallel requests are available for PHP 5 and greater.</d>
150150
* Fixed missing PHP_LIBDIR definition in config.m4 for PHP4
151151
* Fixed non-standard shell support in config.m4</n>
152152
<f>172432</f>
153-
<g>http://pecl.php.net/get/pecl_http-1.6.0</g>
153+
<g>https://pecl.php.net/get/pecl_http-1.6.0</g>
154154
<x xlink:href="package.1.6.0.xml"/>
155155
</r>', 'text/xml');
156156

157-
$pearweb->addRESTConfig("http://pecl.php.net/rest/r/pecl_http/deps.1.6.0.txt", 'a:2:{s:8:"required";a:2:{s:3:"php";a:3:{s:3:"min";s:3:"4.3";s:3:"max";s:5:"6.0.0";s:7:"exclude";s:5:"6.0.0";}s:13:"pearinstaller";a:1:{s:3:"min";s:5:"1.4.1";}}s:8:"optional";a:1:{s:9:"extension";a:4:{i:0;a:1:{s:4:"name";s:3:"spl";}i:1;a:1:{s:4:"name";s:7:"session";}i:2;a:1:{s:4:"name";s:4:"hash";}i:3;a:1:{s:4:"name";s:5:"iconv";}}}}', 'text/xml');
157+
$pearweb->addRESTConfig("https://pecl.php.net/rest/r/pecl_http/deps.1.6.0.txt", 'a:2:{s:8:"required";a:2:{s:3:"php";a:3:{s:3:"min";s:3:"4.3";s:3:"max";s:5:"6.0.0";s:7:"exclude";s:5:"6.0.0";}s:13:"pearinstaller";a:1:{s:3:"min";s:5:"1.4.1";}}s:8:"optional";a:1:{s:9:"extension";a:4:{i:0;a:1:{s:4:"name";s:3:"spl";}i:1;a:1:{s:4:"name";s:7:"session";}i:2;a:1:{s:4:"name";s:4:"hash";}i:3;a:1:{s:4:"name";s:5:"iconv";}}}}', 'text/xml');
158158

159159

160160
$_test_dep->setPEARVersion('1.6.1');

‎tests/download_test_classes.php.inc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ class test_PEAR_REST extends PEAR_REST {
1717
$host = @$info['host'];
1818
$port = @$info['port'];
1919
$path = @$info['path'];
20+
$scheme = @$info['scheme'];
2021
}
2122
$proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
2223
if ($this->config->get('http_proxy')&&
@@ -81,7 +82,7 @@ class test_PEAR_REST extends PEAR_REST {
8182
return false;
8283
}
8384
if ($matches[1] != 200) {
84-
return PEAR::raiseError("File http://$host:$port$path not valid (received: $line)");
85+
return PEAR::raiseError("File $scheme://$host:$port$path not valid (received: $line)");
8586
}
8687
}
8788
$line = array_shift($retrieved);

0 commit comments

Comments
 (0)