summaryrefslogtreecommitdiff
path: root/ext/standard/tests/array/array_merge.phpt
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@sury.org>2013-06-21 13:48:35 +0200
committerOndřej Surý <ondrej@sury.org>2013-06-21 13:48:35 +0200
commit706ac6417162d94eb701952d40df136cd9528b56 (patch)
tree1858b0f397d16519dbd73c998d7a89001af362d2 /ext/standard/tests/array/array_merge.phpt
parente2d52710fa3134e72662116b3b495f5a22cf9c72 (diff)
downloadphp-upstream/5.5.0+dfsg.tar.gz
New upstream version 5.5.0+dfsgupstream/5.5.0+dfsg
Diffstat (limited to 'ext/standard/tests/array/array_merge.phpt')
-rw-r--r--ext/standard/tests/array/array_merge.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index b718386da..30830de2b 100644
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -79,7 +79,7 @@ echo "\n*** Testing array_merge() with typecasting non-array to array ***\n";
var_dump(array_merge($begin_array[4], (array)"type1", (array)10, (array)12.34));
echo "\n*** Testing error conditions ***";
-/* Invalid argumens */
+/* Invalid arguments */
var_dump(array_merge());
var_dump(array_merge(100, 200));
var_dump(array_merge($begin_array[0], $begin_array[1], 100));