diff options
-rw-r--r-- | ext/reflection/php_reflection.c | 2 | ||||
-rw-r--r-- | ext/reflection/tests/bug45765.phpt | 82 |
2 files changed, 83 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 0654bcbd28..5d669b865b 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -642,7 +642,7 @@ static void _parameter_string(string *str, zend_function *fptr, struct _zend_arg *zv = precv->op2.u.constant; zval_copy_ctor(zv); INIT_PZVAL(zv); - zval_update_constant(&zv, (void*)1 TSRMLS_CC); + zval_update_constant_ex(&zv, (void*)1, fptr->common.scope TSRMLS_CC); if (Z_TYPE_P(zv) == IS_BOOL) { if (Z_LVAL_P(zv)) { string_write(str, "true", sizeof("true")-1); diff --git a/ext/reflection/tests/bug45765.phpt b/ext/reflection/tests/bug45765.phpt new file mode 100644 index 0000000000..b0c1be2c4c --- /dev/null +++ b/ext/reflection/tests/bug45765.phpt @@ -0,0 +1,82 @@ +--TEST-- +Fixed bug #45765 (ReflectionObject with default parameters of self::xxx cause an error) +--FILE-- +<?php + +class foo2 { + const BAR = 'foobar'; +} + +class foo extends foo2 { + const BAR = "foo's bar"; + + function test($a = self::BAR) { + } + + function test2($a = parent::BAR) { + } + + function test3($a = foo::BAR) { + } + + function test4($a = foo2::BAR) { + } +} + +ReflectionObject::export(new foo); + +?> +--EXPECTF-- +Object of class [ <user> class foo extends foo2 ] { + @@ %s 7-21 + + - Constants [1] { + Constant [ string BAR ] { foo's bar } + } + + - Static properties [0] { + } + + - Static methods [0] { + } + + - Properties [0] { + } + + - Dynamic properties [0] { + } + + - Methods [4] { + Method [ <user> public method test ] { + @@ %s 10 - 11 + + - Parameters [1] { + Parameter #0 [ <optional> $a = 'foo's bar' ] + } + } + + Method [ <user> public method test2 ] { + @@ %s 13 - 14 + + - Parameters [1] { + Parameter #0 [ <optional> $a = 'foobar' ] + } + } + + Method [ <user> public method test3 ] { + @@ %s 16 - 17 + + - Parameters [1] { + Parameter #0 [ <optional> $a = 'foo's bar' ] + } + } + + Method [ <user> public method test4 ] { + @@ %s 19 - 20 + + - Parameters [1] { + Parameter #0 [ <optional> $a = 'foobar' ] + } + } + } +} |