summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2014-11-29 01:26:34 +0000
committerAndrea Faulds <ajf@ajf.me>2014-11-29 01:26:34 +0000
commit65c8edd525108f6598a8bb25fb3c5d6c80233322 (patch)
tree249b815f432a4b8798d66f6e1c79bb4c211b98e4
parentebaa42302af4bd2ee41d8964044db23e91cf90f3 (diff)
downloadphp-git-65c8edd525108f6598a8bb25fb3c5d6c80233322.tar.gz
Fix more 32-bit tests
-rw-r--r--ext/standard/tests/array/array_fill_variation1.phpt9
-rw-r--r--ext/standard/tests/array/array_slice_variation2.phpt13
-rw-r--r--ext/standard/tests/strings/str_split_variation2.phpt4
-rw-r--r--ext/standard/tests/strings/str_split_variation6.phpt4
-rw-r--r--ext/standard/tests/strings/str_split_variation7.phpt4
5 files changed, 12 insertions, 22 deletions
diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt
index e2d0b6f58c..f36da7d0e6 100644
--- a/ext/standard/tests/array/array_fill_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_variation1.phpt
@@ -124,12 +124,9 @@ array(2) {
int(100)
}
-- Iteration 3 --
-array(2) {
- [-1097262584]=>
- int(100)
- [0]=>
- int(100)
-}
+
+Warning: array_fill() expects parameter 1 to be long, double given in /Users/ajf/Projects/2014/PHP/php-src/ext/standard/tests/array/array_fill_variation1.php on line 92
+NULL
-- Iteration 4 --
array(2) {
[0]=>
diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt
index 217788fec7..8ec240818c 100644
--- a/ext/standard/tests/array/array_slice_variation2.phpt
+++ b/ext/standard/tests/array/array_slice_variation2.phpt
@@ -152,16 +152,9 @@ array(4) {
}
-- Iteration 7 --
-array(4) {
- ["one"]=>
- int(1)
- [0]=>
- int(2)
- ["three"]=>
- int(3)
- [1]=>
- int(4)
-}
+
+Warning: array_slice() expects parameter 2 to be long, double given in %s on line %d
+NULL
-- Iteration 8 --
array(4) {
diff --git a/ext/standard/tests/strings/str_split_variation2.phpt b/ext/standard/tests/strings/str_split_variation2.phpt
index ba1297b405..423d9d894c 100644
--- a/ext/standard/tests/strings/str_split_variation2.phpt
+++ b/ext/standard/tests/strings/str_split_variation2.phpt
@@ -111,8 +111,8 @@ Warning: str_split(): The length of each segment must be greater than zero in %s
bool(false)
--Iteration 3 --
-Warning: str_split(): The length of each segment must be greater than zero in %sstr_split_variation2.php on line %d
-bool(false)
+Warning: str_split() expects parameter 2 to be long, double given in %s on line %d
+NULL
--Iteration 4 --
Warning: str_split(): The length of each segment must be greater than zero in %sstr_split_variation2.php on line %d
diff --git a/ext/standard/tests/strings/str_split_variation6.phpt b/ext/standard/tests/strings/str_split_variation6.phpt
index 6d751bbccf..049d1fe401 100644
--- a/ext/standard/tests/strings/str_split_variation6.phpt
+++ b/ext/standard/tests/strings/str_split_variation6.phpt
@@ -157,8 +157,8 @@ array(1) {
}
-- Iteration 7 --
-Warning: str_split(): The length of each segment must be greater than zero in %s on line %d
-bool(false)
+Warning: str_split() expects parameter 2 to be long, double given in %s line %d
+NULL
-- Iteration 8 --
Warning: str_split(): The length of each segment must be greater than zero in %s on line %d
diff --git a/ext/standard/tests/strings/str_split_variation7.phpt b/ext/standard/tests/strings/str_split_variation7.phpt
index 455c5b8972..ee0e88c51a 100644
--- a/ext/standard/tests/strings/str_split_variation7.phpt
+++ b/ext/standard/tests/strings/str_split_variation7.phpt
@@ -135,8 +135,8 @@ array(1) {
}
-- Iteration 7 --
-Warning: str_split(): The length of each segment must be greater than zero in %s on line %d
-bool(false)
+Warning: str_split() expects parameter 2 to be long, double given in %s on line %d
+NULL
-- Iteration 8 --
Warning: str_split(): The length of each segment must be greater than zero in %s on line %d