]> granicus.if.org Git - php/commitdiff
Revert "Implemented FR #61602 Allow access to name of constant used as default value"
authorXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:39:00 +0000 (13:39 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 23 May 2012 05:39:00 +0000 (13:39 +0800)
This reverts commit 054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74.

See: http://news.php.net/php.cvs/69137 and the author confirmed.
Will commit later after the author fixed this then make a new PR.

Conflicts:

ext/reflection/php_reflection.c

ext/reflection/php_reflection.c

index 522fef1e5100f848a5e2059d98b3a880a3143e9a..fe657318e2981f5dea3034a921c45cc87cf4e955 100644 (file)
@@ -2409,12 +2409,12 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
                return;
        }
        if (param->offset < param->required) {
-               zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Parameter is not optional"); 
+               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"); 
+       if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2_type == IS_UNUSED) {
+               zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error");
                return;
        }