diff options
| author | Xinchen Hui <laruence@php.net> | 2012-08-02 22:16:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-08-02 22:16:46 +0800 |
| commit | 49b202f2cfe04d577671b685b7c0d3a096a433c7 (patch) | |
| tree | 49179e11be0460db2e08aff5fbe3abffa8473af4 /ext/reflection | |
| parent | 2b6ac9e1a0ce6efddba9d513b99a67f8e5d43764 (diff) | |
| download | php-git-49b202f2cfe04d577671b685b7c0d3a096a433c7.tar.gz | |
Fixed bug that can not get default value of parameter if it's not `optional`
Diffstat (limited to 'ext/reflection')
| -rw-r--r-- | ext/reflection/php_reflection.c | 4 | ||||
| -rw-r--r-- | ext/reflection/tests/bug62715.phpt | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 23c9044981..593a0506b0 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2406,10 +2406,6 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Cannot determine default value for internal functions"); return; } - if (param->offset < param->required) { - zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Parameter is not optional"); - return; - } precv = _get_recv_op((zend_op_array*)param->fptr, param->offset); if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2.op_type == IS_UNUSED) { zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error"); diff --git a/ext/reflection/tests/bug62715.phpt b/ext/reflection/tests/bug62715.phpt index 721d484c71..feb67f614b 100644 --- a/ext/reflection/tests/bug62715.phpt +++ b/ext/reflection/tests/bug62715.phpt @@ -10,8 +10,15 @@ foreach ($r->getParameters() as $p) { var_dump($p->isDefaultValueAvailable()); } +foreach ($r->getParameters() as $p) { + if ($p->isDefaultValueAvailable()) { + var_dump($p->getDefaultValue()); + } +} ?> --EXPECT-- bool(true) bool(true) bool(false) +NULL +int(0) |