WS, merged from trunk cause this issue, sorry

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e2b487291f3f46fe237566a366e9693781d83a6e..6cf0f7d2be1a9cd3fe8162bae0ae6ce8f6515bee 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2391,23 +2391,23 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else if (OP2_TYPE != IS_CONST &&
-                       EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) && 
-                       zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+                               EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
+                               zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
                        zend_class_entry *ce;
                        zval **method = NULL;
                        zval **obj = NULL;
 
                        zend_hash_index_find(Z_ARRVAL_P(function_name), 0, (void **) &obj);
                        zend_hash_index_find(Z_ARRVAL_P(function_name), 1, (void **) &method);
-                       
+
                        if (Z_TYPE_PP(obj) != IS_STRING && Z_TYPE_PP(obj) != IS_OBJECT) {
                                zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
                        }
-                       
+
                        if (Z_TYPE_PP(method) != IS_STRING) {
                                zend_error_noreturn(E_ERROR, "Second array member is not a valid method");
                        }
-                       
+
                        if (Z_TYPE_PP(obj) == IS_STRING) {
                                ce = zend_fetch_class_by_name(Z_STRVAL_PP(obj), Z_STRLEN_PP(obj), NULL, 0 TSRMLS_CC);
                                if (UNEXPECTED(ce == NULL)) {
@@ -2415,7 +2415,7 @@ ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
                                }
                                EX(called_scope) = ce;
                                EX(object) = NULL;
-                               
+
                                if (ce->get_static_method) {
                                        EX(fbc) = ce->get_static_method(ce, Z_STRVAL_PP(method), Z_STRLEN_PP(method) TSRMLS_CC);
                                } else {
@@ -4509,16 +4509,16 @@ ZEND_VM_C_LABEL(num_index_prop):
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 5289d7572264b8519ac3fc3d21e0f399410e26c0..ae186664999a9653498602c7c3e3d312cb02e059 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1247,8 +1247,8 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPCODE
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else if (IS_CONST != IS_CONST &&
-                       EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
-                       zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+                               EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
+                               zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
                        zend_class_entry *ce;
                        zval **method = NULL;
                        zval **obj = NULL;
@@ -1548,8 +1548,8 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_TMP_HANDLER(ZEND_OPCODE_H
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else if (IS_TMP_VAR != IS_CONST &&
-                       EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
-                       zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+                               EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
+                               zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
                        zend_class_entry *ce;
                        zval **method = NULL;
                        zval **obj = NULL;
@@ -1711,8 +1711,8 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_VAR_HANDLER(ZEND_OPCODE_H
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else if (IS_VAR != IS_CONST &&
-                       EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
-                       zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+                               EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
+                               zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
                        zend_class_entry *ce;
                        zval **method = NULL;
                        zval **obj = NULL;
@@ -1907,8 +1907,8 @@ static int ZEND_FASTCALL  ZEND_INIT_FCALL_BY_NAME_SPEC_CV_HANDLER(ZEND_OPCODE_HA
                        CHECK_EXCEPTION();
                        ZEND_VM_NEXT_OPCODE();
                } else if (IS_CV != IS_CONST &&
-                       EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
-                       zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
+                               EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
+                               zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
                        zend_class_entry *ce;
                        zval **method = NULL;
                        zval **obj = NULL;
@@ -14039,16 +14039,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -15952,16 +15952,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -18223,16 +18223,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -21144,16 +21144,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -22478,16 +22478,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -23635,16 +23635,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -24792,16 +24792,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -26215,16 +26215,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -29531,16 +29531,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -31318,16 +31318,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -33462,16 +33462,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {
@@ -36120,16 +36120,16 @@ num_index_prop:
 
                if (Z_TYPE_P(offset) != IS_LONG) {
                        if (Z_TYPE_P(offset) <= IS_BOOL /* simple scalar types */
-                               || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
+                                       || (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
                                                && IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
-                       ZVAL_COPY_VALUE(&tmp, offset);
-                       zval_copy_ctor(&tmp);
-                       convert_to_long(&tmp);
-                       offset = &tmp;
+                               ZVAL_COPY_VALUE(&tmp, offset);
+                               zval_copy_ctor(&tmp);
+                               convert_to_long(&tmp);
+                               offset = &tmp;
                        } else {
                                /* can not be converted to proper offset, return "not set" */
                                result = 0;
-               }
+                       }
                }
                if (Z_TYPE_P(offset) == IS_LONG) {
                        if (opline->extended_value & ZEND_ISSET) {