archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bug #62441

Browse source 
These checks were introduced by 8646d9afce
back when name resolution was working differently.
This commit is contained in:
Nikita Popov 2015-08-28 18:58:49 +02:00
parent 7f2261d24a
commit ccec609b82
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Zend/tests/bug62441.phpt Normal file
View file

@ -0,0 +1,20 @@
--TEST--
Bug #62441: Incorrect strong typing in namespaced child classes
--FILE--
<?php
namespace {
interface Iface {
function method(stdClass $o);
}
}
namespace ns {
class Foo implements \Iface {
function method(stdClass $o) { }
}
(new Foo)->method(new \stdClass);
}
?>
--EXPECTF--
Fatal error: Declaration of ns\Foo::method(ns\stdClass $o) must be compatible with Iface::method(stdClass $o) in %s on line %d

6
Zend/zend_inheritance.c
View file

@ -213,15 +213,11 @@ static int zend_do_perform_type_hint_check(const zend_function *fe, zend_arg_inf
} }
if (strcasecmp(ZSTR_VAL(fe_class_name), ZSTR_VAL(proto_class_name)) != 0) { if (strcasecmp(ZSTR_VAL(fe_class_name), ZSTR_VAL(proto_class_name)) != 0) {
const char *colon;
if (fe->common.type != ZEND_USER_FUNCTION) { if (fe->common.type != ZEND_USER_FUNCTION) {
zend_string_release(proto_class_name); zend_string_release(proto_class_name);
zend_string_release(fe_class_name); zend_string_release(fe_class_name);
return 0; return 0;
} else if (strchr(ZSTR_VAL(proto_class_name), '\\') != NULL || } else {
(colon = zend_memrchr(ZSTR_VAL(fe_class_name), '\\', ZSTR_LEN(fe_class_name))) == NULL ||
strcasecmp(colon+1, ZSTR_VAL(proto_class_name)) != 0) {
zend_class_entry *fe_ce, *proto_ce; zend_class_entry *fe_ce, *proto_ce;
fe_ce = zend_lookup_class(fe_class_name); fe_ce = zend_lookup_class(fe_class_name);