diff options
| -rw-r--r-- | Zend/tests/007.phpt | 2 | ||||
| -rw-r--r-- | Zend/tests/008.phpt | 12 | ||||
| -rw-r--r-- | Zend/tests/009.phpt | 4 | ||||
| -rw-r--r-- | Zend/tests/011.phpt | 4 | ||||
| -rw-r--r-- | Zend/tests/017.phpt | 8 | ||||
| -rw-r--r-- | Zend/tests/020.phpt | 7 | ||||
| -rw-r--r-- | Zend/tests/030.phpt | 4 | ||||
| -rw-r--r-- | Zend/tests/bug33771.phpt | 6 |
8 files changed, 27 insertions, 20 deletions
diff --git a/Zend/tests/007.phpt b/Zend/tests/007.phpt index 3c81a722b1..c55ec37df8 100644 --- a/Zend/tests/007.phpt +++ b/Zend/tests/007.phpt @@ -22,7 +22,7 @@ var_dump(each($a)); echo "Done\n"; ?> --EXPECTF-- -Warning: Wrong parameter count for each() in %s on line %d +Warning: each() expects exactly 1 parameter, 0 given in %s on line %d NULL Warning: Variable passed to each() is not an array or object in %s on line %d diff --git a/Zend/tests/008.phpt b/Zend/tests/008.phpt index cd631003dd..6848258680 100644 --- a/Zend/tests/008.phpt +++ b/Zend/tests/008.phpt @@ -23,18 +23,18 @@ var_dump(constant("test const")); echo "Done\n"; ?> --EXPECTF-- -Warning: Wrong parameter count for define() in %s on line %d +Warning: define() expects at least 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for define() in %s on line %d +Warning: define() expects at least 2 parameters, 1 given in %s on line %d NULL bool(true) -Notice: Constant true already defined in %s on line %d -bool(false) +Warning: define() expects parameter 3 to be boolean, array given in %s on line %d +NULL -Notice: Array to string conversion in %s on line %d -bool(true) +Warning: define() expects parameter 1 to be string (Unicode or binary), array given in %s on line %d +NULL bool(true) bool(true) bool(true) diff --git a/Zend/tests/009.phpt b/Zend/tests/009.phpt index 885115e6d2..3dd8bac771 100644 --- a/Zend/tests/009.phpt +++ b/Zend/tests/009.phpt @@ -40,7 +40,9 @@ unicode(3) "foo" Warning: get_class() called without object from outside a class in %s on line %d bool(false) -bool(false) + +Warning: get_class() expects parameter 1 to be object, Unicode string given in %s on line %d +NULL unicode(3) "foo" unicode(4) "foo2" Done diff --git a/Zend/tests/011.phpt b/Zend/tests/011.phpt index 9513d5a948..dd4255f713 100644 --- a/Zend/tests/011.phpt +++ b/Zend/tests/011.phpt @@ -53,10 +53,10 @@ $bar->test(); echo "Done\n"; ?> --EXPECTF-- -Warning: Wrong parameter count for property_exists() in %s on line %d +Warning: property_exists() expects exactly 2 parameters, 0 given in %s on line %d NULL -Warning: Wrong parameter count for property_exists() in %s on line %d +Warning: property_exists() expects exactly 2 parameters, 1 given in %s on line %d NULL bool(true) bool(false) diff --git a/Zend/tests/017.phpt b/Zend/tests/017.phpt index 7cac6dd315..2837bae5db 100644 --- a/Zend/tests/017.phpt +++ b/Zend/tests/017.phpt @@ -45,17 +45,17 @@ var_dump(count(get_extension_funcs("zend"))); echo "Done\n"; ?> --EXPECTF-- -Warning: Wrong parameter count for get_resource_type() in %s on line %d +Warning: get_resource_type() expects exactly 1 parameter, 0 given in %s on line %d NULL -Warning: Supplied argument is not a valid resource handle in %s on line %d -bool(false) +Warning: get_resource_type() expects parameter 1 to be resource, Unicode string given in %s on line %d +NULL unicode(6) "stream" unicode(7) "Unknown" unicode(5) "array" int(%d) unicode(5) "array" -int(%d) +int(0) Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d NULL diff --git a/Zend/tests/020.phpt b/Zend/tests/020.phpt index 98865f921e..1e2bcff387 100644 --- a/Zend/tests/020.phpt +++ b/Zend/tests/020.phpt @@ -20,11 +20,14 @@ foo(1,2); echo "Done\n"; ?> --EXPECTF-- -bool(false) +Warning: func_get_arg() expects exactly 1 parameter, 3 given in %s on line %d +NULL Warning: func_get_arg(): Called from the global scope - no function context in %s on line %d bool(false) -bool(false) + +Warning: func_get_arg() expects exactly 1 parameter, 0 given in %s on line %d +NULL Warning: func_get_arg(): Argument 1 not passed to function in %s on line %d bool(false) diff --git a/Zend/tests/030.phpt b/Zend/tests/030.phpt index dab506983b..dd78555e05 100644 --- a/Zend/tests/030.phpt +++ b/Zend/tests/030.phpt @@ -31,7 +31,7 @@ $test->bar(); ?> --EXPECTF-- -object(Exception)#2 (6) { +object(Exception)#2 (%d) { [u"message":protected]=> unicode(3) "foo" [u"string":u"Exception":private]=> @@ -61,6 +61,8 @@ object(Exception)#2 (6) { } } } + [u"previous":u"Exception":private]=> + NULL } 'test' => '0' 'test_2' => '1' diff --git a/Zend/tests/bug33771.phpt b/Zend/tests/bug33771.phpt index 761bad9377..0f3dd9815f 100644 --- a/Zend/tests/bug33771.phpt +++ b/Zend/tests/bug33771.phpt @@ -34,7 +34,7 @@ var_dump(error_reporting()); echo "Done\n"; ?> --EXPECT-- -int(16383) -int(16383) -int(14335) +int(32767) +int(32767) +int(30719) Done |