diff --git a/UPGRADING b/UPGRADING
index 1f6df9e880310..02fc9e61e24de 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -52,6 +52,27 @@ PHP 8.3 UPGRADE NOTES
   . C functions that have a return type of void now return null instead of
     returning the following object object(FFI\CData:void) { }
 
+- Standard:
+  . The range() function has had various changes:
+    * A TypeError is now thrown when passing objects, resources, or arrays
+      as the boundary inputs
+    * A more descriptive ValueError is thrown when passing 0 for $step
+    * A ValueError is now thrown when using a negative $step for increasing ranges
+    * If $step is a float that can be interpreted as an int, it is now done so
+    * A ValueError is now thrown if any argument is infinity or NAN
+    * An E_WARNING is now emitted if $start or $end is the empty string.
+      The value continues to be cast to the value 0.
+    * An E_WARNING is now emitted if $start or $end has more than one byte,
+      only if it is a non-numeric string.
+    * An E_WARNING is now emitted if $start or $end is cast to an integer
+      because the other boundary input is a number. (e.g. range(5, 'z');)
+    * An E_WARNING is now emitted if $step is a float when trying to generate
+      a range of characters, except if both boundary inputs are numeric strings
+      (e.g. range('5', '9', 0.5); does not produce a warning)
+    * range() now produce a list of characters if one of the boundary inputs is
+      a string digit instead of casting the other input to int
+      (e.g. range('5', 'z');)
+
 ========================================
 2. New Features
 ========================================
@@ -113,7 +134,7 @@ PHP 8.3 UPGRADE NOTES
   . Changed DOMCharacterData::appendData() tentative return type to true.
 
 - Intl:
-  . datefmt_set_timezone (and its alias IntlDateformatter::setTimeZone) 
+  . datefmt_set_timezone (and its alias IntlDateformatter::setTimeZone)
     now returns true on success, previously null was returned.
   . IntlBreakiterator::setText() now returns false on failure, previously
     null was returned.
diff --git a/ext/standard/array.c b/ext/standard/array.c
index 19269c36a9f8c..235bdf79d5a4c 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -2757,11 +2757,11 @@ PHP_FUNCTION(array_fill_keys)
 }
 /* }}} */
 
-#define RANGE_CHECK_DOUBLE_INIT_ARRAY(start, end) do { \
-		double __calc_size = ((start - end) / step) + 1; \
+#define RANGE_CHECK_DOUBLE_INIT_ARRAY(start, end, _step) do { \
+		double __calc_size = ((start - end) / (_step)) + 1; \
 		if (__calc_size >= (double)HT_MAX_SIZE) { \
 			zend_value_error(\
-					"The supplied range exceeds the maximum array size: start=%0.0f end=%0.0f", end, start); \
+					"The supplied range exceeds the maximum array size: start=%0.1f end=%0.1f step=%0.1f", end, start, (_step)); \
 			RETURN_THROWS(); \
 		} \
 		size = (uint32_t)_php_math_round(__calc_size, 0, PHP_ROUND_HALF_UP); \
@@ -2769,11 +2769,11 @@ PHP_FUNCTION(array_fill_keys)
 		zend_hash_real_init_packed(Z_ARRVAL_P(return_value)); \
 	} while (0)
 
-#define RANGE_CHECK_LONG_INIT_ARRAY(start, end) do { \
-		zend_ulong __calc_size = ((zend_ulong) start - end) / lstep; \
+#define RANGE_CHECK_LONG_INIT_ARRAY(start, end, _step) do { \
+		zend_ulong __calc_size = ((zend_ulong) start - end) / (_step); \
 		if (__calc_size >= HT_MAX_SIZE - 1) { \
 			zend_value_error(\
-					"The supplied range exceeds the maximum array size: start=" ZEND_LONG_FMT " end=" ZEND_LONG_FMT, end, start); \
+					"The supplied range exceeds the maximum array size: start=" ZEND_LONG_FMT " end=" ZEND_LONG_FMT " step=" ZEND_LONG_FMT, end, start, (_step)); \
 			RETURN_THROWS(); \
 		} \
 		size = (uint32_t)(__calc_size + 1); \
@@ -2781,77 +2781,219 @@ PHP_FUNCTION(array_fill_keys)
 		zend_hash_real_init_packed(Z_ARRVAL_P(return_value)); \
 	} while (0)
 
