summaryrefslogtreecommitdiff
path: root/ext/curl/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/curl/tests')
-rw-r--r--ext/curl/tests/curl_basic_009.phpt2
-rw-r--r--ext/curl/tests/curl_basic_010.phpt2
-rw-r--r--ext/curl/tests/curl_basic_016.phpt2
-rw-r--r--ext/curl/tests/curl_basic_018.phpt2
-rw-r--r--ext/curl/tests/curl_basic_021.phpt2
-rw-r--r--ext/curl/tests/curl_multi_getcontent_error3.phpt2
-rw-r--r--ext/curl/tests/curl_setopt_error.phpt2
7 files changed, 7 insertions, 7 deletions
diff --git a/ext/curl/tests/curl_basic_009.phpt b/ext/curl/tests/curl_basic_009.phpt
index 529e590090..99e94cd9b2 100644
--- a/ext/curl/tests/curl_basic_009.phpt
+++ b/ext/curl/tests/curl_basic_009.phpt
@@ -19,5 +19,5 @@ curl_close($ch);
?>
--EXPECTF--
-%unicode|string%(%d) "%Srotocol%s"
+string(%d) "%Srotocol%s"
int(1)
diff --git a/ext/curl/tests/curl_basic_010.phpt b/ext/curl/tests/curl_basic_010.phpt
index 72a591ff16..20bcc59be6 100644
--- a/ext/curl/tests/curl_basic_010.phpt
+++ b/ext/curl/tests/curl_basic_010.phpt
@@ -26,5 +26,5 @@ curl_close($ch);
?>
--EXPECTF--
-%unicode|string%(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
+string(%d) "%r(Couldn't resolve proxy|Could not resolve proxy:|Could not resolve host:|Could not resolve:)%r %s"
int(5)
diff --git a/ext/curl/tests/curl_basic_016.phpt b/ext/curl/tests/curl_basic_016.phpt
index b5890c0f6e..2bd1f05037 100644
--- a/ext/curl/tests/curl_basic_016.phpt
+++ b/ext/curl/tests/curl_basic_016.phpt
@@ -19,7 +19,7 @@ if ($curl_version['version_number'] > 0x071201) {
===DONE===
--EXPECTF--
array(2%d) {
- [%u|b%"url"]=>
+ ["url"]=>
string(0) ""
["content_type"]=>
NULL
diff --git a/ext/curl/tests/curl_basic_018.phpt b/ext/curl/tests/curl_basic_018.phpt
index 359421fc0a..5c085c1c93 100644
--- a/ext/curl/tests/curl_basic_018.phpt
+++ b/ext/curl/tests/curl_basic_018.phpt
@@ -66,7 +66,7 @@ TestFest 2009 - AFUP - Thomas Rabaix <thomas.rabaix@gmail.com>
===DONE===
--EXPECTF--
*** Testing curl_exec() : basic functionality ***
-%unicode|string%(75) "Hello World!
+string(75) "Hello World!
Hello World!Hello World!
Hello World!Hello World!
Hello World!"
diff --git a/ext/curl/tests/curl_basic_021.phpt b/ext/curl/tests/curl_basic_021.phpt
index d9f5a90bef..e803d98837 100644
--- a/ext/curl/tests/curl_basic_021.phpt
+++ b/ext/curl/tests/curl_basic_021.phpt
@@ -18,5 +18,5 @@ Jean-Marc Fontaine <jmf@durcommefaire.net>
?>
===DONE===
--EXPECTF--
-%unicode|string%(24) "text/plain;charset=utf-8"
+string(24) "text/plain;charset=utf-8"
===DONE===
diff --git a/ext/curl/tests/curl_multi_getcontent_error3.phpt b/ext/curl/tests/curl_multi_getcontent_error3.phpt
index 2ad14804ba..2e1c7b2765 100644
--- a/ext/curl/tests/curl_multi_getcontent_error3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_error3.phpt
@@ -49,5 +49,5 @@ if (!extension_loaded('curl')) print 'skip';
?>
--EXPECTF--
-Warning: curl_multi_getcontent() expects parameter 1 to be resource, %unicode_string_optional% given in %s on line %d
+Warning: curl_multi_getcontent() expects parameter 1 to be resource, string given in %s on line %d
CURL2
diff --git a/ext/curl/tests/curl_setopt_error.phpt b/ext/curl/tests/curl_setopt_error.phpt
index dd7298342e..b9727c8a55 100644
--- a/ext/curl/tests/curl_setopt_error.phpt
+++ b/ext/curl/tests/curl_setopt_error.phpt
@@ -40,6 +40,6 @@ Warning: curl_setopt() expects exactly 3 parameters, 2 given in %s on line %d
Warning: curl_setopt() expects parameter 1 to be resource, boolean given in %s on line %d
-Warning: curl_setopt() expects parameter 2 to be integer, %unicode_string_optional% given in %s on line %d
+Warning: curl_setopt() expects parameter 2 to be integer, string given in %s on line %d
Warning: curl_setopt(): Invalid curl configuration option in %scurl_setopt_error.php on line %d