Promote warnings to errors in extract()

Author: Girgias

ext/standard/array.c

@@ -2448,23 +2448,24 @@ PHP_FUNCTION(extract)
 	extract_type &= 0xff;
 
 	if (extract_type < EXTR_OVERWRITE || extract_type > EXTR_IF_EXISTS) {
-		php_error_docref(NULL, E_WARNING, "Invalid extract type");
+		zend_throw_error(NULL, "Invalid extract type");
 		return;
 	}
 
 	if (extract_type > EXTR_SKIP && extract_type <= EXTR_PREFIX_IF_EXISTS && ZEND_NUM_ARGS() < 3) {
-		php_error_docref(NULL, E_WARNING, "specified extract type requires the prefix parameter");
+		zend_throw_error(NULL, "specified extract type requires the prefix parameter");
 		return;
 	}
 
 	if (prefix) {
 		if (ZSTR_LEN(prefix) && !php_valid_var_name(ZSTR_VAL(prefix), ZSTR_LEN(prefix))) {
-			php_error_docref(NULL, E_WARNING, "prefix is not a valid identifier");
+			zend_throw_error(NULL, "prefix is not a valid identifier");
 			return;
 		}
 	}
 
 	if (zend_forbid_dynamic_call("extract()") == FAILURE) {
+		/* TODO Elevate to exception ? */
 		return;
 	}
 

ext/standard/tests/array/extract_error.phpt

@@ -8,25 +8,33 @@ echo "*** Testing Error Conditions ***\n";
 
 /* Invalid second argument ( only 0-6 is valid) */
 $arr = array(1);
-var_dump( extract($arr, -1 . "wddr") );
-var_dump( extract($arr, 7 , "wddr") );
+
+try {
+    var_dump( extract($arr, -1 . "wddr") );
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
+
+try {
+    var_dump( extract($arr, 7 , "wddr") );
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 /* Two Arguments, second as prefix but without prefix string as third argument */
-var_dump( extract($arr,EXTR_PREFIX_IF_EXISTS) );
+try {
+    var_dump( extract($arr,EXTR_PREFIX_IF_EXISTS) );
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 echo "Done\n";
 ?>
 --EXPECTF--
 *** Testing Error Conditions ***
 
 Notice: A non well formed numeric value encountered in %s on line %d
-
-Warning: extract(): Invalid extract type in %s on line %d
-NULL
-
-Warning: extract(): Invalid extract type in %s on line %d
-NULL
-
-Warning: extract(): specified extract type requires the prefix parameter in %s on line %d
-NULL
+Invalid extract type
+Invalid extract type
+specified extract type requires the prefix parameter
 Done