Skip to content

Commit 407f851

Browse files
committed
Merge branch 'PHP-5.5'
* PHP-5.5: Fix ext/curl tests to work on every libcurl versions
2 parents d87ad19 + 8456cef commit 407f851

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

ext/curl/tests/curl_multi_setopt_basic001.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
--TEST--
22
curl_multi_setopt basic test
33
--SKIPIF--
4+
<?php
45
if (!extension_loaded("curl")) {
56
exit("skip curl extension not loaded");
67
}
78
$curl_version = curl_version();
89
if ($curl_version['version_number'] < 0x071000) {
910
exit("skip: test works only with curl >= 7.16.0");
1011
}
12+
?>
1113
--FILE--
1214
<?php
1315

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
--TEST--
22
curl_multi_strerror basic test
33
--SKIPIF--
4+
<?php
45
if (!extension_loaded("curl")) {
56
exit("skip curl extension not loaded");
67
}
78
$curl_version = curl_version();
89
if ($curl_version['version_number'] < 0x070c00) {
910
exit("skip: test works only with curl >= 7.12.0");
1011
}
12+
?>
1113
--FILE--
1214
<?php
1315

14-
var_dump(curl_multi_strerror(CURLM_OK));
15-
var_dump(curl_multi_strerror(CURLM_BAD_HANDLE));
16+
var_dump(strtolower(curl_multi_strerror(CURLM_OK)));
17+
var_dump(strtolower(curl_multi_strerror(CURLM_BAD_HANDLE)));
1618

1719
?>
1820
--EXPECTF--
19-
string(8) "No error"
20-
string(20) "Invalid multi handle"
21+
string(8) "no error"
22+
string(20) "invalid multi handle"

ext/curl/tests/curl_share_setopt_basic001.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
--TEST--
22
curl_share_setopt basic test
33
--SKIPIF--
4+
<?php
45
if (!extension_loaded("curl")) {
56
exit("skip curl extension not loaded");
67
}
8+
?>
79
--FILE--
810
<?php
911

ext/curl/tests/curl_strerror_001.phpt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
11
--TEST--
22
curl_strerror basic test
33
--SKIPIF--
4+
<?php
45
if (!extension_loaded("curl")) {
56
exit("skip curl extension not loaded");
67
}
78
$curl_version = curl_version();
89
if ($curl_version['version_number'] < 0x070c00) {
910
exit("skip: test works only with curl >= 7.12.0");
1011
}
12+
?>
1113
--FILE--
1214
<?php
1315

14-
var_dump(curl_strerror(CURLE_OK));
15-
var_dump(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL));
16-
var_dump(curl_strerror(-1));
16+
var_dump(strtolower(curl_strerror(CURLE_OK)));
17+
var_dump(strtolower(curl_strerror(CURLE_UNSUPPORTED_PROTOCOL)));
18+
var_dump(strtolower(curl_strerror(-1)));
1719

1820
?>
1921
--EXPECTF--
20-
string(8) "No error"
21-
string(20) "Unsupported protocol"
22-
string(13) "Unknown error"
22+
string(8) "no error"
23+
string(20) "unsupported protocol"
24+
string(13) "unknown error"

0 commit comments

Comments
 (0)