Commit:    a7df6ce664e6fe85555601531d90318082bb6597
Author:    Xinchen Hui <larue...@php.net>         Wed, 23 May 2012 13:39:00 
+0800
Parents:   621fddab93468219aafb0392c7056e551defa1fa
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=a7df6ce664e6fe85555601531d90318082bb6597

Log:
Revert "Implemented FR #61602 Allow access to name of constant used as default 
value"

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

Bugs:
https://bugs.php.net/61602

Changed paths:
  M  ext/reflection/php_reflection.c


Diff:
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 522fef1..fe65731 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -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;
        }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to