Skip to content

Fix is_callable $callable_name for anon class methods #2381

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.

Sign up for GitHub

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 2 commits into from
Closed

Fix is_callable $callable_name for anon class methods #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16fa2ab
Fix `is_callable()` `$callable_name` for anon class methods
adsr Feb 11, 2017
22eda35
Always return full callable_name in is_callable
adsr Feb 11, 2017
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
22 changes: 22 additions & 0 deletions ext/standard/tests/general_functions/is_callable_anon.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
--TEST--
Test is_callable() function : usage variations - anonymous class method
--FILE--
<?php

new class {
function __construct() {
$fname = null;
if (is_callable([$this, 'f'], false, $fname)) {
call_user_func($fname);
} else {
echo "dang\n";
}
}
function f() {
echo "nice\n";
}
};

?>
--EXPECT--
nice
79 changes: 39 additions & 40 deletions ext/standard/tests/general_functions/is_callable_variation1.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ function check_iscallable( $functions ) {
var_dump( is_callable($func) ); //given only $var argument
var_dump( is_callable($func, TRUE) ); //given $var and $syntax argument
var_dump( is_callable($func, TRUE, $callable_name) );
echo $callable_name, "\n";
echo json_encode($callable_name) . "\n";
var_dump( is_callable($func, FALSE) ); //given $var and $syntax argument
var_dump( is_callable($func, FALSE, $callable_name) );
echo $callable_name, "\n";
echo json_encode($callable_name) . "\n";
$counter++;
}
}
Expand Down Expand Up @@ -59,150 +59,149 @@ check_iscallable($undef_functions);

?>
===DONE===
--EXPECTF--
*** Testing is_callable() on undefined functions ***
-- Iteration 1 --
bool(false)
bool(true)
bool(true)

""
bool(false)
bool(false)

""
-- Iteration 2 --
bool(false)
bool(true)
bool(true)

""
bool(false)
bool(false)

""
-- Iteration 3 --
bool(false)
bool(true)
bool(true)
" "
bool(false)
bool(false)
" "
-- Iteration 4 --
bool(false)
bool(true)
bool(true)
" "
bool(false)
bool(false)
" "
-- Iteration 5 --
bool(false)
bool(true)
bool(true)
12356
"12356"
bool(false)
bool(false)
12356
"12356"
-- Iteration 6 --
bool(false)
bool(true)
bool(true)

"\u0000"
bool(false)
bool(false)

"\u0000"
-- Iteration 7 --
bool(false)
bool(true)
bool(true)
\0
"\\0"
bool(false)
bool(false)
\0
"\\0"
-- Iteration 8 --
bool(false)
bool(true)
bool(true)
hello world
"hello world"
bool(false)
bool(false)
hello world
"hello world"
-- Iteration 9 --
bool(false)
bool(true)
bool(true)
hello world
"hello world"
bool(false)
bool(false)
hello world
"hello world"
-- Iteration 10 --
bool(false)
bool(true)
bool(true)
welcome
"welcome\u0000"
bool(false)
bool(false)
welcome
"welcome\u0000"
-- Iteration 11 --
bool(false)
bool(true)
bool(true)
welcome\0
"welcome\\0"
bool(false)
bool(false)
welcome\0
"welcome\\0"
-- Iteration 12 --
bool(false)
bool(true)
bool(true)
==%%%***$$$@@@!!
"==%%%***$$$@@@!!"
bool(false)
bool(false)
==%%%***$$$@@@!!
"==%%%***$$$@@@!!"
-- Iteration 13 --
bool(false)
bool(true)
bool(true)
false
"false"
bool(false)
bool(false)
false
"false"
-- Iteration 14 --
bool(false)
bool(true)
bool(true)
8
"8"
bool(false)
bool(false)
8
"8"
-- Iteration 15 --
bool(false)
bool(true)
bool(true)
\t
"\\t"
bool(false)
bool(false)
\t
"\\t"
-- Iteration 16 --
bool(false)
bool(true)
bool(true)
\007
"\\007"
bool(false)
bool(false)
\007
"\\007"
-- Iteration 17 --
bool(false)
bool(true)
bool(true)
123
"123"
bool(false)
bool(false)
123
"123"
-- Iteration 18 --
bool(false)
bool(true)
bool(true)
echo()
"echo()"
bool(false)
bool(false)
echo()
===DONE===
"echo()"
===DONE===
8 changes: 1 addition & 7 deletions ext/standard/type.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,7 @@ PHP_FUNCTION(is_callable)
if (ZEND_NUM_ARGS() > 2) {
retval = zend_is_callable_ex(var, NULL, check_flags, &name, NULL, &error);
zval_dtor(callable_name);
//??? is it necessary to be consistent with old PHP ("\0" support)
if (UNEXPECTED(ZSTR_LEN(name) != strlen(ZSTR_VAL(name)))) {
ZVAL_STRINGL(callable_name, ZSTR_VAL(name), strlen(ZSTR_VAL(name)));
zend_string_release(name);
} else {
ZVAL_STR(callable_name, name);
}
ZVAL_STR(callable_name, name);
} else {
retval = zend_is_callable_ex(var, NULL, check_flags, NULL, NULL, &error);
}
Expand Down