Skip to content

Update ext/standard parameter names #6214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Zend/tests/bug75290.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var_dump(function ($someThing) {});
object(Closure)#2 (1) {
["parameter"]=>
array(1) {
["$number"]=>
["$num"]=>
string(10) "<required>"
}
}
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/bug79783.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bug #79783: Segfault in php_str_replace_common
str_replace("a", "b", "c", strlen("d"));
?>
--EXPECTF--
Fatal error: Uncaught Error: str_replace(): Argument #4 ($replace_count) cannot be passed by reference in %s:%d
Fatal error: Uncaught Error: str_replace(): Argument #4 ($count) cannot be passed by reference in %s:%d
Stack trace:
#0 {main}
thrown in %s on line %d
12 changes: 6 additions & 6 deletions Zend/tests/bug79979.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ Bug #79979 (passing value to by-ref param via CUF(A) crashes)
namespace Foo;

call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
call_user_func_array("str_replace", ["a", "b", "c", "count" => new \stdClass]);

\call_user_func_array("str_replace", ["a", "b", "c", new \stdClass]);
\call_user_func_array("str_replace", ["a", "b", "c", "replace_count" => new \stdClass]);
\call_user_func_array("str_replace", ["a", "b", "c", "count" => new \stdClass]);

?>
--EXPECTF--
Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d

Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d

Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d

Warning: str_replace(): Argument #4 ($replace_count) must be passed by reference, value given in %s on line %d
Warning: str_replace(): Argument #4 ($count) must be passed by reference, value given in %s on line %d
4 changes: 2 additions & 2 deletions Zend/tests/call_user_func_001.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ namespace testing {
?>
--EXPECT--
string(6) "foobar"
call_user_func(): Argument #1 ($function) must be a valid callback, cannot access private method testing\foo::priv()
call_user_func(): Argument #1 ($function) must be a valid callback, cannot access protected method testing\foo::prot()
call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access private method testing\foo::priv()
call_user_func(): Argument #1 ($callback) must be a valid callback, cannot access protected method testing\foo::prot()
4 changes: 2 additions & 2 deletions ext/date/tests/microtime_error.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ float(%s)
int(0)
}
}
microtime(): Argument #1 ($getAsFloat) must be of type bool, array given
microtime(): Argument #1 ($as_float) must be of type bool, array given

--> bad arg: object(stdClass)#%d (0) {
}
microtime(): Argument #1 ($getAsFloat) must be of type bool, stdClass given
microtime(): Argument #1 ($as_float) must be of type bool, stdClass given

--> bad arg: int(1)
float(%s)
2 changes: 1 addition & 1 deletion ext/phar/tests/fgc_edgecases.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ echo file_get_contents("./hi", 0, $context, 50000);
echo file_get_contents("./hi");
echo file_get_contents("./hi", 0, $context, 0, 0);
?>
file_get_contents(): Argument #5 ($maxlen) must be greater than or equal to 0
file_get_contents(): Argument #5 ($max_length) must be greater than or equal to 0
test
test
<?php
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ echo "Done.\n";
--EXPECT--
=> array_multisort:

Name: array1
Name: array
Is passed by reference: yes
Can be passed by value: yes

Expand Down
Loading