com php-src: Fix is_callable() on abstract method via object: Zend/zend_API.c ext/standard/tests/g eneral_functions/is_callable_abstract_method.phpt

Commit: a50a5c1bf1254424406746dfb51203ec6c56ef46 Author: Nikita Popov <nikic@php.net> Thu, 14 Jul 2016 21:38:10 +0200 Parents: 99a5170781d42d3f2b0e042addc005439dadbb53 Branches: PHP-7.0 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a50a5c1bf1254424406746dfb51203ec6c56ef46 Log: Fix is_callable() on abstract method via object Changed paths: M Zend/zend_API.c A ext/standard/tests/general_functions/is_callable_abstract_method.phpt Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 3ba1783..55c6be8 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3100,7 +3100,7 @@ get_function_via_handler: if (retval) { if (fcc->calling_scope && !call_via_handler) { - if (!fcc->object && (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT)) { + if (fcc->function_handler->common.fn_flags & ZEND_ACC_ABSTRACT) { if (error) { zend_spprintf(error, 0, "cannot call abstract method %s::%s()", ZSTR_VAL(fcc->calling_scope->name), ZSTR_VAL(fcc->function_handler->common.function_name)); retval = 0; diff --git a/ext/standard/tests/general_functions/is_callable_abstract_method.phpt b/ext/standard/tests/general_functions/is_callable_abstract_method.phpt new file mode 100644 index 0000000..0f3d1a6 --- /dev/null +++ b/ext/standard/tests/general_functions/is_callable_abstract_method.phpt @@ -0,0 +1,19 @@ +--TEST-- +is_callable() on abstract method via object should return false +--FILE-- +<?php + +abstract class A { + abstract function foo(); +} + +class B extends A { + function foo() {} +} + +$foo = [new B, 'A::foo']; +var_dump(is_callable($foo)); + +?> +--EXPECT-- +bool(false)