Warning to error in parse_ini_file()

Author: Girgias

ext/standard/array.c

@@ -6174,39 +6174,19 @@ PHP_FUNCTION(array_map)
 PHP_FUNCTION(array_key_exists)
 {
 	zval *key;
+	zend_string *string_key;
+	zend_long int_key;
 	HashTable *ht;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
-		Z_PARAM_ZVAL(key)
+		Z_PARAM_STR_OR_LONG(string_key, int_key)
 		Z_PARAM_ARRAY_HT(ht)
 	ZEND_PARSE_PARAMETERS_END();
 
-	switch (Z_TYPE_P(key)) {
-		case IS_STRING:
-			RETVAL_BOOL(zend_symtable_exists_ind(ht, Z_STR_P(key)));
-			break;
-		case IS_LONG:
-			RETVAL_BOOL(zend_hash_index_exists(ht, Z_LVAL_P(key)));
-			break;
-		case IS_NULL:
-			RETVAL_BOOL(zend_hash_exists_ind(ht, ZSTR_EMPTY_ALLOC()));
-			break;
-		case IS_DOUBLE:
-			RETVAL_BOOL(zend_hash_index_exists(ht, zend_dval_to_lval(Z_DVAL_P(key))));
-			break;
-		case IS_FALSE:
-			RETVAL_BOOL(zend_hash_index_exists(ht, 0));
-			break;
-		case IS_TRUE:
-			RETVAL_BOOL(zend_hash_index_exists(ht, 1));
-			break;
-		case IS_RESOURCE:
-			zend_error(E_WARNING, "Resource ID#%d used as offset, casting to integer (%d)", Z_RES_HANDLE_P(key), Z_RES_HANDLE_P(key));
-			RETVAL_BOOL(zend_hash_index_exists(ht, Z_RES_HANDLE_P(key)));
-			break;
-		default:
-			zend_argument_type_error(1, "must be a valid array offset type");
-			break;
+	if (string_key) {
+		RETVAL_BOOL(zend_symtable_exists_ind(ht, string_key));
+	} else {
+		RETVAL_BOOL(zend_hash_index_exists(ht, int_key));
 	}
 }
 /* }}} */

ext/standard/basic_functions.c

@@ -2653,8 +2653,8 @@ PHP_FUNCTION(parse_ini_file)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (filename_len == 0) {
-		php_error_docref(NULL, E_WARNING, "Filename cannot be empty!");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "cannot be empty");
+		RETURN_THROWS();
 	}
 
 	/* Set callback function */