From: Felipe Pena Date: Tue, 29 Jul 2008 12:20:39 +0000 (+0000) Subject: - Fixed tests X-Git-Tag: BEFORE_HEAD_NS_CHANGE~976 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9e846b21ee65652147fe44976a23060f08aeb3c;p=php - Fixed tests --- diff --git a/ext/standard/tests/general_functions/bug41970.phpt b/ext/standard/tests/general_functions/bug41970.phpt index 17461a312b..c381bd8471 100644 --- a/ext/standard/tests/general_functions/bug41970.phpt +++ b/ext/standard/tests/general_functions/bug41970.phpt @@ -13,15 +13,15 @@ var_dump(call_user_func("strlen", $a)); echo "Done\n"; ?> --EXPECTF-- -Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 5 +Warning: Parameter 1 to sort() expected to be a reference, value given in %s on line %d NULL -Notice: Array to string conversion in %sbug41970.php on line 6 -int(5) +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL -Warning: Parameter 1 to sort() expected to be a reference, value given in %sbug41970.php on line 7 +Warning: Parameter 1 to sort() expected to be a reference, value given in %s on line %d NULL -Notice: Array to string conversion in %sbug41970.php on line 8 -int(5) +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL Done diff --git a/ext/standard/tests/strings/strncasecmp_variation10.phpt b/ext/standard/tests/strings/strncasecmp_variation10.phpt index c0157c9b73..be25121418 100644 --- a/ext/standard/tests/strings/strncasecmp_variation10.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation10.phpt @@ -129,31 +129,31 @@ int(-%d) int(-%d) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL @@ -179,6 +179,8 @@ int(-%d) int(-%d) -- Iteration 30 -- +Warning: strlen() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d + Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d NULL -- Iteration 31 -- diff --git a/ext/standard/tests/strings/strncasecmp_variation11.phpt b/ext/standard/tests/strings/strncasecmp_variation11.phpt index d4991420f1..f5bcba123e 100644 --- a/ext/standard/tests/strings/strncasecmp_variation11.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation11.phpt @@ -130,31 +130,31 @@ int(%d) int(%d) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), array given in %s on line %d NULL @@ -180,6 +180,8 @@ int(%d) int(%d) -- Iteration 30 -- +Warning: strlen() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d + Warning: strncasecmp() expects parameter 2 to be string (Unicode or binary), resource given in %s on line %d NULL -- Iteration 31 -- diff --git a/ext/standard/tests/strings/strncasecmp_variation4.phpt b/ext/standard/tests/strings/strncasecmp_variation4.phpt index b1aa9f6a06..19e52dcf5c 100644 --- a/ext/standard/tests/strings/strncasecmp_variation4.phpt +++ b/ext/standard/tests/strings/strncasecmp_variation4.phpt @@ -130,31 +130,31 @@ int(0) int(0) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL @@ -180,6 +180,8 @@ int(0) int(0) -- Iteration 30 -- +Warning: strlen() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d + Warning: strncasecmp() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d NULL -- Iteration 31 -- diff --git a/ext/standard/tests/strings/strncmp_variation4.phpt b/ext/standard/tests/strings/strncmp_variation4.phpt index 3af2a9ebdd..54a8f46da1 100644 --- a/ext/standard/tests/strings/strncmp_variation4.phpt +++ b/ext/standard/tests/strings/strncmp_variation4.phpt @@ -133,31 +133,31 @@ int(0) int(0) -- Iteration 15 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 16 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 17 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 18 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL -- Iteration 19 -- -Notice: Array to string conversion in %s on line %d +Warning: strlen() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d Warning: strncmp() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d NULL @@ -183,6 +183,8 @@ int(0) int(0) -- Iteration 30 -- +Warning: strlen() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d + Warning: strncmp() expects parameter 1 to be string (Unicode or binary), resource given in %s on line %d NULL -- Iteration 31 -- diff --git a/ext/tidy/tests/024.phpt b/ext/tidy/tests/024.phpt index f69b962aee..7e73f5f95e 100644 --- a/ext/tidy/tests/024.phpt +++ b/ext/tidy/tests/024.phpt @@ -28,7 +28,7 @@ var_dump($tidy->value); ?> --EXPECTF-- -string(11%d) " +unicode(%d) "