This commit was manufactured by cvs2svn to create branch 'PHP_5'.PHP-5

1 files changed, 0 insertions, 79 deletions

diff --git a/ext/standard/tests/array/bug20381.phpt b/ext/standard/tests/array/bug20381.phpt
deleted file mode 100644
index 1adaa863b7..0000000000
--- a/ext/standard/tests/array/bug20381.phpt
+++ /dev/null
@@ -1,79 +0,0 @@
---TEST--
-Bug #20381 (array_merge_recursive mangles input arrays)
---FILE--
-<?php
-$a = array(
-	'a1' => 1,
-	'a2' => array( 1, 2, 3 ),
-	'a3' => array(
-		'a' => array( 10, 20, 30 ),
-		'b' => 'b'
-		)
-	);
-$b = array( 'a1' => 2,
-	'a2' => array( 3, 4, 5 ),
-	'a3' => array(
-		'c' => 'cc',
-		'a' => array( 10, 40 )
-		)
-	);
-
-var_dump($a);
-array_merge_recursive( $a, $b );
-var_dump($a);
-?>
---EXPECT--
-array(3) {
-  ["a1"]=>
-  int(1)
-  ["a2"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["a3"]=>
-  array(2) {
-    ["a"]=>
-    array(3) {
-      [0]=>
-      int(10)
-      [1]=>
-      int(20)
-      [2]=>
-      int(30)
-    }
-    ["b"]=>
-    string(1) "b"
-  }
-}
-array(3) {
-  ["a1"]=>
-  int(1)
-  ["a2"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["a3"]=>
-  array(2) {
-    ["a"]=>
-    array(3) {
-      [0]=>
-      int(10)
-      [1]=>
-      int(20)
-      [2]=>
-      int(30)
-    }
-    ["b"]=>
-    string(1) "b"
-  }
-}