From: Dmitry Stogov <dmitry@php.net>
Date: Wed, 2 May 2007 17:24:16 +0000 (+0000)
Subject: Reverted the following fixed because of php-5.2.2 release process
X-Git-Tag: php-5.2.2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df61bae6366dfa434818b7a867759f24fdf3b103;p=php

Reverted the following fixed because of php-5.2.2 release process
- Fixed altering $this via argument named "this".
- Fixed bug #41097 (ext/soap returning associative array as indexed without
  using WSDL).
- Fixed bug #41004 (minOccurs="0" and null class member variable).
---

diff --git a/NEWS b/NEWS
index a25191a740..b887706492 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2007, PHP 5.2.3RC3
-- Fixed altering $this via argument named "this". (Dmitry)
 - Fixed iterator_apply() with a callback using __call(). (Johannes)
 - Fixed bug #41215 (setAttribute return code reversed). (Ilia)
 - Fixed bug #41192 (Per Directory Values only work for one key). (Dmitry)
-- Fixed bug #41097 (ext/soap returning associative array as indexed without
-  using WSDL). (Dmitry)
-- Fixed bug #41004 (minOccurs="0" and null class member variable). (Dmitry)
 
 26 Apr 2007, PHP 5.2.2RC2
 - Added GMP_VERSION constant. (Tony)
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c660d83cf4..3d4afa8f81 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1265,18 +1265,9 @@ void zend_do_end_function_declaration(znode *function_token TSRMLS_DC)
 
 void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, znode *class_type, znode *varname, zend_uchar pass_by_reference TSRMLS_DC)
 {
-	zend_op *opline;
+	zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 	zend_arg_info *cur_arg_info;
 
-	if (CG(active_op_array)->scope &&
-		((CG(active_op_array)->fn_flags & ZEND_ACC_STATIC) == 0) &&
-		(Z_TYPE(varname->u.constant) == IS_STRING) &&
-		(Z_STRLEN(varname->u.constant) == sizeof("this")-1) &&
-		(memcmp(Z_STRVAL(varname->u.constant), "this", sizeof("this")) == 0)) {
-		zend_error(E_COMPILE_ERROR, "Cannot re-assign $this");
-	}
-
-	opline = get_next_op(CG(active_op_array) TSRMLS_CC);
 	CG(active_op_array)->num_args++;
 	opline->opcode = op;
 	opline->result = *var;
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 6a2c71d583..2ae06a768a 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1595,8 +1595,6 @@ static int model_to_xml_object(xmlNodePtr node, sdlContentModelPtr model, zval *
 						property = xmlNewNode(NULL, BAD_CAST("BOGUS"));
 						xmlAddChild(node, property);
 						set_xsi_nil(property);
-					} else if (Z_TYPE_P(data) == IS_NULL && model->min_occurs == 0) {
-						return 1;
 					} else {
 						property = master_to_xml(enc, data, style, node);
 						if (property->children && property->children->content &&
@@ -3358,12 +3356,8 @@ static int is_map(zval *array)
 	int i, count = zend_hash_num_elements(Z_ARRVAL_P(array));
 
 	zend_hash_internal_pointer_reset(Z_ARRVAL_P(array));
-	for (i = 0; i < count; i++) {
-		char *str_index;
-		ulong num_index;
-
-		if (zend_hash_get_current_key(Z_ARRVAL_P(array), &str_index, &num_index, 0) == HASH_KEY_IS_STRING ||
-		    num_index != i) {
+	for (i = 0;i < count;i++) {
+		if (zend_hash_get_current_key_type(Z_ARRVAL_P(array)) == HASH_KEY_IS_STRING) {
 			return TRUE;
 		}
 		zend_hash_move_forward(Z_ARRVAL_P(array));