summaryrefslogtreecommitdiff
path: root/ext/standard/tests/array/array_combine_variation4.phpt
diff options
context:
space:
mode:
authorAdam Harvey <aharvey@php.net>2010-08-27 03:54:10 +0000
committerAdam Harvey <aharvey@php.net>2010-08-27 03:54:10 +0000
commitf33837ff9714105ee11cdedeefd23e674c0043e6 (patch)
treea344ab2778dda829e16aa466c5f668ad0e807c65 /ext/standard/tests/array/array_combine_variation4.phpt
parent0f3468330445904566c508916f25d8275c8cafd5 (diff)
downloadphp-git-f33837ff9714105ee11cdedeefd23e674c0043e6.tar.gz
Implemented request #34857 (Change array_combine behaviour when called with
empty arrays). Patch by Joel Perras <joel.perras@gmail.com>.
Diffstat (limited to 'ext/standard/tests/array/array_combine_variation4.phpt')
-rw-r--r--ext/standard/tests/array/array_combine_variation4.phpt5
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt
index 02ec6efd22..bcd8428cee 100644
--- a/ext/standard/tests/array/array_combine_variation4.phpt
+++ b/ext/standard/tests/array/array_combine_variation4.phpt
@@ -100,9 +100,8 @@ Warning: Illegal offset type in %s on line %d
Warning: Illegal offset type in %s on line %d
-- Iteration 1 --
-
-Warning: array_combine(): Both parameters should have at least 1 element in %s on line %d
-bool(false)
+array(0) {
+}
-- Iteration 2 --
array(1) {
[0]=>