Promote warnings to errors in array_merge(_recursive)() and array_replace()

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 3492f942a2942f3b416c06e8ab01647b5ae3210f..3355c1135fbda8c4d2d58764dff1d0b212031531 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -3577,7 +3577,7 @@ PHPAPI int php_array_merge_recursive(HashTable *dest, HashTable *src) /* {{{ */
                                ZVAL_DEREF(dest_zval);
                                thash = Z_TYPE_P(dest_zval) == IS_ARRAY ? Z_ARRVAL_P(dest_zval) : NULL;
                                if ((thash && GC_IS_RECURSIVE(thash)) || (src_entry == dest_entry && Z_ISREF_P(dest_entry) && (Z_REFCOUNT_P(dest_entry) % 2))) {
-                                       php_error_docref(NULL, E_WARNING, "recursion detected");
+                                       zend_throw_error(NULL, "Recursion detected");
                                        return 0;
                                }
 
@@ -3698,7 +3698,7 @@ PHPAPI int php_array_replace_recursive(HashTable *dest, HashTable *src) /* {{{ *
                if (Z_IS_RECURSIVE_P(dest_zval) ||
                    Z_IS_RECURSIVE_P(src_zval) ||
                    (Z_ISREF_P(src_entry) && Z_ISREF_P(dest_entry) && Z_REF_P(src_entry) == Z_REF_P(dest_entry) && (Z_REFCOUNT_P(dest_entry) % 2))) {
-                       php_error_docref(NULL, E_WARNING, "recursion detected");
+                       zend_throw_error(NULL, "Recursion detected");
                        return 0;
                }
 

diff --git a/ext/standard/tests/array/array_replace.phpt b/ext/standard/tests/array/array_replace.phpt
index 6ba9e43fd753d21720dbafd8ecc74bb9d1289c7c..48b616ab04ee6c220d4d198ade4bdc39ba7635e7 100644 (file)
--- a/ext/standard/tests/array/array_replace.phpt
+++ b/ext/standard/tests/array/array_replace.phpt
@@ -42,11 +42,15 @@ $data = array_replace_recursive($array1, $array2);
 var_dump($data);
 
 echo " -- Testing array_replace_recursive() w/ endless recusrsion --\n";
-$data = array_replace_recursive($array3, $array4);
+try {
+    $data = array_replace_recursive($array3, $array4);
+    var_dump($data);
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
-var_dump($data);
 ?>
---EXPECTF--
+--EXPECT--
  -- Testing array_replace() --
 array(5) {
   [0]=>
@@ -107,16 +111,4 @@ array(5) {
   }
 }
  -- Testing array_replace_recursive() w/ endless recusrsion --
-
-Warning: array_replace_recursive(): recursion detected in %s on line %d
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      array(0) {
-      }
-    }
-  }
-}
+Recursion detected

diff --git a/ext/standard/tests/array/bug42177.phpt b/ext/standard/tests/array/bug42177.phpt
index 5678ca3cac896429f60e8292efc9b75d742c0689..dc5297b30204206bb5e07f6fab958b1610e27e68 100644 (file)
--- a/ext/standard/tests/array/bug42177.phpt
+++ b/ext/standard/tests/array/bug42177.phpt
@@ -18,7 +18,11 @@ unset( $a1, $a2 );
 $a1 = array();
 $a2 = array( 'key1' => &$a1 );
 $a1 = array_merge_recursive( $a1, $a2 );
-$a1 = array_merge_recursive( $a1, $a2 );
+try {
+    $a1 = array_merge_recursive( $a1, $a2 );
+} catch (\Error $e) {
+    echo $e->getMessage() . " on line " . $e->getLine() . "\n";
+}
 unset( $a1, $a2 );
 
 $x = 'foo';
@@ -30,5 +34,5 @@ $a1 = array_merge_recursive( $a1, $a2 );
 unset( $a1, $a2 );
 
 ?>
---EXPECTF--
-Warning: array_merge_recursive(): recursion detected in %s on line 18
+--EXPECT--
+Recursion detected on line 19

diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt
index 522ff1903b5d4b443110724fd88db8581d527a04..cb011d3d44f29ee12b0a48b5a02fe8f13c7fb302 100644 (file)
--- a/ext/standard/tests/array/bug43495.phpt
+++ b/ext/standard/tests/array/bug43495.phpt
@@ -8,14 +8,21 @@ $a["key1"]["key2"]["key3"]=&$a;
 $b=array("key1"=>array("key2"=>array()));
 $b["key1"]["key2"]["key3"]=&$b;
 
-array_merge_recursive($a,$b);
+
+try {
+    array_merge_recursive($a,$b);
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 /* Break recursion */
 $a["key1"]["key2"]["key3"] = null;
 $b["key1"]["key2"]["key3"] = null;
 
-echo "Done.\n";
 ?>
---EXPECTF--
-Warning: array_merge_recursive(): recursion detected in %sbug43495.php on line %d
-Done.
+
+DONE
+--EXPECT--
+Recursion detected
+
+DONE

diff --git a/ext/standard/tests/array/bug65251.phpt b/ext/standard/tests/array/bug65251.phpt
index 014517794c7037e566a3cdbf19badb2763b72f2e..3e0f3a1e27c86121615c9a9a59e73c3153f1a7b9 100644 (file)
--- a/ext/standard/tests/array/bug65251.phpt
+++ b/ext/standard/tests/array/bug65251.phpt
@@ -3,8 +3,12 @@ Bug #65251: array_merge_recursive() recursion detection broken
 --FILE--
 <?php
 
-array_merge_recursive($GLOBALS, $GLOBALS)
+try {
+    array_merge_recursive($GLOBALS, $GLOBALS);
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
 
 ?>
---EXPECTF--
-Warning: array_merge_recursive(): recursion detected in %s on line %d
+--EXPECT--
+Recursion detected