Don't rely on HT internals in datefmt_format_object

Use ZEND_HASH_FOREACH_VAL instead.

Author: nikic

ext/intl/dateformat/dateformat_format_object.cpp

@@ -89,48 +89,39 @@ U_CFUNC PHP_FUNCTION(datefmt_format_object)
 	if (format == NULL || Z_TYPE_P(format) == IS_NULL) {
 		//nothing
 	} else if (Z_TYPE_P(format) == IS_ARRAY) {
-		HashTable		*ht	= Z_ARRVAL_P(format);
-		uint32_t         idx;
-		zval			*z;
-
+		HashTable *ht = Z_ARRVAL_P(format);
 		if (zend_hash_num_elements(ht) != 2) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
 					"datefmt_format_object: bad format; if array, it must have "
 					"two elements", 0);
 			RETURN_FALSE;
 		}
 
-		idx = 0;
-		while (idx < ht->nNumUsed) {
-			z = &ht->arData[idx].val;
-			if (Z_TYPE_P(z) != IS_UNDEF) {
-				break;
+		uint32_t idx = 0;
+		zval *z;
+		ZEND_HASH_FOREACH_VAL(ht, z) {
+			if (!valid_format(z)) {
+				if (idx == 0) {
+					intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+						"datefmt_format_object: bad format; the date format (first "
+						"element of the array) is not valid", 0);
+				} else {
+					ZEND_ASSERT(idx == 1 && "We checked that there are two elements above");
+					intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+						"datefmt_format_object: bad format; the time format (second "
+						"element of the array) is not valid", 0);
+				}
+				RETURN_FALSE;
 			}
-			idx++;
-		}
-		if (idx >= ht->nNumUsed || !valid_format(z)) {
-			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-					"datefmt_format_object: bad format; the date format (first "
-					"element of the array) is not valid", 0);
-			RETURN_FALSE;
-		}
-		dateStyle = (DateFormat::EStyle)Z_LVAL_P(z);
-
-		idx++;
-		while (idx < ht->nNumUsed) {
-			z = &ht->arData[idx].val;
-			if (Z_TYPE_P(z) != IS_UNDEF) {
-				break;
+			if (idx == 0) {
+				dateStyle = (DateFormat::EStyle)Z_LVAL_P(z);
+			} else {
+				ZEND_ASSERT(idx == 1 && "We checked that there are two elements above");
+				timeStyle = (DateFormat::EStyle)Z_LVAL_P(z);
 			}
 			idx++;
-		}
-		if (idx >= ht->nNumUsed || !valid_format(z)) {
-			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-					"datefmt_format_object: bad format; the time format ("
-					"second element of the array) is not valid", 0);
-			RETURN_FALSE;
-		}
-		timeStyle = (DateFormat::EStyle)Z_LVAL_P(z);
+		} ZEND_HASH_FOREACH_END();
+		ZEND_ASSERT(idx == 2 && "We checked that there are two elements above");
 	} else if (Z_TYPE_P(format) == IS_LONG) {
 		if (!valid_format(format)) {
 			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,