Make array_slice $length param a nullable integer

Instead of having custom parameter handling.

Author: nikic

ext/standard/array.c

@@ -3470,33 +3470,31 @@ PHP_FUNCTION(array_splice)
    Returns elements specified by offset and length */
 PHP_FUNCTION(array_slice)
 {
-	zval	 *input,		/* Input array */
-			 *z_length = NULL, /* How many elements to get */
-			 *entry;		/* An array entry */
-	zend_long	 offset,		/* Offset to get elements from */
-			 length = 0;
-	zend_bool preserve_keys = 0; /* Whether to preserve keys while copying to the new array or not */
-	int		 num_in,		/* Number of elements in the input array */
-			 pos;			/* Current position in the array */
+	zval *input;                  /* Input array */
+	zval *entry;                  /* An array entry */
+	zend_long offset;             /* Offset to get elements from */
+	zend_long length = 0;         /* How many elements to get */
+	zend_bool length_is_null = 1; /* Whether an explicit length has been omitted */
+	zend_bool preserve_keys = 0;  /* Whether to preserve keys while copying to the new array */
+	uint32_t num_in;              /* Number of elements in the input array */
+	uint32_t pos;                 /* Current position in the array */
 	zend_string *string_key;
 	zend_ulong num_key;
 
 	ZEND_PARSE_PARAMETERS_START(2, 4)
 		Z_PARAM_ARRAY(input)
 		Z_PARAM_LONG(offset)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_ZVAL(z_length)
+		Z_PARAM_LONG_EX(length, length_is_null, 1, 0)
 		Z_PARAM_BOOL(preserve_keys)
 	ZEND_PARSE_PARAMETERS_END();
 
 	/* Get number of entries in the input hash */
 	num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
 
 	/* We want all entries from offset to the end if length is not passed or is null */
-	if (ZEND_NUM_ARGS() < 3 || Z_TYPE_P(z_length) == IS_NULL) {
+	if (length_is_null) {
 		length = num_in;
-	} else {
-		length = zval_get_long(z_length);
 	}
 
 	/* Clamp the offset.. */

ext/standard/tests/array/array_slice_variation1.phpt

@@ -20,7 +20,7 @@ var_dump(array_slice(range(1, 3), 0, $a));
 var_dump($a);
 
 ?>
---EXPECT--
+--EXPECTF--
 array(3) {
   [0]=>
   int(1)
@@ -53,8 +53,10 @@ array(1) {
   [2]=>
   int(3)
 }
-array(0) {
-}
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 string(3) "foo"

ext/standard/tests/array/array_slice_variation3.phpt

@@ -81,7 +81,7 @@ foreach($inputs as $input) {
 
 echo "Done";
 ?>
---EXPECT--
+--EXPECTF--
 *** Testing array_slice() : usage variations ***
 
 -- Iteration 1 --
@@ -171,28 +171,34 @@ array(0) {
 }
 
 -- Iteration 16 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 
 -- Iteration 17 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 
 -- Iteration 18 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, array given in %s on line %d
+NULL
 
 -- Iteration 19 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 
 -- Iteration 20 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 
 -- Iteration 21 --
-array(0) {
-}
+
+Warning: array_slice() expects parameter 3 to be int, string given in %s on line %d
+NULL
 
 -- Iteration 22 --
 array(2) {