+/* Process input for the range() function
+ * 0 on exceptions
+ * IS_LONG if only interpretable as int
+ * IS_DOUBLE if only interpretable as float
+ * IS_STRING if only interpretable as string
+ * IS_ARRAY (as IS_LONG < IS_STRING < IS_ARRAY) for ambiguity of single byte strings which contains a digit */
+static uint8_t php_range_process_input(const zval *input, uint32_t arg_num, zend_long /* restrict */ *lval, double /* restrict */ *dval)
+{
+	switch (Z_TYPE_P(input)) {
+		case IS_LONG:
+			*lval = Z_LVAL_P(input);
+			*dval = (double) Z_LVAL_P(input);
+			return IS_LONG;
+		case IS_DOUBLE:
+			*dval = Z_DVAL_P(input);
+			check_dval_value:
+			if (zend_isinf(*dval)) {
+				zend_argument_value_error(arg_num, "must be a finite number, INF provided");
+				return 0;
+			}
+			if (zend_isnan(*dval)) {
+				zend_argument_value_error(arg_num, "must be a finite number, NAN provided");
+				return 0;
+			}
+			return IS_DOUBLE;
+		case IS_STRING: {
+			/* Process strings:
+			 * - Empty strings are converted to 0 with a diagnostic
+			 * - Check if string is numeric and store the values in passed pointer
+			 * - If numeric float, this means it cannot be a numeric string with only one byte GOTO IS_DOUBLE
+			 * - If numeric int, check it is one byte or not
+			 *   - If it one byte, return IS_ARRAY as IS_LONG < IS_STRING < IS_ARRAY
+			 *   - If not should only be interpreted as int, return IS_LONG;
+			 * - Otherwise is a string and return IS_STRING */
+			if (Z_STRLEN_P(input) == 0) {
+				const char *arg_name = get_active_function_arg_name(arg_num);
+				php_error_docref(NULL, E_WARNING, "Argument #%d ($%s) must not be empty, casted to 0", arg_num, arg_name);
+				if (UNEXPECTED(EG(exception))) {
+					return 0;
+				}
+				*lval = 0;
+				*dval = 0.0;
+				return IS_LONG;
+			}
+			uint8_t type = is_numeric_str_function(Z_STR_P(input), lval, dval);
+			if (type == IS_DOUBLE) {
+				goto check_dval_value;
+			}
+			if (type == IS_LONG) {
+				*dval = (double) *lval;
+				if (Z_STRLEN_P(input) == 1) {
+					return IS_ARRAY;
+				} else {
+					return IS_LONG;
+				}
+			}
+			if (Z_STRLEN_P(input) != 1) {
+				const char *arg_name = get_active_function_arg_name(arg_num);
+				php_error_docref(NULL, E_WARNING, "Argument #%d ($%s) must be a single byte, subsequent bytes are ignored", arg_num, arg_name);
+				if (UNEXPECTED(EG(exception))) {
+					return 0;
+				}
+			}
+			/* Set fall back values to 0 in case the other argument is not a string */
+			*lval = 0;
+			*dval = 0.0;
+			return IS_STRING;
+		}
+		EMPTY_SWITCH_DEFAULT_CASE();
+	}
+}
+
 /* {{{ Create an array containing the range of integers or characters from low to high (inclusive) */
 PHP_FUNCTION(range)
 {
-	zval *zlow, *zhigh, *zstep = NULL, tmp;
-	int err = 0, is_step_double = 0;
-	double step = 1.0;
+	zval *user_start, *user_end, *user_step = NULL, tmp;
+	bool is_step_double = false;
+	bool is_step_negative = false;
+	double step_double = 1.0;
+	zend_long step = 1;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
-		Z_PARAM_ZVAL(zlow)
-		Z_PARAM_ZVAL(zhigh)
+		Z_PARAM_NUMBER_OR_STR(user_start)
+		Z_PARAM_NUMBER_OR_STR(user_end)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_NUMBER(zstep)
+		Z_PARAM_NUMBER(user_step)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (zstep) {
-		is_step_double = Z_TYPE_P(zstep) == IS_DOUBLE;
-		step = zval_get_double(zstep);
+	if (user_step) {
+		if (UNEXPECTED(Z_TYPE_P(user_step) == IS_DOUBLE)) {
+			step_double = Z_DVAL_P(user_step);
+
+			if (zend_isinf(step_double)) {
+				zend_argument_value_error(3, "must be a finite number, INF provided");
+				RETURN_THROWS();
+			}
+			if (zend_isnan(step_double)) {
+				zend_argument_value_error(3, "must be a finite number, NAN provided");
+				RETURN_THROWS();
+			}
 
-		/* We only want positive step values. */
-		if (step < 0.0) {
-			step *= -1;
+			/* We only want positive step values. */
+			if (step_double < 0.0) {
+				is_step_negative = true;
+				step_double *= -1;
+			}
+			step = zend_dval_to_lval(step_double);
+			if (!zend_is_long_compatible(step_double, step)) {
+				is_step_double = true;
+			}
+		} else {
+			step = Z_LVAL_P(user_step);
+			/* We only want positive step values. */
+			if (step < 0) {
+				is_step_negative = true;
+				step *= -1;
+			}
+			step_double = (double) step;
+		}
+		if (step_double == 0.0) {
+			zend_argument_value_error(3, "cannot be 0");
+			RETURN_THROWS();
 		}
 	}
 
-	/* If the range is given as strings, generate an array of characters. */
-	if (Z_TYPE_P(zlow) == IS_STRING && Z_TYPE_P(zhigh) == IS_STRING && Z_STRLEN_P(zlow) >= 1 && Z_STRLEN_P(zhigh) >= 1) {
-		int type1, type2;
-		unsigned char low, high;
-		zend_long lstep = (zend_long) step;
+	uint8_t start_type;
+	double start_double;
+	zend_long start_long;
+	uint8_t end_type;
+	double end_double;
+	zend_long end_long;
+
+	start_type = php_range_process_input(user_start, 1, &start_long, &start_double);
+	if (start_type == 0) {
+		RETURN_THROWS();
+	}
+	end_type = php_range_process_input(user_end, 2, &end_long, &end_double);
+	if (end_type == 0) {
+		RETURN_THROWS();
+	}
 
-		type1 = is_numeric_string(Z_STRVAL_P(zlow), Z_STRLEN_P(zlow), NULL, NULL, 0);
-		type2 = is_numeric_string(Z_STRVAL_P(zhigh), Z_STRLEN_P(zhigh), NULL, NULL, 0);
+	/* If the range is given as strings, generate an array of characters. */
+	if (start_type >= IS_STRING || end_type >= IS_STRING) {
+		/* If one of the inputs is NOT a string */
+		if (UNEXPECTED(start_type + end_type < 2*IS_STRING)) {
+			if (start_type < IS_STRING) {
+				if (end_type != IS_ARRAY) {
+					php_error_docref(NULL, E_WARNING, "Argument #1 ($start) must be a single byte string if"
+						" argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0");
+				}
+				end_type = IS_LONG;
+			} else if (end_type < IS_STRING) {
+				if (start_type != IS_ARRAY) {
+					php_error_docref(NULL, E_WARNING, "Argument #2 ($end) must be a single byte string if"
+						" argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0");
+				}
+				start_type = IS_LONG;
+			}
+			if (UNEXPECTED(EG(exception))) {
+				RETURN_THROWS();
+			}
+			goto handle_numeric_inputs;
+		}
 
-		if (type1 == IS_DOUBLE || type2 == IS_DOUBLE || is_step_double) {
-			goto double_str;
-		} else if (type1 == IS_LONG || type2 == IS_LONG) {
-			goto long_str;
+		if (is_step_double) {
+			/* Only emit warning if one of the input is not a numeric digit */
+			if (start_type == IS_STRING || end_type == IS_STRING) {
+				php_error_docref(NULL, E_WARNING, "Argument #3 ($step) must be of type int when generating an array"
+					" of characters, inputs converted to 0");
+			}
+			if (UNEXPECTED(EG(exception))) {
+				RETURN_THROWS();
+			}
+			end_type = IS_LONG;
+			start_type = IS_LONG;
+			goto handle_numeric_inputs;
 		}
 
-		low = (unsigned char)Z_STRVAL_P(zlow)[0];
-		high = (unsigned char)Z_STRVAL_P(zhigh)[0];
+		/* Generate array of characters */
+		unsigned char low = (unsigned char)Z_STRVAL_P(user_start)[0];
+		unsigned char high = (unsigned char)Z_STRVAL_P(user_end)[0];
 
-		if (low > high) {		/* Negative Steps */
-			if (low - high < lstep || lstep <= 0) {
-				err = 1;
-				goto err;
+		/* Decreasing char range */
+		if (low > high) {
+			if (low - high < step) {
+				goto boundary_error;
 			}
 			/* Initialize the return_value as an array. */
-			array_init_size(return_value, (uint32_t)(((low - high) / lstep) + 1));
+			array_init_size(return_value, (uint32_t)(((low - high) / step) + 1));
 			zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (; low >= high; low -= (unsigned int)lstep) {
+				for (; low >= high; low -= (unsigned int)step) {
 					ZEND_HASH_FILL_SET_INTERNED_STR(ZSTR_CHAR(low));
 					ZEND_HASH_FILL_NEXT();
-					if (((signed int)low - lstep) < 0) {
+					if (((signed int)low - step) < 0) {
 						break;
 					}
 				}
 			} ZEND_HASH_FILL_END();
-		} else if (high > low) {	/* Positive Steps */
-			if (high - low < lstep || lstep <= 0) {
-				err = 1;
-				goto err;
+		} else if (high > low) { /* Increasing char range */
+			if (is_step_negative) {
+				goto negative_step_error;
+			}
+			if (high - low < step) {
+				goto boundary_error;
 			}
-			array_init_size(return_value, (uint32_t)(((high - low) / lstep) + 1));
+			array_init_size(return_value, (uint32_t)(((high - low) / step) + 1));
 			zend_hash_real_init_packed(Z_ARRVAL_P(return_value));
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (; low <= high; low += (unsigned int)lstep) {
+				for (; low <= high; low += (unsigned int)step) {
 					ZEND_HASH_FILL_SET_INTERNED_STR(ZSTR_CHAR(low));
 					ZEND_HASH_FILL_NEXT();
-					if (((signed int)low + lstep) > 255) {
+					if (((signed int)low + step) > 255) {
 						break;
 					}
 				}
@@ -2861,110 +3003,100 @@ PHP_FUNCTION(range)
 			ZVAL_CHAR(&tmp, low);
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 		}
-	} else if (Z_TYPE_P(zlow) == IS_DOUBLE || Z_TYPE_P(zhigh) == IS_DOUBLE || is_step_double) {
-		double low, high, element;
-		uint32_t i, size;
-double_str:
-		low = zval_get_double(zlow);
-		high = zval_get_double(zhigh);
+		return;
+	}
 
-		if (zend_isinf(high) || zend_isinf(low)) {
-			zend_value_error("Invalid range supplied: start=%0.0f end=%0.0f", low, high);
-			RETURN_THROWS();
-		}
+	handle_numeric_inputs:
+	if (start_type == IS_DOUBLE || end_type == IS_DOUBLE || is_step_double) {
+		double element;
+		uint32_t i, size;
 
-		if (low > high) { 		/* Negative steps */
-			if (low - high < step || step <= 0) {
-				err = 1;
-				goto err;
+		/* Decreasing float range */
+		if (start_double > end_double) {
+			if (start_double - end_double < step_double) {
+				goto boundary_error;
 			}
 
-			RANGE_CHECK_DOUBLE_INIT_ARRAY(low, high);
+			RANGE_CHECK_DOUBLE_INIT_ARRAY(start_double, end_double, step_double);
 
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (i = 0, element = low; i < size && element >= high; ++i, element = low - (i * step)) {
+				for (i = 0, element = start_double; i < size && element >= end_double; ++i, element = start_double - (i * step_double)) {
 					ZEND_HASH_FILL_SET_DOUBLE(element);
 					ZEND_HASH_FILL_NEXT();
 				}
 			} ZEND_HASH_FILL_END();
-		} else if (high > low) { 	/* Positive steps */
-			if (high - low < step || step <= 0) {
-				err = 1;
-				goto err;
+		} else if (end_double > start_double) { /* Increasing float range */
+			if (is_step_negative) {
+				goto negative_step_error;
+			}
+			if (end_double - start_double < step_double) {
+				goto boundary_error;
 			}
 
-			RANGE_CHECK_DOUBLE_INIT_ARRAY(high, low);
+			RANGE_CHECK_DOUBLE_INIT_ARRAY(end_double, start_double, step_double);
 
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
-				for (i = 0, element = low; i < size && element <= high; ++i, element = low + (i * step)) {
+				for (i = 0, element = start_double; i < size && element <= end_double; ++i, element = start_double + (i * step_double)) {
 					ZEND_HASH_FILL_SET_DOUBLE(element);
 					ZEND_HASH_FILL_NEXT();
 				}
 			} ZEND_HASH_FILL_END();
 		} else {
 			array_init(return_value);
-			ZVAL_DOUBLE(&tmp, low);
+			ZVAL_DOUBLE(&tmp, start_double);
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 		}
 	} else {
-		zend_long low, high;
-		/* lstep is a zend_ulong so that comparisons to it don't overflow, i.e. low - high < lstep */
-		zend_ulong lstep;
+		ZEND_ASSERT(start_type == IS_LONG && end_type == IS_LONG && !is_step_double);
+		/* unsigned_step is a zend_ulong so that comparisons to it don't overflow, i.e. low - high < lstep */
+		zend_ulong unsigned_step= (zend_ulong)step;
 		uint32_t i, size;
-long_str:
-		low = zval_get_long(zlow);
-		high = zval_get_long(zhigh);
-
-		if (step <= 0) {
-			err = 1;
-			goto err;
-		}
 
-		lstep = (zend_ulong)step;
-		if (step <= 0) {
-			err = 1;
-			goto err;
-		}
-
-		if (low > high) { 		/* Negative steps */
-			if ((zend_ulong)low - high < lstep) {
-				err = 1;
-				goto err;
+		/* Decreasing int range */
+		if (start_long > end_long) {
+			if ((zend_ulong)start_long - end_long < unsigned_step) {
+				goto boundary_error;
 			}
 
-			RANGE_CHECK_LONG_INIT_ARRAY(low, high);
+			RANGE_CHECK_LONG_INIT_ARRAY(start_long, end_long, unsigned_step);
 
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
 				for (i = 0; i < size; ++i) {
-					ZEND_HASH_FILL_SET_LONG(low - (i * lstep));
+					ZEND_HASH_FILL_SET_LONG(start_long - (i * unsigned_step));
 					ZEND_HASH_FILL_NEXT();
 				}
 			} ZEND_HASH_FILL_END();
-		} else if (high > low) { 	/* Positive steps */
-			if ((zend_ulong)high - low < lstep) {
-				err = 1;
-				goto err;
+		} else if (end_long > start_long) { /* Increasing int range */
+			if (is_step_negative) {
+				goto negative_step_error;
+			}
+			if ((zend_ulong)end_long - start_long < unsigned_step) {
+				goto boundary_error;
 			}
 
-			RANGE_CHECK_LONG_INIT_ARRAY(high, low);
+			RANGE_CHECK_LONG_INIT_ARRAY(end_long, start_long, unsigned_step);
 
 			ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
 				for (i = 0; i < size; ++i) {
-					ZEND_HASH_FILL_SET_LONG(low + (i * lstep));
+					ZEND_HASH_FILL_SET_LONG(start_long + (i * unsigned_step));
 					ZEND_HASH_FILL_NEXT();
 				}
 			} ZEND_HASH_FILL_END();
 		} else {
 			array_init(return_value);
-			ZVAL_LONG(&tmp, low);
+			ZVAL_LONG(&tmp, start_long);
 			zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 		}
 	}
-err:
-	if (err) {
-		zend_argument_value_error(3, "must not exceed the specified range");
-		RETURN_THROWS();
-	}
+	return;
+
+negative_step_error:
+	zend_argument_value_error(3, "must be greater than 0 for increasing ranges");
+	RETURN_THROWS();
+
+boundary_error:
+	zend_argument_value_error(3, "must be less than the range spanned by argument #1 ($start) and argument #2 ($end)");
+	RETURN_THROWS();
 }
 /* }}} */
 
diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php
index effb05ff9f982..9ce2224a78292 100755
--- a/ext/standard/basic_functions.stub.php
+++ b/ext/standard/basic_functions.stub.php
@@ -1644,11 +1644,7 @@ function array_fill(int $start_index, int $count, mixed $value): array {}
 /** @refcount 1 */
 function array_fill_keys(array $keys, mixed $value): array {}
 
-/**
- * @param string|int|float $start
- * @param string|int|float $end
- */
-function range($start, $end, int|float $step = 1): array {}
+function range(string|int|float $start, string|int|float $end, int|float $step = 1): array {}
 
 function shuffle(array &$array): true {}
 
diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h
index 5612ee21867e8..1fb54cd02d8ef 100644
--- a/ext/standard/basic_functions_arginfo.h
+++ b/ext/standard/basic_functions_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 9cc9c0954bd7032d363ce9a531be621274b9a7e2 */
+ * Stub hash: b0767630614e040866bd7ffdaf50dd31298a64f3 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -181,8 +181,8 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_fill_keys, 0, 2, IS_ARRAY,
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_range, 0, 2, IS_ARRAY, 0)
-	ZEND_ARG_INFO(0, start)
-	ZEND_ARG_INFO(0, end)
+	ZEND_ARG_TYPE_MASK(0, start, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
+	ZEND_ARG_TYPE_MASK(0, end, MAY_BE_STRING|MAY_BE_LONG|MAY_BE_DOUBLE, NULL)
 	ZEND_ARG_TYPE_MASK(0, step, MAY_BE_LONG|MAY_BE_DOUBLE, "1")
 ZEND_END_ARG_INFO()
 
diff --git a/ext/standard/tests/array/range/bug32021.phpt b/ext/standard/tests/array/range/bug32021.phpt
index 5d3b421ab468f..3ffc677b89e5c 100644
--- a/ext/standard/tests/array/range/bug32021.phpt
+++ b/ext/standard/tests/array/range/bug32021.phpt
@@ -6,7 +6,10 @@ $foo = range('', 'z');
 var_dump($foo);
 ?>
 ALIVE
---EXPECT--
+--EXPECTF--
+Warning: range(): Argument #1 ($start) must not be empty, casted to 0 in %s on line %d
+
+Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
 array(1) {
   [0]=>
   int(0)
diff --git a/ext/standard/tests/array/range/range.phpt b/ext/standard/tests/array/range/range.phpt
deleted file mode 100644
index c05cbfa9855d7..0000000000000
--- a/ext/standard/tests/array/range/range.phpt
+++ /dev/null
@@ -1,448 +0,0 @@
---TEST--
-Test range() function
---INI--
-serialize_precision=14
---FILE--
-<?php
-
-echo "*** Testing range() function on basic operations ***\n";
-
-echo "\n-- Integers as Low and High --\n";
-echo "-- An array of elements from low to high --\n";
-var_dump( range(1, 10) );
-echo "\n-- An array of elements from high to low --\n";
-var_dump( range(10, 1) );
-
-echo "\n-- Numeric Strings as Low and High --\n";
-echo "-- An array of elements from low to high --\n";
-var_dump( range("1", "10") );
-echo "\n-- An array of elements from high to low --\n";
-var_dump( range("10", "1") );
-
-echo "\n-- Chars as Low and High --\n";
-echo "-- An array of elements from low to high --\n";
-var_dump( range("a", "z") );
-echo "\n-- An array of elements from high to low --\n";
-var_dump( range("z", "a") );
-
-echo "\n-- Low and High are equal --\n";
-var_dump( range(5, 5) );
-var_dump( range("q", "q") );
-
-echo "\n-- floats as Low and High --\n";
-var_dump( range(5.1, 10.1) );
-var_dump( range(10.1, 5.1) );
-
-var_dump( range("5.1", "10.1") );
-var_dump( range("10.1", "5.1") );
-
-echo "\n-- Passing step with Low and High --\n";
-var_dump( range(1, 2, 0.1) );
-var_dump( range(2, 1, 0.1) );
-
-var_dump( range(1, 2, "0.1") );
-var_dump( range("1", "2", 0.1) );
-
-echo "\n-- Testing basic string with step --\n";
-var_dump( range("abcd", "mnop", 2) );
-
-echo "Done\n";
-?>
---EXPECT--
-*** Testing range() function on basic operations ***
-
--- Integers as Low and High --
--- An array of elements from low to high --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-
--- An array of elements from high to low --
-array(10) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(9)
-  [2]=>
-  int(8)
-  [3]=>
-  int(7)
-  [4]=>
-  int(6)
-  [5]=>
-  int(5)
-  [6]=>
-  int(4)
-  [7]=>
-  int(3)
-  [8]=>
-  int(2)
-  [9]=>
-  int(1)
-}
-
--- Numeric Strings as Low and High --
--- An array of elements from low to high --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-
--- An array of elements from high to low --
-array(10) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(9)
-  [2]=>
-  int(8)
-  [3]=>
-  int(7)
-  [4]=>
-  int(6)
-  [5]=>
-  int(5)
-  [6]=>
-  int(4)
-  [7]=>
-  int(3)
-  [8]=>
-  int(2)
-  [9]=>
-  int(1)
-}
-
--- Chars as Low and High --
--- An array of elements from low to high --
-array(26) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-  [7]=>
-  string(1) "h"
-  [8]=>
-  string(1) "i"
-  [9]=>
-  string(1) "j"
-  [10]=>
-  string(1) "k"
-  [11]=>
-  string(1) "l"
-  [12]=>
-  string(1) "m"
-  [13]=>
-  string(1) "n"
-  [14]=>
-  string(1) "o"
-  [15]=>
-  string(1) "p"
-  [16]=>
-  string(1) "q"
-  [17]=>
-  string(1) "r"
-  [18]=>
-  string(1) "s"
-  [19]=>
-  string(1) "t"
-  [20]=>
-  string(1) "u"
-  [21]=>
-  string(1) "v"
-  [22]=>
-  string(1) "w"
-  [23]=>
-  string(1) "x"
-  [24]=>
-  string(1) "y"
-  [25]=>
-  string(1) "z"
-}
-
--- An array of elements from high to low --
-array(26) {
-  [0]=>
-  string(1) "z"
-  [1]=>
-  string(1) "y"
-  [2]=>
-  string(1) "x"
-  [3]=>
-  string(1) "w"
-  [4]=>
-  string(1) "v"
-  [5]=>
-  string(1) "u"
-  [6]=>
-  string(1) "t"
-  [7]=>
-  string(1) "s"
-  [8]=>
-  string(1) "r"
-  [9]=>
-  string(1) "q"
-  [10]=>
-  string(1) "p"
-  [11]=>
-  string(1) "o"
-  [12]=>
-  string(1) "n"
-  [13]=>
-  string(1) "m"
-  [14]=>
-  string(1) "l"
-  [15]=>
-  string(1) "k"
-  [16]=>
-  string(1) "j"
-  [17]=>
-  string(1) "i"
-  [18]=>
-  string(1) "h"
-  [19]=>
-  string(1) "g"
-  [20]=>
-  string(1) "f"
-  [21]=>
-  string(1) "e"
-  [22]=>
-  string(1) "d"
-  [23]=>
-  string(1) "c"
-  [24]=>
-  string(1) "b"
-  [25]=>
-  string(1) "a"
-}
-
--- Low and High are equal --
-array(1) {
-  [0]=>
-  int(5)
-}
-array(1) {
-  [0]=>
-  string(1) "q"
-}
-
--- floats as Low and High --
-array(6) {
-  [0]=>
-  float(5.1)
-  [1]=>
-  float(6.1)
-  [2]=>
-  float(7.1)
-  [3]=>
-  float(8.1)
-  [4]=>
-  float(9.1)
-  [5]=>
-  float(10.1)
-}
-array(6) {
-  [0]=>
-  float(10.1)
-  [1]=>
-  float(9.1)
-  [2]=>
-  float(8.1)
-  [3]=>
-  float(7.1)
-  [4]=>
-  float(6.1)
-  [5]=>
-  float(5.1)
-}
-array(6) {
-  [0]=>
-  float(5.1)
-  [1]=>
-  float(6.1)
-  [2]=>
-  float(7.1)
-  [3]=>
-  float(8.1)
-  [4]=>
-  float(9.1)
-  [5]=>
-  float(10.1)
-}
-array(6) {
-  [0]=>
-  float(10.1)
-  [1]=>
-  float(9.1)
-  [2]=>
-  float(8.1)
-  [3]=>
-  float(7.1)
-  [4]=>
-  float(6.1)
-  [5]=>
-  float(5.1)
-}
-
--- Passing step with Low and High --
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-array(11) {
-  [0]=>
-  float(2)
-  [1]=>
-  float(1.9)
-  [2]=>
-  float(1.8)
-  [3]=>
-  float(1.7)
-  [4]=>
-  float(1.6)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.4)
-  [7]=>
-  float(1.3)
-  [8]=>
-  float(1.2)
-  [9]=>
-  float(1.1)
-  [10]=>
-  float(1)
-}
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-
--- Testing basic string with step --
-array(7) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(1) "e"
-  [3]=>
-  string(1) "g"
-  [4]=>
-  string(1) "i"
-  [5]=>
-  string(1) "k"
-  [6]=>
-  string(1) "m"
-}
-Done
diff --git a/ext/standard/tests/array/range/range_bug70239_0.phpt b/ext/standard/tests/array/range/range_bug70239_0.phpt
index c5e56462c52eb..52f046a7e473d 100644
--- a/ext/standard/tests/array/range/range_bug70239_0.phpt
+++ b/ext/standard/tests/array/range/range_bug70239_0.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid range supplied: start=0 end=inf
+range(): Argument #2 ($end) must be a finite number, INF provided
diff --git a/ext/standard/tests/array/range/range_bug70239_1.phpt b/ext/standard/tests/array/range/range_bug70239_1.phpt
index cfaa1a51fc586..681d594a74dc9 100644
--- a/ext/standard/tests/array/range/range_bug70239_1.phpt
+++ b/ext/standard/tests/array/range/range_bug70239_1.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECT--
-Invalid range supplied: start=inf end=inf
+range(): Argument #1 ($start) must be a finite number, INF provided
diff --git a/ext/standard/tests/array/range/range_bug70239_2.phpt b/ext/standard/tests/array/range/range_bug70239_2.phpt
index 1ccf8d0373bac..a4ec3c5563512 100644
--- a/ext/standard/tests/array/range/range_bug70239_2.phpt
+++ b/ext/standard/tests/array/range/range_bug70239_2.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECTF--
-The supplied range exceeds the maximum array size: start=0 end=%d
+The supplied range exceeds the maximum array size: start=0 end=%d step=1
diff --git a/ext/standard/tests/array/range/range_bug70239_3.phpt b/ext/standard/tests/array/range/range_bug70239_3.phpt
index 5d50db4f4a2b8..7099eb1e98cfd 100644
--- a/ext/standard/tests/array/range/range_bug70239_3.phpt
+++ b/ext/standard/tests/array/range/range_bug70239_3.phpt
@@ -9,4 +9,4 @@ try {
 }
 ?>
 --EXPECTF--
-The supplied range exceeds the maximum array size: start=-%d end=0
+The supplied range exceeds the maximum array size: start=-%d end=0 step=1
diff --git a/ext/standard/tests/array/range/range_errors.phpt b/ext/standard/tests/array/range/range_errors.phpt
deleted file mode 100644
index e8bdf376e3c36..0000000000000
--- a/ext/standard/tests/array/range/range_errors.phpt
+++ /dev/null
@@ -1,134 +0,0 @@
---TEST--
-Test range() function (errors)
---INI--
-precision=14
---FILE--
-<?php
-
-echo "\n*** Testing error conditions ***\n";
-
-echo "\n-- Testing ( (low < high) && (step = 0) ) --\n";
-try {
-    var_dump( range(1, 2, 0) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-try {
-    var_dump( range("a", "b", 0) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n\n-- Testing ( (low > high) && (step = 0) ) --\n";
-try {
-    var_dump( range(2, 1, 0) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-try {
-    var_dump( range("b", "a", 0) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n\n-- Testing ( (low < high) && (high-low < step) ) --\n";
-try {
-    var_dump( range(1.0, 7.0, 6.5) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n\n-- Testing ( (low > high) && (low-high < step) ) --\n";
-try {
-    var_dump( range(7.0, 1.0, 6.5) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n\n-- Testing ( (low < high) && (high-low < step) ) for characters --\n";
-try {
-    var_dump(range('a', 'z', 100));
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n\n-- Testing ( (low > high) && (low-high < step) ) for characters --\n";
-try {
-    var_dump(range('z', 'a', 100));
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n-- Testing other conditions --\n";
-try {
-    var_dump( range(-1, -2, 2) );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-try {
-    var_dump( range("a", "j", "z") );
-} catch (\TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-try {
-    var_dump( range(0, 1, "140962482048819216326.24") );
-} catch (\ValueError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "\n-- Testing Invalid steps --\n";
-$step_arr = array( "string", NULL, FALSE, "", "\0" );
-
-foreach( $step_arr as $step ) {
-    try {
-        var_dump( range( 1, 5, $step ) );
-    } catch (\TypeError | \ValueError $e) {
-        echo $e->getMessage(), "\n";
-    }
-}
-?>
---EXPECTF--
-*** Testing error conditions ***
-
--- Testing ( (low < high) && (step = 0) ) --
-range(): Argument #3 ($step) must not exceed the specified range
-range(): Argument #3 ($step) must not exceed the specified range
-
-
--- Testing ( (low > high) && (step = 0) ) --
-range(): Argument #3 ($step) must not exceed the specified range
-range(): Argument #3 ($step) must not exceed the specified range
-
-
--- Testing ( (low < high) && (high-low < step) ) --
-range(): Argument #3 ($step) must not exceed the specified range
-
-
--- Testing ( (low > high) && (low-high < step) ) --
-range(): Argument #3 ($step) must not exceed the specified range
-
-
--- Testing ( (low < high) && (high-low < step) ) for characters --
-range(): Argument #3 ($step) must not exceed the specified range
-
-
--- Testing ( (low > high) && (low-high < step) ) for characters --
-range(): Argument #3 ($step) must not exceed the specified range
-
--- Testing other conditions --
-range(): Argument #3 ($step) must not exceed the specified range
-range(): Argument #3 ($step) must be of type int|float, string given
-range(): Argument #3 ($step) must not exceed the specified range
-
--- Testing Invalid steps --
-range(): Argument #3 ($step) must be of type int|float, string given
-
-Deprecated: range(): Passing null to parameter #3 ($step) of type int|float is deprecated in %s on line %d
-range(): Argument #3 ($step) must not exceed the specified range
-range(): Argument #3 ($step) must not exceed the specified range
-range(): Argument #3 ($step) must be of type int|float, string given
-range(): Argument #3 ($step) must be of type int|float, string given
diff --git a/ext/standard/tests/array/range/range_inputs_float_NAN_values.phpt b/ext/standard/tests/array/range/range_inputs_float_NAN_values.phpt
new file mode 100644
index 0000000000000..03ed069fd893a
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_float_NAN_values.phpt
@@ -0,0 +1,69 @@
+--TEST--
+Test range() function with non finite numbers
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+// 0/0 NAN value
+$f1 = fdiv(0, 0);
+var_dump($f1);
+// INF/INF NAN value
+$f2 = fdiv(10.0**400, 9.0**400);
+var_dump($f2);
+// -INF + +INF NAN value
+$f3 = (-10.0**400) + (9.0**400);
+var_dump($f3);
+
+$fs = [$f1, $f2, $f3, 5.5];
+
+foreach ($fs as $s) {
+    foreach ($fs as $e) {
+        echo "range($s, $e);\n";
+        try {
+            var_dump( range($s, $e) );
+        } catch (\ValueError $e) {
+            echo $e->getMessage(), PHP_EOL;
+        }
+    }
+}
+
+?>
+--EXPECT--
+float(NAN)
+float(NAN)
+float(NAN)
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, 5.5);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, 5.5);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, NAN);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(NAN, 5.5);
+range(): Argument #1 ($start) must be a finite number, NAN provided
+range(5.5, NAN);
+range(): Argument #2 ($end) must be a finite number, NAN provided
+range(5.5, NAN);
+range(): Argument #2 ($end) must be a finite number, NAN provided
+range(5.5, NAN);
+range(): Argument #2 ($end) must be a finite number, NAN provided
+range(5.5, 5.5);
+array(1) {
+  [0]=>
+  float(5.5)
+}
diff --git a/ext/standard/tests/array/range/range_inputs_float_basic.phpt b/ext/standard/tests/array/range/range_inputs_float_basic.phpt
new file mode 100644
index 0000000000000..de13e6333c2af
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_float_basic.phpt
@@ -0,0 +1,148 @@
+--TEST--
+range(): float boundary inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+echo "Increasing Range\n";
+var_dump( range(1.5, 6.5) );
+
+echo "\nDecreasing range\n";
+var_dump( range(6.5, 1.5) );
+
+echo "\nBoundaries are equal\n";
+var_dump( range(5.5, 5.5) );
+
+echo "\nPassing int step\n";
+var_dump( range(1.5, 10.5, 3) );
+var_dump( range(10.5, 1.5, 3) );
+var_dump( range(1.5, 10.5, "3") );
+
+echo "\nPassing float step\n";
+var_dump( range(1.6, 2.2, 0.1) );
+var_dump( range(2.2, 1.6, 0.1) );
+var_dump( range(1.6, 2.2, "0.1") );
+
+echo "Done\n";
+?>
+--EXPECT--
+Increasing Range
+array(6) {
+  [0]=>
+  float(1.5)
+  [1]=>
+  float(2.5)
+  [2]=>
+  float(3.5)
+  [3]=>
+  float(4.5)
+  [4]=>
+  float(5.5)
+  [5]=>
+  float(6.5)
+}
+
+Decreasing range
+array(6) {
+  [0]=>
+  float(6.5)
+  [1]=>
+  float(5.5)
+  [2]=>
+  float(4.5)
+  [3]=>
+  float(3.5)
+  [4]=>
+  float(2.5)
+  [5]=>
+  float(1.5)
+}
+
+Boundaries are equal
+array(1) {
+  [0]=>
+  float(5.5)
+}
+
+Passing int step
+array(4) {
+  [0]=>
+  float(1.5)
+  [1]=>
+  float(4.5)
+  [2]=>
+  float(7.5)
+  [3]=>
+  float(10.5)
+}
+array(4) {
+  [0]=>
+  float(10.5)
+  [1]=>
+  float(7.5)
+  [2]=>
+  float(4.5)
+  [3]=>
+  float(1.5)
+}
+array(4) {
+  [0]=>
+  float(1.5)
+  [1]=>
+  float(4.5)
+  [2]=>
+  float(7.5)
+  [3]=>
+  float(10.5)
+}
+
+Passing float step
+array(7) {
+  [0]=>
+  float(1.6)
+  [1]=>
+  float(1.7)
+  [2]=>
+  float(1.8)
+  [3]=>
+  float(1.9)
+  [4]=>
+  float(2)
+  [5]=>
+  float(2.1)
+  [6]=>
+  float(2.2)
+}
+array(7) {
+  [0]=>
+  float(2.2)
+  [1]=>
+  float(2.1)
+  [2]=>
+  float(2)
+  [3]=>
+  float(1.9)
+  [4]=>
+  float(1.8)
+  [5]=>
+  float(1.7)
+  [6]=>
+  float(1.6)
+}
+array(7) {
+  [0]=>
+  float(1.6)
+  [1]=>
+  float(1.7)
+  [2]=>
+  float(1.8)
+  [3]=>
+  float(1.9)
+  [4]=>
+  float(2)
+  [5]=>
+  float(2.1)
+  [6]=>
+  float(2.2)
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_float_small_step_exhaustion.phpt b/ext/standard/tests/array/range/range_inputs_float_small_step_exhaustion.phpt
new file mode 100644
index 0000000000000..b00b3142627cc
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_float_small_step_exhaustion.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Creating a range that exceeds the maximum array size
+--FILE--
+<?php
+try {
+    var_dump(range(0, 100_000_000_000, 0.1));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+try {
+    var_dump(range(PHP_INT_MIN, PHP_INT_MAX, 1));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), \PHP_EOL;
+}
+?>
+--EXPECTF--
+The supplied range exceeds the maximum array size: start=0.0 end=100000000000.0 step=0.1
+The supplied range exceeds the maximum array size: start=-%d end=%d step=1
diff --git a/ext/standard/tests/array/range/range_inputs_int_basic.phpt b/ext/standard/tests/array/range/range_inputs_int_basic.phpt
new file mode 100644
index 0000000000000..a50b41112b0b1
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_int_basic.phpt
@@ -0,0 +1,188 @@
+--TEST--
+range(): integer boundary inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+echo "Increasing Range\n";
+var_dump( range(1, 10) );
+
+echo "\nDecreasing range\n";
+var_dump( range(10, 1) );
+
+echo "\nBoundaries are equal\n";
+var_dump( range(5, 5) );
+
+echo "\nPassing int step\n";
+var_dump( range(1, 10, 3) );
+var_dump( range(10, 1, 3) );
+var_dump( range(1, 10, "3") );
+
+echo "\nPassing float step\n";
+var_dump( range(1, 2, 0.1) );
+var_dump( range(2, 1, 0.1) );
+var_dump( range(1, 2, "0.1") );
+
+echo "Done\n";
+?>
+--EXPECT--
+Increasing Range
+array(10) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+  [5]=>
+  int(6)
+  [6]=>
+  int(7)
+  [7]=>
+  int(8)
+  [8]=>
+  int(9)
+  [9]=>
+  int(10)
+}
+
+Decreasing range
+array(10) {
+  [0]=>
+  int(10)
+  [1]=>
+  int(9)
+  [2]=>
+  int(8)
+  [3]=>
+  int(7)
+  [4]=>
+  int(6)
+  [5]=>
+  int(5)
+  [6]=>
+  int(4)
+  [7]=>
+  int(3)
+  [8]=>
+  int(2)
+  [9]=>
+  int(1)
+}
+
+Boundaries are equal
+array(1) {
+  [0]=>
+  int(5)
+}
+
+Passing int step
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+  [2]=>
+  int(7)
+  [3]=>
+  int(10)
+}
+array(4) {
+  [0]=>
+  int(10)
+  [1]=>
+  int(7)
+  [2]=>
+  int(4)
+  [3]=>
+  int(1)
+}
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+  [2]=>
+  int(7)
+  [3]=>
+  int(10)
+}
+
+Passing float step
+array(11) {
+  [0]=>
+  float(1)
+  [1]=>
+  float(1.1)
+  [2]=>
+  float(1.2)
+  [3]=>
+  float(1.3)
+  [4]=>
+  float(1.4)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.6)
+  [7]=>
+  float(1.7)
+  [8]=>
+  float(1.8)
+  [9]=>
+  float(1.9)
+  [10]=>
+  float(2)
+}
+array(11) {
+  [0]=>
+  float(2)
+  [1]=>
+  float(1.9)
+  [2]=>
+  float(1.8)
+  [3]=>
+  float(1.7)
+  [4]=>
+  float(1.6)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.4)
+  [7]=>
+  float(1.3)
+  [8]=>
+  float(1.2)
+  [9]=>
+  float(1.1)
+  [10]=>
+  float(1)
+}
+array(11) {
+  [0]=>
+  float(1)
+  [1]=>
+  float(1.1)
+  [2]=>
+  float(1.2)
+  [3]=>
+  float(1.3)
+  [4]=>
+  float(1.4)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.6)
+  [7]=>
+  float(1.7)
+  [8]=>
+  float(1.8)
+  [9]=>
+  float(1.9)
+  [10]=>
+  float(2)
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_int_with_float_step.phpt b/ext/standard/tests/array/range/range_inputs_int_with_float_step.phpt
new file mode 100644
index 0000000000000..2d479ac49fde7
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_int_with_float_step.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test range() function with integer inputs and float step
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+var_dump( range(1, 5, 2.0) );
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(3)
+  [2]=>
+  int(5)
+}
diff --git a/ext/standard/tests/array/range/range_inputs_null_variations.phpt b/ext/standard/tests/array/range/range_inputs_null_variations.phpt
new file mode 100644
index 0000000000000..bec34efe65404
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_null_variations.phpt
@@ -0,0 +1,113 @@
+--TEST--
+Test range() function with null as argument.
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+echo "range(null, null)\n";
+var_dump( range(null, null) );
+
+echo "null with int boundary\n";
+var_dump( range(null, 5) );
+var_dump( range(5, null) );
+
+echo "null with float boundary\n";
+var_dump( range(null, 4.5) );
+var_dump( range(4.5, null) );
+
+echo "null with string boundary\n";
+var_dump( range(null, 'e') );
+var_dump( range('e', null) );
+
+echo "Done\n";
+?>
+--EXPECTF--
+range(null, null)
+
+Deprecated: range(): Passing null to parameter #1 ($start) of type string|int|float is deprecated in %s on line %d
+
+Deprecated: range(): Passing null to parameter #2 ($end) of type string|int|float is deprecated in %s on line %d
+array(1) {
+  [0]=>
+  int(0)
+}
+null with int boundary
+
+Deprecated: range(): Passing null to parameter #1 ($start) of type string|int|float is deprecated in %s on line %d
+array(6) {
+  [0]=>
+  int(0)
+  [1]=>
+  int(1)
+  [2]=>
+  int(2)
+  [3]=>
+  int(3)
+  [4]=>
+  int(4)
+  [5]=>
+  int(5)
+}
+
+Deprecated: range(): Passing null to parameter #2 ($end) of type string|int|float is deprecated in %s on line %d
+array(6) {
+  [0]=>
+  int(5)
+  [1]=>
+  int(4)
+  [2]=>
+  int(3)
+  [3]=>
+  int(2)
+  [4]=>
+  int(1)
+  [5]=>
+  int(0)
+}
+null with float boundary
+
+Deprecated: range(): Passing null to parameter #1 ($start) of type string|int|float is deprecated in %s on line %d
+array(5) {
+  [0]=>
+  float(0)
+  [1]=>
+  float(1)
+  [2]=>
+  float(2)
+  [3]=>
+  float(3)
+  [4]=>
+  float(4)
+}
+
+Deprecated: range(): Passing null to parameter #2 ($end) of type string|int|float is deprecated in %s on line %d
+array(5) {
+  [0]=>
+  float(4.5)
+  [1]=>
+  float(3.5)
+  [2]=>
+  float(2.5)
+  [3]=>
+  float(1.5)
+  [4]=>
+  float(0.5)
+}
+null with string boundary
+
+Deprecated: range(): Passing null to parameter #1 ($start) of type string|int|float is deprecated in %s on line %d
+
+Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
+array(1) {
+  [0]=>
+  int(0)
+}
+
+Deprecated: range(): Passing null to parameter #2 ($end) of type string|int|float is deprecated in %s on line %d
+
+Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
+array(1) {
+  [0]=>
+  int(0)
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_numeric_basic.phpt b/ext/standard/tests/array/range/range_inputs_numeric_basic.phpt
new file mode 100644
index 0000000000000..09e9e415b9c3f
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_numeric_basic.phpt
@@ -0,0 +1,74 @@
+--TEST--
+range(): mixed numeric types boundary inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+var_dump( range(1, "4") );
+var_dump( range("1", 4) );
+var_dump( range(1.5, "4.5") );
+var_dump( range("1.5", 4.5) );
+var_dump( range(9, "12") );
+var_dump( range("9", 12) );
+?>
+--EXPECT--
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+}
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+}
+array(4) {
+  [0]=>
+  float(1.5)
+  [1]=>
+  float(2.5)
+  [2]=>
+  float(3.5)
+  [3]=>
+  float(4.5)
+}
+array(4) {
+  [0]=>
+  float(1.5)
+  [1]=>
+  float(2.5)
+  [2]=>
+  float(3.5)
+  [3]=>
+  float(4.5)
+}
+array(4) {
+  [0]=>
+  int(9)
+  [1]=>
+  int(10)
+  [2]=>
+  int(11)
+  [3]=>
+  int(12)
+}
+array(4) {
+  [0]=>
+  int(9)
+  [1]=>
+  int(10)
+  [2]=>
+  int(11)
+  [3]=>
+  int(12)
+}
diff --git a/ext/standard/tests/array/range/range_inputs_string_basic.phpt b/ext/standard/tests/array/range/range_inputs_string_basic.phpt
new file mode 100644
index 0000000000000..00ce49e6e4d2a
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_basic.phpt
@@ -0,0 +1,153 @@
+--TEST--
+Test range() function with basic/expected string inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+
+echo "-- Chars as Low and High --\n";
+echo "-- An array of elements from low to high --\n";
+var_dump( range("a", "z") );
+echo "\n-- An array of elements from high to low --\n";
+var_dump( range("z", "a") );
+
+echo "\n-- Low and High are equal --\n";
+var_dump( range("q", "q") );
+
+echo "\n-- Testing basic string with step --\n";
+var_dump( range("a", "h", 2) );
+
+echo "Done\n";
+?>
+--EXPECT--
+-- Chars as Low and High --
+-- An array of elements from low to high --
+array(26) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "c"
+  [3]=>
+  string(1) "d"
+  [4]=>
+  string(1) "e"
+  [5]=>
+  string(1) "f"
+  [6]=>
+  string(1) "g"
+  [7]=>
+  string(1) "h"
+  [8]=>
+  string(1) "i"
+  [9]=>
+  string(1) "j"
+  [10]=>
+  string(1) "k"
+  [11]=>
+  string(1) "l"
+  [12]=>
+  string(1) "m"
+  [13]=>
+  string(1) "n"
+  [14]=>
+  string(1) "o"
+  [15]=>
+  string(1) "p"
+  [16]=>
+  string(1) "q"
+  [17]=>
+  string(1) "r"
+  [18]=>
+  string(1) "s"
+  [19]=>
+  string(1) "t"
+  [20]=>
+  string(1) "u"
+  [21]=>
+  string(1) "v"
+  [22]=>
+  string(1) "w"
+  [23]=>
+  string(1) "x"
+  [24]=>
+  string(1) "y"
+  [25]=>
+  string(1) "z"
+}
+
+-- An array of elements from high to low --
+array(26) {
+  [0]=>
+  string(1) "z"
+  [1]=>
+  string(1) "y"
+  [2]=>
+  string(1) "x"
+  [3]=>
+  string(1) "w"
+  [4]=>
+  string(1) "v"
+  [5]=>
+  string(1) "u"
+  [6]=>
+  string(1) "t"
+  [7]=>
+  string(1) "s"
+  [8]=>
+  string(1) "r"
+  [9]=>
+  string(1) "q"
+  [10]=>
+  string(1) "p"
+  [11]=>
+  string(1) "o"
+  [12]=>
+  string(1) "n"
+  [13]=>
+  string(1) "m"
+  [14]=>
+  string(1) "l"
+  [15]=>
+  string(1) "k"
+  [16]=>
+  string(1) "j"
+  [17]=>
+  string(1) "i"
+  [18]=>
+  string(1) "h"
+  [19]=>
+  string(1) "g"
+  [20]=>
+  string(1) "f"
+  [21]=>
+  string(1) "e"
+  [22]=>
+  string(1) "d"
+  [23]=>
+  string(1) "c"
+  [24]=>
+  string(1) "b"
+  [25]=>
+  string(1) "a"
+}
+
+-- Low and High are equal --
+array(1) {
+  [0]=>
+  string(1) "q"
+}
+
+-- Testing basic string with step --
+array(4) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "c"
+  [2]=>
+  string(1) "e"
+  [3]=>
+  string(1) "g"
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_string_digits.phpt b/ext/standard/tests/array/range/range_inputs_string_digits.phpt
new file mode 100644
index 0000000000000..b218c582ff6d3
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_digits.phpt
@@ -0,0 +1,97 @@
+--TEST--
+Test range() function with string digits
+--FILE--
+<?php
+echo "Only digits\n";
+var_dump( range("1", "9") );
+var_dump( range("9", "1") );
+
+echo "Only digits and char\n";
+var_dump( range("9", "A") );
+var_dump( range("A", "9") );
+echo "Done\n";
+?>
+--EXPECT--
+Only digits
+array(9) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "2"
+  [2]=>
+  string(1) "3"
+  [3]=>
+  string(1) "4"
+  [4]=>
+  string(1) "5"
+  [5]=>
+  string(1) "6"
+  [6]=>
+  string(1) "7"
+  [7]=>
+  string(1) "8"
+  [8]=>
+  string(1) "9"
+}
+array(9) {
+  [0]=>
+  string(1) "9"
+  [1]=>
+  string(1) "8"
+  [2]=>
+  string(1) "7"
+  [3]=>
+  string(1) "6"
+  [4]=>
+  string(1) "5"
+  [5]=>
+  string(1) "4"
+  [6]=>
+  string(1) "3"
+  [7]=>
+  string(1) "2"
+  [8]=>
+  string(1) "1"
+}
+Only digits and char
+array(9) {
+  [0]=>
+  string(1) "9"
+  [1]=>
+  string(1) ":"
+  [2]=>
+  string(1) ";"
+  [3]=>
+  string(1) "<"
+  [4]=>
+  string(1) "="
+  [5]=>
+  string(1) ">"
+  [6]=>
+  string(1) "?"
+  [7]=>
+  string(1) "@"
+  [8]=>
+  string(1) "A"
+}
+array(9) {
+  [0]=>
+  string(1) "A"
+  [1]=>
+  string(1) "@"
+  [2]=>
+  string(1) "?"
+  [3]=>
+  string(1) ">"
+  [4]=>
+  string(1) "="
+  [5]=>
+  string(1) "<"
+  [6]=>
+  string(1) ";"
+  [7]=>
+  string(1) ":"
+  [8]=>
+  string(1) "9"
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_string_digits_float_step.phpt b/ext/standard/tests/array/range/range_inputs_string_digits_float_step.phpt
new file mode 100644
index 0000000000000..296b6d15d3cf4
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_digits_float_step.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test range() function where boundary are string digits and step is a float
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+var_dump( range("1", "2", 0.1) );
+?>
+--EXPECT--
+array(11) {
+  [0]=>
+  float(1)
+  [1]=>
+  float(1.1)
+  [2]=>
+  float(1.2)
+  [3]=>
+  float(1.3)
+  [4]=>
+  float(1.4)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.6)
+  [7]=>
+  float(1.7)
+  [8]=>
+  float(1.8)
+  [9]=>
+  float(1.9)
+  [10]=>
+  float(2)
+}
diff --git a/ext/standard/tests/array/range/range_inputs_string_invalid.phpt b/ext/standard/tests/array/range/range_inputs_string_invalid.phpt
new file mode 100644
index 0000000000000..2518f82500dbd
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_invalid.phpt
@@ -0,0 +1,85 @@
+--TEST--
+Test range() function with unexpected string inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+
+echo "Range will ignore any byte after the first one\n";
+var_dump( range("AA", "BB") );
+
+echo "Range cannot operate on an empty string\n";
+var_dump( range("Z", "") ); // Both strings are cast to int, i.e. 0
+var_dump( range("", "Z") ); // Both strings are cast to int, i.e. 0
+
+echo "Mixing numeric float string and character\n";
+var_dump( range("3.5", "A") ); // The char is cast to a float, i.e. 0
+var_dump( range("?", "3.5") ); // The char is cast to a float, i.e. 0
+
+echo "Fractional step cannot be used on character ranges\n";
+var_dump( range("A", "H", 2.6) ); // Because step is fractional it tries to interpret inputs as floats
+
+echo "Done\n";
+?>
+--EXPECTF--
+Range will ignore any byte after the first one
+
+Warning: range(): Argument #1 ($start) must be a single byte, subsequent bytes are ignored in %s on line %d
+
+Warning: range(): Argument #2 ($end) must be a single byte, subsequent bytes are ignored in %s on line %d
+array(2) {
+  [0]=>
+  string(1) "A"
+  [1]=>
+  string(1) "B"
+}
+Range cannot operate on an empty string
+
+Warning: range(): Argument #2 ($end) must not be empty, casted to 0 in %s on line %d
+
+Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
+array(1) {
+  [0]=>
+  int(0)
+}
+
+Warning: range(): Argument #1 ($start) must not be empty, casted to 0 in %s on line %d
+
+Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
+array(1) {
+  [0]=>
+  int(0)
+}
+Mixing numeric float string and character
+
+Warning: range(): Argument #1 ($start) must be a single byte string if argument #2 ($end) is a single byte string, argument #2 ($end) converted to 0 in %s on line %d
+array(4) {
+  [0]=>
+  float(3.5)
+  [1]=>
+  float(2.5)
+  [2]=>
+  float(1.5)
+  [3]=>
+  float(0.5)
+}
+
+Warning: range(): Argument #2 ($end) must be a single byte string if argument #1 ($start) is a single byte string, argument #1 ($start) converted to 0 in %s on line %d
+array(4) {
+  [0]=>
+  float(0)
+  [1]=>
+  float(1)
+  [2]=>
+  float(2)
+  [3]=>
+  float(3)
+}
+Fractional step cannot be used on character ranges
+
+Warning: range(): Argument #3 ($step) must be of type int when generating an array of characters, inputs converted to 0 in %s on line %d
+array(1) {
+  [0]=>
+  float(0)
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_string_numeric.phpt b/ext/standard/tests/array/range/range_inputs_string_numeric.phpt
new file mode 100644
index 0000000000000..ba4f38f70212d
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_numeric.phpt
@@ -0,0 +1,188 @@
+--TEST--
+range(): numeric string boundary inputs
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+echo "Increasing Range\n";
+var_dump( range("1", "10") );
+
+echo "\nDecreasing range\n";
+var_dump( range("10", "1") );
+
+echo "\nBoundaries are equal\n";
+var_dump( range("5", "5") );
+
+echo "\nPassing int step\n";
+var_dump( range("1", "10", 3) );
+var_dump( range("10", "1", 3) );
+var_dump( range("1", "10", "3") );
+
+echo "\nPassing float step\n";
+var_dump( range("1", "2", 0.1) );
+var_dump( range("2", "1", 0.1) );
+var_dump( range("1", "2", "0.1") );
+
+echo "Done\n";
+?>
+--EXPECT--
+Increasing Range
+array(10) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+  [4]=>
+  int(5)
+  [5]=>
+  int(6)
+  [6]=>
+  int(7)
+  [7]=>
+  int(8)
+  [8]=>
+  int(9)
+  [9]=>
+  int(10)
+}
+
+Decreasing range
+array(10) {
+  [0]=>
+  int(10)
+  [1]=>
+  int(9)
+  [2]=>
+  int(8)
+  [3]=>
+  int(7)
+  [4]=>
+  int(6)
+  [5]=>
+  int(5)
+  [6]=>
+  int(4)
+  [7]=>
+  int(3)
+  [8]=>
+  int(2)
+  [9]=>
+  int(1)
+}
+
+Boundaries are equal
+array(1) {
+  [0]=>
+  string(1) "5"
+}
+
+Passing int step
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+  [2]=>
+  int(7)
+  [3]=>
+  int(10)
+}
+array(4) {
+  [0]=>
+  int(10)
+  [1]=>
+  int(7)
+  [2]=>
+  int(4)
+  [3]=>
+  int(1)
+}
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(4)
+  [2]=>
+  int(7)
+  [3]=>
+  int(10)
+}
+
+Passing float step
+array(11) {
+  [0]=>
+  float(1)
+  [1]=>
+  float(1.1)
+  [2]=>
+  float(1.2)
+  [3]=>
+  float(1.3)
+  [4]=>
+  float(1.4)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.6)
+  [7]=>
+  float(1.7)
+  [8]=>
+  float(1.8)
+  [9]=>
+  float(1.9)
+  [10]=>
+  float(2)
+}
+array(11) {
+  [0]=>
+  float(2)
+  [1]=>
+  float(1.9)
+  [2]=>
+  float(1.8)
+  [3]=>
+  float(1.7)
+  [4]=>
+  float(1.6)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.4)
+  [7]=>
+  float(1.3)
+  [8]=>
+  float(1.2)
+  [9]=>
+  float(1.1)
+  [10]=>
+  float(1)
+}
+array(11) {
+  [0]=>
+  float(1)
+  [1]=>
+  float(1.1)
+  [2]=>
+  float(1.2)
+  [3]=>
+  float(1.3)
+  [4]=>
+  float(1.4)
+  [5]=>
+  float(1.5)
+  [6]=>
+  float(1.6)
+  [7]=>
+  float(1.7)
+  [8]=>
+  float(1.8)
+  [9]=>
+  float(1.9)
+  [10]=>
+  float(2)
+}
+Done
diff --git a/ext/standard/tests/array/range/range_inputs_string_variations.phpt b/ext/standard/tests/array/range/range_inputs_string_variations.phpt
new file mode 100644
index 0000000000000..27dd535fe5d80
--- /dev/null
+++ b/ext/standard/tests/array/range/range_inputs_string_variations.phpt
@@ -0,0 +1,148 @@
+--TEST--
+Test range() function with unexpected string input variations or unusual step.
+--INI--
+serialize_precision=14
+--FILE--
+<?php
+
+echo "int compatible float as step\n";
+var_dump( range("a", "h", 2.0) );
+
+// What range does is increment the ASCII character code point
+echo "A to z range()\n";
+var_dump( range("A", "z") );
+
+echo "Done\n";
+?>
+--EXPECT--
+int compatible float as step
+array(4) {
+  [0]=>
+  string(1) "a"
+  [1]=>
+  string(1) "c"
+  [2]=>
+  string(1) "e"
+  [3]=>
+  string(1) "g"
+}
+A to z range()
+array(58) {
+  [0]=>
+  string(1) "A"
+  [1]=>
+  string(1) "B"
+  [2]=>
+  string(1) "C"
+  [3]=>
+  string(1) "D"
+  [4]=>
+  string(1) "E"
+  [5]=>
+  string(1) "F"
+  [6]=>
+  string(1) "G"
+  [7]=>
+  string(1) "H"
+  [8]=>
+  string(1) "I"
+  [9]=>
+  string(1) "J"
+  [10]=>
+  string(1) "K"
+  [11]=>
+  string(1) "L"
+  [12]=>
+  string(1) "M"
+  [13]=>
+  string(1) "N"
+  [14]=>
+  string(1) "O"
+  [15]=>
+  string(1) "P"
+  [16]=>
+  string(1) "Q"
+  [17]=>
+  string(1) "R"
+  [18]=>
+  string(1) "S"
+  [19]=>
+  string(1) "T"
+  [20]=>
+  string(1) "U"
+  [21]=>
+  string(1) "V"
+  [22]=>
+  string(1) "W"
+  [23]=>
+  string(1) "X"
+  [24]=>
+  string(1) "Y"
+  [25]=>
+  string(1) "Z"
+  [26]=>
+  string(1) "["
+  [27]=>
+  string(1) "\"
+  [28]=>
+  string(1) "]"
+  [29]=>
+  string(1) "^"
+  [30]=>
+  string(1) "_"
+  [31]=>
+  string(1) "`"
+  [32]=>
+  string(1) "a"
+  [33]=>
+  string(1) "b"
+  [34]=>
+  string(1) "c"
+  [35]=>
+  string(1) "d"
+  [36]=>
+  string(1) "e"
+  [37]=>
+  string(1) "f"
+  [38]=>
+  string(1) "g"
+  [39]=>
+  string(1) "h"
+  [40]=>
+  string(1) "i"
+  [41]=>
+  string(1) "j"
+  [42]=>
+  string(1) "k"
+  [43]=>
+  string(1) "l"
+  [44]=>
+  string(1) "m"
+  [45]=>
+  string(1) "n"
+  [46]=>
+  string(1) "o"
+  [47]=>
+  string(1) "p"
+  [48]=>
+  string(1) "q"
+  [49]=>
+  string(1) "r"
+  [50]=>
+  string(1) "s"
+  [51]=>
+  string(1) "t"
+  [52]=>
+  string(1) "u"
+  [53]=>
+  string(1) "v"
+  [54]=>
+  string(1) "w"
+  [55]=>
+  string(1) "x"
+  [56]=>
+  string(1) "y"
+  [57]=>
+  string(1) "z"
+}
+Done
diff --git a/ext/standard/tests/array/range/range_negative_step_decreasing_ranges.phpt b/ext/standard/tests/array/range/range_negative_step_decreasing_ranges.phpt
new file mode 100644
index 0000000000000..6a9ff3a7aeba9
--- /dev/null
+++ b/ext/standard/tests/array/range/range_negative_step_decreasing_ranges.phpt
@@ -0,0 +1,33 @@
+--TEST--
+range() allows $step parameter to be negative for decreasing ranges
+--INI--
+precision=14
+--FILE--
+<?php
+var_dump(range('c', 'a', -1));
+var_dump(range(3, 1, -1));
+var_dump(range(3.5, 1.5, -1.5));
+?>
+--EXPECT--
+array(3) {
+  [0]=>
+  string(1) "c"
+  [1]=>
+  string(1) "b"
+  [2]=>
+  string(1) "a"
+}
+array(3) {
+  [0]=>
+  int(3)
+  [1]=>
+  int(2)
+  [2]=>
+  int(1)
+}
+array(2) {
+  [0]=>
+  float(3.5)
+  [1]=>
+  float(2)
+}
diff --git a/ext/standard/tests/array/range/range_step_errors.phpt b/ext/standard/tests/array/range/range_step_errors.phpt
new file mode 100644
index 0000000000000..e950c527863e2
--- /dev/null
+++ b/ext/standard/tests/array/range/range_step_errors.phpt
@@ -0,0 +1,134 @@
+--TEST--
+range() programattic errors for the $step parameter
+--INI--
+precision=14
+--FILE--
+<?php
+echo "Step cannot be 0\n";
+try {
+    var_dump( range(1.0, 7.0, 0.0) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range(1, 7, 0) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range('A', 'H', 0) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range('A', 'H', 0.0) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+echo "Step cannot be INF\n";
+try {
+    var_dump( range(1.0, 7.0, 10.0**400) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range(1, 7, 10.0**400) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range('A', 'H', 10.0**400) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+echo "Step cannot be NAN\n";
+try {
+    var_dump( range(1.0, 7.0, fdiv(0, 0)) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range(1, 7, fdiv(0, 0)) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump( range('A', 'H', fdiv(0, 0)) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+echo "Step must be within the range of input parameters\n";
+echo "-- Testing ( (low < high) && (high-low < step) ) --\n";
+try {
+    var_dump( range(1.0, 7.0, 6.5) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+echo "-- Testing ( (low > high) && (low-high < step) ) --\n";
+try {
+    var_dump( range(7.0, 1.0, 6.5) );
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+echo "-- Testing ( (low < high) && (high-low < step) ) for characters --\n";
+try {
+    var_dump(range('a', 'z', 100));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+echo "-- Testing ( (low > high) && (low-high < step) ) for characters --\n";
+try {
+    var_dump(range('z', 'a', 100));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+echo "Step must not be negative for increasing ranges\n";
+try {
+    var_dump(range('a', 'c', -1));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(range(1, 3, -1));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(range(1.5, 3.5, -1.5));
+} catch (\ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+Step cannot be 0
+range(): Argument #3 ($step) cannot be 0
+range(): Argument #3 ($step) cannot be 0
+range(): Argument #3 ($step) cannot be 0
+range(): Argument #3 ($step) cannot be 0
+Step cannot be INF
+range(): Argument #3 ($step) must be a finite number, INF provided
+range(): Argument #3 ($step) must be a finite number, INF provided
+range(): Argument #3 ($step) must be a finite number, INF provided
+Step cannot be NAN
+range(): Argument #3 ($step) must be a finite number, NAN provided
+range(): Argument #3 ($step) must be a finite number, NAN provided
+range(): Argument #3 ($step) must be a finite number, NAN provided
+Step must be within the range of input parameters
+-- Testing ( (low < high) && (high-low < step) ) --
+range(): Argument #3 ($step) must be less than the range spanned by argument #1 ($start) and argument #2 ($end)
+-- Testing ( (low > high) && (low-high < step) ) --
+range(): Argument #3 ($step) must be less than the range spanned by argument #1 ($start) and argument #2 ($end)
+-- Testing ( (low < high) && (high-low < step) ) for characters --
+range(): Argument #3 ($step) must be less than the range spanned by argument #1 ($start) and argument #2 ($end)
+-- Testing ( (low > high) && (low-high < step) ) for characters --
+range(): Argument #3 ($step) must be less than the range spanned by argument #1 ($start) and argument #2 ($end)
+Step must not be negative for increasing ranges
+range(): Argument #3 ($step) must be greater than 0 for increasing ranges
+range(): Argument #3 ($step) must be greater than 0 for increasing ranges
+range(): Argument #3 ($step) must be greater than 0 for increasing ranges
diff --git a/ext/standard/tests/array/range/range_variation.phpt b/ext/standard/tests/array/range/range_variation.phpt
deleted file mode 100644
index 0459634b5405d..0000000000000
--- a/ext/standard/tests/array/range/range_variation.phpt
+++ /dev/null
@@ -1,619 +0,0 @@
---TEST--
-Test range() function (variation-1)
---INI--
-precision=14
---FILE--
-<?php
-
-echo "\n*** Testing range() with various low and high values ***";
-$low_arr = array( "ABCD", -10.5555, TRUE, NULL, FALSE, "", array(1,2));
-$high_arr = array( "ABCD", -10.5555, TRUE, NULL, FALSE, "", array(1,2));
-
-for( $i = 0; $i < count($low_arr); $i++) {
-  for( $j = 0; $j < count($high_arr); $j++) {
-    echo @"\n-- creating an array with low = '$low_arr[$i]' and high = '$high_arr[$j]' --\n";
-    var_dump( range( $low_arr[$i], $high_arr[$j] ) );
-  }
-}
-
-echo "\n*** Possible variatins with steps ***\n";
-var_dump( range( 1, 5, TRUE ) );
-try {
-    var_dump( range( 1, 5, array(1, 2) ) );
-} catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
-}
-
-echo "Done\n";
-?>
---EXPECT--
-*** Testing range() with various low and high values ***
--- creating an array with low = 'ABCD' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  string(1) "A"
-}
-
--- creating an array with low = 'ABCD' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = 'ABCD' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = 'ABCD' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '-10.5555' and high = 'ABCD' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-}
-
--- creating an array with low = '-10.5555' and high = '-10.5555' --
-array(1) {
-  [0]=>
-  float(-10.5555)
-}
-
--- creating an array with low = '-10.5555' and high = '1' --
-array(12) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-  [11]=>
-  float(0.4444999999999997)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-}
-
--- creating an array with low = '-10.5555' and high = 'Array' --
-array(12) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555000000000003)
-  [8]=>
-  float(-2.5555000000000003)
-  [9]=>
-  float(-1.5555000000000003)
-  [10]=>
-  float(-0.5555000000000003)
-  [11]=>
-  float(0.4444999999999997)
-}
-
--- creating an array with low = '1' and high = 'ABCD' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '-10.5555' --
-array(12) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(0)
-  [2]=>
-  float(-1)
-  [3]=>
-  float(-2)
-  [4]=>
-  float(-3)
-  [5]=>
-  float(-4)
-  [6]=>
-  float(-5)
-  [7]=>
-  float(-6)
-  [8]=>
-  float(-7)
-  [9]=>
-  float(-8)
-  [10]=>
-  float(-9)
-  [11]=>
-  float(-10)
-}
-
--- creating an array with low = '1' and high = '1' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = 'Array' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = 'Array' and high = 'ABCD' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = 'Array' and high = '-10.5555' --
-array(12) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(0)
-  [2]=>
-  float(-1)
-  [3]=>
-  float(-2)
-  [4]=>
-  float(-3)
-  [5]=>
-  float(-4)
-  [6]=>
-  float(-5)
-  [7]=>
-  float(-6)
-  [8]=>
-  float(-7)
-  [9]=>
-  float(-8)
-  [10]=>
-  float(-9)
-  [11]=>
-  float(-10)
-}
-
--- creating an array with low = 'Array' and high = '1' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = 'Array' and high = 'Array' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
-*** Possible variatins with steps ***
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-range(): Argument #3 ($step) must be of type int|float, array given
-Done