- MFB: WS

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 89c49a11794a6366e14f679200a73edf435c2145..ff30d9fccc5f54717025624854f9c682e3a58985 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -668,7 +668,6 @@ ZEND_API ZEND_FUNCTION(display_disabled_function);
 ZEND_API ZEND_FUNCTION(display_disabled_class);
 END_EXTERN_C()
 
-
 #if ZEND_DEBUG
 #define CHECK_ZVAL_STRING(z) \
        if (Z_STRVAL_P(z)[Z_STRLEN_P(z)] != '\0') { zend_error(E_WARNING, "String is not zero-terminated (%s)", Z_STRVAL_P(z)); }

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 0173573b23eeb3e6d9dbf6235d4b8bcb96e36c10..f3d9b6a76bd2de74dc8174d68cc2a7a7c121f887 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -511,7 +511,7 @@ static inline int zend_verify_arg_type(zend_function *zf, zend_uint arg_num, zva
                                        zend_class_entry *ce = zend_u_fetch_class(UG(unicode) ? IS_UNICODE : IS_STRING, cur_arg_info->class_name, cur_arg_info->class_name_len, ZEND_FETCH_CLASS_AUTO TSRMLS_CC);
                                        if (!instanceof_function(Z_OBJCE_P(arg), ce TSRMLS_CC)) {
                                                char *error_msg;
-                                                       if (ce->ce_flags & ZEND_ACC_INTERFACE) {
+                                               if (ce->ce_flags & ZEND_ACC_INTERFACE) {
                                                        error_msg = "implement interface";
                                                } else {
                                                        error_msg = "be an instance of";

diff --git a/Zend/zend_iterators.c b/Zend/zend_iterators.c
index a831456f5c01bf3b8bb2551cb8d6e49d4d6b3c63..74d55e1849eaa975a23aa6e30e738a6dcb196b81 100755 (executable)
--- a/Zend/zend_iterators.c
+++ b/Zend/zend_iterators.c
@@ -87,7 +87,6 @@ ZEND_API enum zend_object_iterator_kind zend_iterator_unwrap(
                        }
                        return ZEND_ITER_INVALID;
 
-
                case IS_ARRAY:
                        if (HASH_OF(array_ptr)) {
                                return ZEND_ITER_PLAIN_ARRAY;

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 803be752e39682ac1f9a25fd4998ec24c27f1c10..2e0c3739fb4c4e7bb5bc13407da17116a39ab4ec 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -957,7 +957,7 @@ static int zend_std_has_property(zval *object, zval *member, int has_set_exists
        zobj = Z_OBJ_P(object);
 
        if (Z_TYPE_P(member) != IS_UNICODE && (UG(unicode) || Z_TYPE_P(member) != IS_STRING)) {
-               ALLOC_ZVAL(tmp_member);
+               ALLOC_ZVAL(tmp_member);
                *tmp_member = *member;
                INIT_PZVAL(tmp_member);
                zval_copy_ctor(tmp_member);