Promote warnings to errors in array_combine()

Author: Girgias

ext/standard/array.c

@@ -6403,7 +6403,7 @@ PHP_FUNCTION(array_chunk)
 }
 /* }}} */
 
-/* {{{ proto array|false array_combine(array keys, array values)
+/* {{{ proto array array_combine(array keys, array values)
    Creates an array by using the elements of the first parameter as keys and the elements of the second as the corresponding values */
 PHP_FUNCTION(array_combine)
 {
@@ -6421,8 +6421,8 @@ PHP_FUNCTION(array_combine)
 	num_values = zend_hash_num_elements(values);
 
 	if (num_keys != num_values) {
-		php_error_docref(NULL, E_WARNING, "Both parameters should have an equal number of elements");
-		RETURN_FALSE;
+		zend_throw_error(NULL, "Both parameters should have an equal number of elements");
+		return;
 	}
 
 	if (!num_keys) {

ext/standard/tests/array/array_combine_error2.phpt

@@ -16,37 +16,42 @@ var_dump( array_combine(array(), array()) );
 
 // Testing array_combine by passing empty array to $keys
 echo "\n-- Testing array_combine() function with empty array for \$keys argument --\n";
-var_dump( array_combine(array(), array(1, 2)) );
+try {
+    var_dump( array_combine(array(), array(1, 2)) );
+} catch (\Error $e) {
+    echo $e->getMessage();
+}
 
 // Testing array_combine by passing empty array to $values
 echo "\n-- Testing array_combine() function with empty array for \$values argument --\n";
-var_dump( array_combine(array(1, 2), array()) );
+try {
+    var_dump( array_combine(array(1, 2), array()) );
+} catch (\Error $e) {
+    echo $e->getMessage();
+}
 
 // Testing array_combine with arrays having unequal number of elements
 echo "\n-- Testing array_combine() function by passing array with unequal number of elements --\n";
-var_dump( array_combine(array(1, 2), array(1, 2, 3)) );
+try {
+    var_dump( array_combine(array(1, 2), array(1, 2, 3)) );
+} catch (\Error $e) {
+    echo $e->getMessage();
+}
 
-echo "Done";
 ?>
---EXPECTF--
+
+DONE
+--EXPECT--
 *** Testing array_combine() : error conditions specific to array_combine() ***
 
 -- Testing array_combine() function with empty arrays --
 array(0) {
 }
 
 -- Testing array_combine() function with empty array for $keys argument --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-
+Both parameters should have an equal number of elements
 -- Testing array_combine() function with empty array for $values argument --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-
+Both parameters should have an equal number of elements
 -- Testing array_combine() function by passing array with unequal number of elements --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-Done
+Both parameters should have an equal number of elements
+DONE