- killed off UEXPECT

- could someone please fix var_export2.phpt? NUL is corrupted, can't fix here

diff --git a/ext/standard/tests/array/001.phpt b/ext/standard/tests/array/001.phpt
index f5d0eb81aef6bcc272b09db2d184f25552352b2a..b2024674a9a295ff2aa3fcafe2e2389ef2eec6b1 100644 (file)
--- a/ext/standard/tests/array/001.phpt
+++ b/ext/standard/tests/array/001.phpt
@@ -44,118 +44,6 @@ array_walk ($data, 'echo_kv');
 
 ?>
 --EXPECT--
-array(11) {
-  [0]=>
-  string(3) "PHP"
-  [1]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [2]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-  [3]=>
-  string(4) "test"
-  [4]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [5]=>
-  string(6) "monkey"
-  [6]=>
-  float(-0.33333333333333)
-  [7]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(0)
-      }
-    }
-  }
-  [8]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(0)
-      }
-    }
-  }
-  [9]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      array(1) {
-        [0]=>
-        int(0)
-      }
-    }
-  }
-}
- -- Testing array_walk() -- 
-int(0)
-string(3) "PHP"
-int(1)
-string(27) "PHP: Hypertext Preprocessor"
-int(2)
-string(4) "Test"
-string(4) "test"
-int(27)
-int(3)
-string(4) "test"
-int(4)
-array(2) {
-  [0]=>
-  string(6) "banana"
-  [1]=>
-  string(6) "orange"
-}
-int(5)
-string(6) "monkey"
-int(6)
-float(-0.33333333333333)
-int(7)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(0)
-    }
-  }
-}
-int(8)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(0)
-    }
-  }
-}
-int(9)
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(0)
-    }
-  }
-}
---UEXPECT--
 array(11) {
   [0]=>
   unicode(3) "PHP"

diff --git a/ext/standard/tests/array/002.phpt b/ext/standard/tests/array/002.phpt
index ff15764cc4decd7386a966621055874789f72f6d..666dcedcbb991b33683c20026afcec77c50e0ce5 100644 (file)
--- a/ext/standard/tests/array/002.phpt
+++ b/ext/standard/tests/array/002.phpt
@@ -31,659 +31,6 @@ foreach (array ('arsort', 'asort', 'krsort', 'ksort', 'rsort', 'sort') as $test_
 ?>
 --EXPECTF--
 Unsorted data:
-array(8) {
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-  [1000]=>
-  string(4) "test"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-
- -- Testing arsort() -- 
-No second argument:
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [0]=>
-  string(3) "PHP"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_REGULAR:
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [0]=>
-  string(3) "PHP"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_NUMERIC:
-array(8) {
-  ["test"]=>
-  int(27)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [1001]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "Test"
-  [1000]=>
-  string(4) "test"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_STRING
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(8) {
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [0]=>
-  string(3) "PHP"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-  [16777216]=>
-  float(-0.33333333333333)
-}
-
- -- Testing asort() -- 
-No second argument:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  ["test"]=>
-  int(27)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_REGULAR:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  ["test"]=>
-  int(27)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_NUMERIC:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [0]=>
-  string(3) "PHP"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-}
-Using SORT_STRING
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  ["test"]=>
-  int(27)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-}
-
- -- Testing krsort() -- 
-No second argument:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-  [0]=>
-  string(3) "PHP"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_REGULAR:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [0]=>
-  string(3) "PHP"
-  ["test"]=>
-  int(27)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_NUMERIC:
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-  [0]=>
-  string(3) "PHP"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_STRING
-array(8) {
-  ["test"]=>
-  int(27)
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [16777216]=>
-  float(-0.33333333333333)
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-  [0]=>
-  string(3) "PHP"
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-
- -- Testing ksort() -- 
-No second argument:
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  ["test"]=>
-  int(27)
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_REGULAR:
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-  [0]=>
-  string(3) "PHP"
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_NUMERIC:
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  ["test"]=>
-  int(27)
-  [5]=>
-  string(4) "Test"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-}
-Using SORT_STRING
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-}
-
- -- Testing rsort() -- 
-No second argument:
-array(8) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [1]=>
-  int(27)
-  [2]=>
-  string(4) "test"
-  [3]=>
-  string(6) "monkey"
-  [4]=>
-  string(4) "Test"
-  [5]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [6]=>
-  string(3) "PHP"
-  [7]=>
-  float(-0.33333333333333)
-}
-Using SORT_REGULAR:
-array(8) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [1]=>
-  int(27)
-  [2]=>
-  string(4) "test"
-  [3]=>
-  string(6) "monkey"
-  [4]=>
-  string(4) "Test"
-  [5]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [6]=>
-  string(3) "PHP"
-  [7]=>
-  float(-0.33333333333333)
-}
-Using SORT_NUMERIC:
-array(8) {
-  [0]=>
-  int(27)
-  [1]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [2]=>
-  string(3) "PHP"
-  [3]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [4]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "Test"
-  [6]=>
-  string(4) "test"
-  [7]=>
-  float(-0.33333333333333)
-}
-Using SORT_STRING
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(8) {
-  [0]=>
-  string(4) "test"
-  [1]=>
-  string(6) "monkey"
-  [2]=>
-  string(4) "Test"
-  [3]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [4]=>
-  string(3) "PHP"
-  [5]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [6]=>
-  int(27)
-  [7]=>
-  float(-0.33333333333333)
-}
-
- -- Testing sort() -- 
-No second argument:
-array(8) {
-  [0]=>
-  float(-0.33333333333333)
-  [1]=>
-  string(3) "PHP"
-  [2]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "test"
-  [6]=>
-  int(27)
-  [7]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_REGULAR:
-array(8) {
-  [0]=>
-  float(-0.33333333333333)
-  [1]=>
-  string(3) "PHP"
-  [2]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(6) "monkey"
-  [5]=>
-  string(4) "test"
-  [6]=>
-  int(27)
-  [7]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-}
-Using SORT_NUMERIC:
-array(8) {
-  [0]=>
-  float(-0.33333333333333)
-  [1]=>
-  string(6) "monkey"
-  [2]=>
-  string(4) "test"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(3) "PHP"
-  [6]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [7]=>
-  int(27)
-}
-Using SORT_STRING
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(8) {
-  [0]=>
-  float(-0.33333333333333)
-  [1]=>
-  int(27)
-  [2]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [3]=>
-  string(3) "PHP"
-  [4]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [6]=>
-  string(6) "monkey"
-  [7]=>
-  string(4) "test"
-}
---UEXPECTF--
-Unsorted data:
 array(8) {
   [0]=>
   unicode(3) "PHP"

diff --git a/ext/standard/tests/array/003.phpt b/ext/standard/tests/array/003.phpt
index 1a17a44d21d7a4426ed9a2fc17d329fcf6b3d77e..dd7c2ffca695b511aaa3f9699509b272bf840345 100644 (file)
--- a/ext/standard/tests/array/003.phpt
+++ b/ext/standard/tests/array/003.phpt
@@ -29,81 +29,6 @@ var_dump ($data);
 ?>
 --EXPECT--
 -- Testing uasort() -- 
-array(8) {
-  [16777216]=>
-  float(-0.33333333333333)
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  ["test"]=>
-  int(27)
-  [0]=>
-  string(3) "PHP"
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [1001]=>
-  string(6) "monkey"
-  [1000]=>
-  string(4) "test"
-}
-
- -- Testing uksort() -- 
-array(8) {
-  [-1000]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [0]=>
-  string(3) "PHP"
-  [1000]=>
-  string(4) "test"
-  [1001]=>
-  string(6) "monkey"
-  [16777216]=>
-  float(-0.33333333333333)
-  [17]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  ["test"]=>
-  int(27)
-}
-
- -- Testing usort() -- 
-array(8) {
-  [0]=>
-  float(-0.33333333333333)
-  [1]=>
-  array(2) {
-    [0]=>
-    string(6) "banana"
-    [1]=>
-    string(6) "orange"
-  }
-  [2]=>
-  int(27)
-  [3]=>
-  string(3) "PHP"
-  [4]=>
-  string(27) "PHP: Hypertext Preprocessor"
-  [5]=>
-  string(4) "Test"
-  [6]=>
-  string(6) "monkey"
-  [7]=>
-  string(4) "test"
-}
---UEXPECT--
--- Testing uasort() -- 
 array(8) {
   [16777216]=>
   float(-0.33333333333333)

diff --git a/ext/standard/tests/array/004.phpt b/ext/standard/tests/array/004.phpt
index fa64c3028c373c5d9e3ce444aa7e984458f866ce..d0747525d76d9e63b035f4ef8d9b0339ad55b005 100644 (file)
--- a/ext/standard/tests/array/004.phpt
+++ b/ext/standard/tests/array/004.phpt
@@ -21,43 +21,6 @@ natcasesort($data);
 var_dump($data);
 ?>
 --EXPECT--
-array(5) {
-  [0]=>
-  string(5) "Test1"
-  ["teST2"]=>
-  int(0)
-  [5]=>
-  string(5) "test2"
-  ["abc"]=>
-  string(6) "test10"
-  [6]=>
-  string(6) "test21"
-}
-array(5) {
-  ["teST2"]=>
-  int(0)
-  [0]=>
-  string(5) "Test1"
-  [5]=>
-  string(5) "test2"
-  ["abc"]=>
-  string(6) "test10"
-  [6]=>
-  string(6) "test21"
-}
-array(5) {
-  ["teST2"]=>
-  int(0)
-  [0]=>
-  string(5) "Test1"
-  [5]=>
-  string(5) "test2"
-  ["abc"]=>
-  string(6) "test10"
-  [6]=>
-  string(6) "test21"
-}
---UEXPECT--
 array(5) {
   [0]=>
   unicode(5) "Test1"
@@ -93,4 +56,4 @@ array(5) {
   unicode(6) "test10"
   [6]=>
   unicode(6) "test21"
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/005.phpt b/ext/standard/tests/array/005.phpt
index 4c95f9c84772dddb769cc2e0425fe8702a274a03..cc7424bc6d5d711a282145464307721a3daf4aee 100644 (file)
--- a/ext/standard/tests/array/005.phpt
+++ b/ext/standard/tests/array/005.phpt
@@ -90,214 +90,6 @@ NULL
 Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
 NULL
 
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_shift() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-NULL
-
-*** Testing with various array inputs ***
-
--- Input Array for Iteration 1 is -- 
-Array
-(
-)
-
-Output after shift is :
-NULL
-
--- Input Array for Iteration 2 is -- 
-Array
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-    [5] => 6
-    [6] => 7
-    [7] => 8
-    [8] => 9
-)
-
-Output after shift is :
-int(1)
-
--- Input Array for Iteration 3 is -- 
-Array
-(
-    [0] => One
-    [1] => _Two
-    [2] => Three
-    [3] => Four
-    [4] => Five
-)
-
-Output after shift is :
-string(3) "One"
-
--- Input Array for Iteration 4 is -- 
-Array
-(
-    [0] => 6
-    [1] => six
-    [2] => 7
-    [3] => seven
-    [4] => 8
-    [5] => eight
-    [6] => 9
-    [7] => nine
-)
-
-Output after shift is :
-int(6)
-
--- Input Array for Iteration 5 is -- 
-Array
-(
-    [a] => aaa
-    [A] => AAA
-    [c] => ccc
-    [d] => ddd
-    [e] => eee
-)
-
-Output after shift is :
-string(3) "aaa"
-
--- Input Array for Iteration 6 is -- 
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => three
-    [4] => four
-    [5] => five
-)
-
-Output after shift is :
-string(3) "one"
-
--- Input Array for Iteration 7 is -- 
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => 7
-    [4] => four
-    [5] => five
-)
-
-Output after shift is :
-string(3) "one"
-
--- Input Array for Iteration 8 is -- 
-Array
-(
-    [f] => fff
-    [1] => one
-    [4] => 6
-    [] => 3
-    [2] => float
-    [F] => FFF
-    [blank] => 
-    [3] => 3.7
-    [5] => Five
-    [6] => 8.6
-    [4name] => jonny
-    [a] => 
-)
-
-Output after shift is :
-string(3) "fff"
-
--- Input Array for Iteration 9 is -- 
-Array
-(
-    [0] => 12
-    [1] => name
-    [2] => age
-    [3] => 45
-)
-
-Output after shift is :
-int(12)
-
--- Input Array for Iteration 10 is -- 
-Array
-(
-    [0] => Array
-        (
-            [0] => oNe
-            [1] => tWo
-            [2] => 4
-        )
-
-    [1] => Array
-        (
-            [0] => 10
-            [1] => 20
-            [2] => 30
-            [3] => 40
-            [4] => 50
-        )
-
-    [2] => Array
-        (
-        )
-
-)
-
-Output after shift is :
-array(3) {
-  [0]=>
-  string(3) "oNe"
-  [1]=>
-  string(3) "tWo"
-  [2]=>
-  int(4)
-}
-
--- Input Array for Iteration 11 is -- 
-Array
-(
-    [one] => 2
-    [three] => 3
-    [0] => 3
-    [1] => 4
-    [3] => 33
-    [4] => 44
-    [5] => 57
-    [6] => 6
-    [5.4] => 554
-    [5.7] => 557
-)
-
-Output after shift is :
-int(2)
-
-*** Checking for internal array pointer being reset when shift is called ***
-
-Current Element is : int(1)
-
-Next Element is : int(2)
-
-Next Element is : int(3)
-
-shifted Element is : int(1)
-
-Current Element after shift operation is: int(2)
-Done
---UEXPECTF--
-*** Testing Error Conditions ***
-
-Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
 Warning: array_shift() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/006.phpt b/ext/standard/tests/array/006.phpt
index 6a6f32dc974fdb6d1e3f985e3e118bf9a9049def..33aacb64cb892cd360f1be0e29fe81a7fe40e383 100644 (file)
--- a/ext/standard/tests/array/006.phpt
+++ b/ext/standard/tests/array/006.phpt
@@ -25,30 +25,6 @@ var_dump($c);
 ?>
 --EXPECT--
 fubar
-array(3) {
-  [0]=>
-  string(3) "foo"
-  [1]=>
-  string(3) "bar"
-  [2]=>
-  string(6) "foobar"
-}
-fubar
-array(2) {
-  [3]=>
-  string(3) "foo"
-  [4]=>
-  string(3) "bar"
-}
-fubar
-array(2) {
-  ["a"]=>
-  string(3) "foo"
-  ["b"]=>
-  string(3) "bar"
-}
---UEXPECT--
-fubar
 array(3) {
   [0]=>
   unicode(3) "foo"

diff --git a/ext/standard/tests/array/007.phpt b/ext/standard/tests/array/007.phpt
index 03fa6c19f6b18622976e3ad68170618b7f681461..5c703c149936ed9631364006b84531aeab41ce9c 100644 (file)
--- a/ext/standard/tests/array/007.phpt
+++ b/ext/standard/tests/array/007.phpt
@@ -166,437 +166,6 @@ array(2) {
   [4]=>
   int(5)
 }
-array(5) {
-  [0]=>
-  int(1)
-  ["big"]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(6)
-  [4]=>
-  int(5)
-}
-$a=array (
-  'a' => 2,
-  'b' => 'some',
-  'c' => 'done',
-  'z' => 'foo',
-  'f' => 5,
-  'fan' => 'fen',
-  7 => 18,
-  9 => 25,
-  11 => 42,
-  12 => 42,
-  45 => 42,
-  73 => 'foo',
-  95 => 'some',
-  'som3' => 'some',
-  'want' => 'wanna',
-);
-$b=array (
-  'a' => 7,
-  7 => 18,
-  9 => 13,
-  11 => 42,
-  45 => 46,
-  'som3' => 'some',
-  'foo' => 'some',
-  'goo' => 'foo',
-  'f' => 5,
-  'z' => 'equal',
-);
-$c=array (
-  73 => 'foo',
-  95 => 'some',
-);
-Results:
-
-array(5) {
-  ["a"]=>
-  int(2)
-  ["c"]=>
-  string(4) "done"
-  ["fan"]=>
-  string(3) "fen"
-  [9]=>
-  int(25)
-  ["want"]=>
-  string(5) "wanna"
-}
-array(9) {
-  ["a"]=>
-  int(2)
-  ["b"]=>
-  string(4) "some"
-  ["c"]=>
-  string(4) "done"
-  ["z"]=>
-  string(3) "foo"
-  ["fan"]=>
-  string(3) "fen"
-  [9]=>
-  int(25)
-  [12]=>
-  int(42)
-  [45]=>
-  int(42)
-  ["want"]=>
-  string(5) "wanna"
-}
--=-=-=-=-=-=-=-=- New functionality from 5.0.0 -=-=-=-=-=-=-=-
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_udiff_uassoc($a, $b, "comp_func_cr", "comp_func"));
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(9)
-    ["public_member"]=>
-    int(9)
-  }
-  ["0.5"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(12)
-    ["public_member"]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(23)
-    ["public_member"]=>
-    int(23)
-  }
-}
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(9)
-    ["public_member"]=>
-    int(9)
-  }
-  ["0.5"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(12)
-    ["public_member"]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(23)
-    ["public_member"]=>
-    int(23)
-  }
-}
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_udiff($a, $b, "comp_func_cr"));
-array(2) {
-  ["0.5"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(12)
-    ["public_member"]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(23)
-    ["public_member"]=>
-    int(23)
-  }
-}
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_udiff_assoc($a, $b, "comp_func_cr"));
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(9)
-    ["public_member"]=>
-    int(9)
-  }
-  ["0.5"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(12)
-    ["public_member"]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(23)
-    ["public_member"]=>
-    int(23)
-  }
-}
---UEXPECTF--
-$a=array (
-  0 => 1,
-  'big' => 2,
-  1 => 3,
-  2 => 6,
-  3 => 3,
-  4 => 5,
-  5 => 3,
-  6 => 3,
-  7 => 3,
-  8 => 3,
-  9 => 3,
-  10 => 3,
-  11 => 3,
-  12 => 3,
-  13 => 3,
-  14 => 3,
-);
-$b=array (
-  0 => 2,
-  1 => 2,
-  2 => 3,
-  3 => 3,
-  4 => 3,
-  5 => 3,
-  6 => 3,
-  7 => 3,
-  8 => 3,
-  9 => 3,
-  10 => 3,
-  11 => 3,
-  12 => 3,
-  13 => 3,
-  14 => 3,
-);
-$c=array (
-  0 => -1,
-  1 => 1,
-);
-array(2) {
-  [2]=>
-  int(6)
-  [4]=>
-  int(5)
-}
 array(5) {
   [0]=>
   int(1)

diff --git a/ext/standard/tests/array/008.phpt b/ext/standard/tests/array/008.phpt
index 295a3d3f313fb70d52f1a127931d1711d8790f59..87d1af4baac5a4035df4632f6de8ccb27c795ea8 100644 (file)
--- a/ext/standard/tests/array/008.phpt
+++ b/ext/standard/tests/array/008.phpt
@@ -139,233 +139,6 @@ $c=array (
   5 => 17,
 );
 array_intersect($a,$b,$c);
-array(3) {
-  ["big"]=>
-  int(2)
-  [1]=>
-  int(2)
-  [17]=>
-  int(17)
-}
-array_intersect_assoc($a,$b,$c);
-array(1) {
-  [1]=>
-  int(2)
-}
-array_intersect($a,$b);
-array(15) {
-  ["big"]=>
-  int(2)
-  [1]=>
-  int(2)
-  [3]=>
-  int(3)
-  [5]=>
-  int(3)
-  [6]=>
-  int(3)
-  [8]=>
-  string(11) "some_string"
-  [9]=>
-  int(3)
-  [10]=>
-  int(3)
-  [11]=>
-  int(3)
-  [12]=>
-  int(3)
-  [13]=>
-  int(3)
-  [14]=>
-  int(3)
-  [15]=>
-  int(3)
-  [16]=>
-  int(3)
-  [17]=>
-  int(17)
-}
-array_intersect_assoc($a,$b);
-array(10) {
-  [1]=>
-  int(2)
-  [3]=>
-  int(3)
-  [5]=>
-  int(3)
-  [6]=>
-  int(3)
-  [9]=>
-  int(3)
-  [10]=>
-  int(3)
-  [11]=>
-  int(3)
-  [12]=>
-  int(3)
-  [13]=>
-  int(3)
-  [14]=>
-  int(3)
-}
--=-=-=-=-=-=-=-=-=-= TEST 2 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-$a=array (
-  'a' => 2,
-  'b' => 'some',
-  'c' => 'done',
-  'z' => 'foo',
-  'f' => 5,
-  'fan' => 'fen',
-  'bad' => 'bed',
-  'gate' => 'web',
-  7 => 18,
-  9 => 25,
-  11 => 42,
-  12 => 42,
-  45 => 42,
-  73 => 'foo',
-  95 => 'some',
-  'som3' => 'some',
-  'want' => 'wanna',
-);
-$b=array (
-  'a' => 7,
-  7 => 18,
-  9 => 13,
-  11 => 42,
-  45 => 46,
-  'som3' => 'some',
-  'foo' => 'some',
-  'goo' => 'foo',
-  'f' => 5,
-  'z' => 'equal',
-  'gate' => 'web',
-);
-$c=array (
-  'gate' => 'web',
-  73 => 'foo',
-  95 => 'some',
-);
-
-
-Results:
-
-array_intersect($a,$b,$c);
-array(6) {
-  ["b"]=>
-  string(4) "some"
-  ["z"]=>
-  string(3) "foo"
-  ["gate"]=>
-  string(3) "web"
-  [73]=>
-  string(3) "foo"
-  [95]=>
-  string(4) "some"
-  ["som3"]=>
-  string(4) "some"
-}
-array_intersect_assoc($a,$b,$c);
-array(1) {
-  ["gate"]=>
-  string(3) "web"
-}
-array_intersect($a,$b);
-array(11) {
-  ["b"]=>
-  string(4) "some"
-  ["z"]=>
-  string(3) "foo"
-  ["f"]=>
-  int(5)
-  ["gate"]=>
-  string(3) "web"
-  [7]=>
-  int(18)
-  [11]=>
-  int(42)
-  [12]=>
-  int(42)
-  [45]=>
-  int(42)
-  [73]=>
-  string(3) "foo"
-  [95]=>
-  string(4) "some"
-  ["som3"]=>
-  string(4) "some"
-}
-array_intersect_assoc($a,$b);
-array(5) {
-  ["f"]=>
-  int(5)
-  ["gate"]=>
-  string(3) "web"
-  [7]=>
-  int(18)
-  [11]=>
-  int(42)
-  ["som3"]=>
-  string(4) "some"
-}
---UEXPECT--
--=-=-=-=-=-=-=-=-=-= TEST 1 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-$a=array (
-  0 => 1,
-  'big' => 2,
-  1 => 2,
-  2 => 6,
-  3 => 3,
-  4 => 5,
-  5 => 3,
-  6 => 3,
-  7 => 454,
-  8 => 'some_string',
-  9 => 3,
-  10 => 3,
-  11 => 3,
-  12 => 3,
-  13 => 3,
-  14 => 3,
-  15 => 3,
-  16 => 3,
-  17 => 17,
-);
-$b=array (
-  0 => 2,
-  1 => 2,
-  2 => 3,
-  3 => 3,
-  4 => 3,
-  5 => 3,
-  6 => 3,
-  7 => 3,
-  8 => 3,
-  9 => 3,
-  10 => 3,
-  11 => 3,
-  12 => 3,
-  13 => 3,
-  14 => 3,
-  15 => 17,
-  16 => 25,
-  17 => 'some_string',
-  18 => 7,
-  19 => 8,
-  20 => 9,
-  21 => 109,
-  22 => 78,
-  23 => 17,
-);
-$c=array (
-  0 => -1,
-  1 => 2,
-  2 => 1,
-  3 => 15,
-  4 => 25,
-  5 => 17,
-);
-array_intersect($a,$b,$c);
 array(3) {
   [u"big"]=>
   int(2)

diff --git a/ext/standard/tests/array/009.phpt b/ext/standard/tests/array/009.phpt
index db827d00e0fab1ff91b226a5af2bdcb35b84a5fb..b931392e2254397f983e530106b3f3ab18b737a9 100644 (file)
--- a/ext/standard/tests/array/009.phpt
+++ b/ext/standard/tests/array/009.phpt
@@ -116,424 +116,7 @@ var_dump( reset($string) );
 
 echo "Done\n";
 ?>
---EXPECTF--    
-*** Testing basic operations ***
--- Iteration 1 --
-int(0)
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-int(0)
-int(0)
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- Iteration 2 --
-int(1)
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-int(1)
-int(0)
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- Iteration 3 --
-int(1)
-int(0)
-int(2)
-int(2)
-int(1)
-int(3)
-int(3)
-int(2)
-int(-1)
-int(-1)
-int(3)
-int(-2)
-int(-2)
-int(4)
-int(-3)
-int(-3)
-int(5)
-bool(false)
-bool(false)
-NULL
-bool(false)
-int(1)
-int(0)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(-1)
-  [4]=>
-  int(-2)
-  [5]=>
-  int(-3)
-}
-
--- Iteration 4 --
-float(1.1)
-int(0)
-float(2.2)
-float(2.2)
-int(1)
-float(3.3)
-float(3.3)
-int(2)
-float(-1.1)
-float(-1.1)
-int(3)
-float(-2.2)
-float(-2.2)
-int(4)
-float(-3.3)
-float(-3.3)
-int(5)
-bool(false)
-bool(false)
-NULL
-bool(false)
-float(1.1)
-int(0)
-array(6) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-  [2]=>
-  float(3.3)
-  [3]=>
-  float(-1.1)
-  [4]=>
-  float(-2.2)
-  [5]=>
-  float(-3.3)
-}
-
--- Iteration 5 --
-string(1) "a"
-int(0)
-string(1) "b"
-string(1) "b"
-int(1)
-string(1) "c"
-string(1) "c"
-int(2)
-string(2) "ab"
-string(2) "ab"
-int(3)
-string(2) "ac"
-string(2) "ac"
-int(4)
-string(2) "ad"
-string(2) "ad"
-int(5)
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(1) "a"
-int(0)
-array(6) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(2) "ab"
-  [4]=>
-  string(2) "ac"
-  [5]=>
-  string(2) "ad"
-}
-
--- Iteration 6 --
-string(5) "apple"
-string(1) "a"
-string(4) "book"
-string(4) "book"
-string(1) "b"
-string(4) "cook"
-string(4) "cook"
-string(1) "c"
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(5) "apple"
-string(1) "a"
-array(3) {
-  ["a"]=>
-  string(5) "apple"
-  ["b"]=>
-  string(4) "book"
-  ["c"]=>
-  string(4) "cook"
-}
-
--- Iteration 7 --
-string(5) "drink"
-string(1) "d"
-string(4) "port"
-string(4) "port"
-string(1) "p"
-string(3) "set"
-string(3) "set"
-string(1) "s"
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(5) "drink"
-string(1) "d"
-array(3) {
-  ["d"]=>
-  string(5) "drink"
-  ["p"]=>
-  string(4) "port"
-  ["s"]=>
-  string(3) "set"
-}
-
--- Iteration 8 --
-string(3) "One"
-int(1)
-string(3) "two"
-string(3) "two"
-int(2)
-string(5) "three"
-string(5) "three"
-int(3)
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(3) "One"
-int(1)
-array(3) {
-  [1]=>
-  string(3) "One"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-}
-
-
-*** Testing possible variations ***
--- Iteration 1 --
-bool(false)
-NULL
-bool(false)
-bool(false)
-NULL
-array(0) {
-}
-
--- Iteration 2 --
-string(0) ""
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(0) ""
-int(0)
-array(1) {
-  [0]=>
-  string(0) ""
-}
-
--- Iteration 3 --
-NULL
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-NULL
-int(0)
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 4 --
-NULL
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-NULL
-int(0)
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 5 --
-NULL
-int(0)
-bool(true)
-bool(true)
-int(1)
-NULL
-NULL
-int(2)
-string(0) ""
-string(0) ""
-int(3)
-int(1)
-int(1)
-int(4)
-bool(false)
-bool(false)
-NULL
-bool(false)
-NULL
-int(0)
-array(5) {
-  [0]=>
-  NULL
-  [1]=>
-  bool(true)
-  [2]=>
-  NULL
-  [3]=>
-  string(0) ""
-  [4]=>
-  int(1)
-}
-
--- Iteration 6 --
-string(4) "test"
-int(-1)
-string(4) "rest"
-string(4) "rest"
-int(-2)
-string(3) "two"
-string(3) "two"
-int(2)
-string(0) ""
-string(0) ""
-string(0) ""
-string(4) "zero"
-string(4) "zero"
-int(0)
-bool(false)
-bool(false)
-NULL
-bool(false)
-string(4) "test"
-int(-1)
-array(5) {
-  [-1]=>
-  string(4) "test"
-  [-2]=>
-  string(4) "rest"
-  [2]=>
-  string(3) "two"
-  [""]=>
-  string(0) ""
-  [0]=>
-  string(4) "zero"
-}
-
-
--- Testing variation: when array is unset --
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-*** Testing error conditions ***
-
-Warning: key() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: current() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: reset() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: next() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: key() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: current() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: reset() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 *** Testing basic operations ***
 -- Iteration 1 --
 int(0)

diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt
index 1c7c99ab334c835a1634050d8bb217f8e654b709..228469bbf68b65dbbe434a8c27a8a3611754a538 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case.phpt
+++ b/ext/standard/tests/array/array_change_key_case.phpt
@@ -188,761 +188,6 @@ array(5) {
   int(5)
 }
 
-** Iteration 7 **
-array(1) {
-  [""]=>
-  int(1)
-}
-array(1) {
-  [""]=>
-  int(1)
-}
-array(1) {
-  [""]=>
-  int(1)
-}
-
-** Iteration 8 **
-array(1) {
-  ["a"]=>
-  int(1)
-}
-array(1) {
-  ["A"]=>
-  int(1)
-}
-array(1) {
-  ["a"]=>
-  int(1)
-}
-
-** Iteration 9 **
-array(1) {
-  ["z"]=>
-  int(1)
-}
-array(1) {
-  ["Z"]=>
-  int(1)
-}
-array(1) {
-  ["z"]=>
-  int(1)
-}
-
-** Iteration 10 **
-array(1) {
-  ["one"]=>
-  int(1)
-}
-array(1) {
-  ["ONE"]=>
-  int(1)
-}
-array(1) {
-  ["one"]=>
-  int(1)
-}
-
-** Iteration 11 **
-array(1) {
-  ["one"]=>
-  int(1)
-}
-array(1) {
-  ["ONE"]=>
-  int(1)
-}
-array(1) {
-  ["one"]=>
-  int(1)
-}
-
-** Iteration 12 **
-array(1) {
-  ["one"]=>
-  int(1)
-}
-array(1) {
-  ["ONE"]=>
-  int(1)
-}
-array(1) {
-  ["one"]=>
-  int(1)
-}
-
-** Iteration 13 **
-array(1) {
-  ["one"]=>
-  int(1)
-}
-array(1) {
-  ["ONE"]=>
-  int(1)
-}
-array(1) {
-  ["one"]=>
-  int(1)
-}
-
-** Iteration 14 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 15 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 16 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 17 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 18 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 19 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 20 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 21 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 22 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 23 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 24 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 25 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 26 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 27 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 28 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 29 **
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-
-** Iteration 30 **
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-
-** Iteration 31 **
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-
-** Iteration 32 **
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-
-** Iteration 33 **
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["ONE"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-}
-
-** Iteration 34 **
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "four"
-}
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "four"
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "four"
-}
-
-** Iteration 35 **
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "FOUR"
-}
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "FOUR"
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "FOUR"
-}
-
-** Iteration 36 **
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "FOUR"
-}
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "FOUR"
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "FOUR"
-}
-
-** Iteration 37 **
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "four"
-}
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "four"
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "four"
-}
-
-end
---UEXPECTF--
-*** Testing basic operations ***
-** Iteration 1 **
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-
-** Iteration 2 **
-array(1) {
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
-
-** Iteration 3 **
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-
-** Iteration 4 **
-array(1) {
-  [0]=>
-  int(-1)
-}
-array(1) {
-  [0]=>
-  int(-1)
-}
-array(1) {
-  [0]=>
-  int(-1)
-}
-
-** Iteration 5 **
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-
-** Iteration 6 **
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-
 ** Iteration 7 **
 array(1) {
   [u""]=>

diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt
index 74f8b54804eec4c4c845c786bb978deb2824984e..54e037b319fa93b7b9de2c3e3c881c681c47ea1b 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation.phpt
@@ -21,35 +21,6 @@ var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 )
 echo "end\n";
 ?>
 --EXPECTF--
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "four"
-}
-array(1) {
-  ["one"]=>
-  int(4)
-}
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-array(1) {
-  ["ONE"]=>
-  int(3)
-}
-array(1) {
-  ["ONE"]=>
-  int(2)
-}
-end
---UEXPECTF--
 Warning: array_change_key_case() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 array(4) {

diff --git a/ext/standard/tests/array/array_change_key_case_variation1.phpt b/ext/standard/tests/array/array_change_key_case_variation1.phpt
index c5ae53e831ed4c63f858fe294f07c3d91cd0dd37..4de0c51429cb83dd64caeb9473506ec49eac8ec2 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation1.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation1.phpt
@@ -175,133 +175,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_change_key_case() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-array(0) {
-}
-
--- Iteration 19 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_change_key_case() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_change_key_case() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 
@@ -348,4 +221,4 @@ NULL
 
 Warning: array_change_key_case() expects parameter 1 to be array, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation2.phpt b/ext/standard/tests/array/array_change_key_case_variation2.phpt
index e7f22194fc5d7beec3683d787d04b862bb377f92..6987877d913e848ab188ccabb4d434f002a809d8 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation2.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation2.phpt
@@ -86,209 +86,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- Iteration 1 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 2 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 3 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 4 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 5 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 6 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 7 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 8 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 9 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 10 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 11 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 12 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 13 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 14 --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-
--- Iteration 15 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 16 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_change_key_case() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 23 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- Iteration 1 --
 array(3) {
   [u"one"]=>
@@ -488,4 +285,4 @@ array(3) {
   [u"three"]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation3.phpt b/ext/standard/tests/array/array_change_key_case_variation3.phpt
index cd18d21c5b50b3a4db8fb15eacaa69ff9f8ff93b..e6bbad48228738784dfcfbe3228df4aa5c8ae0e3 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation3.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation3.phpt
@@ -103,101 +103,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- Iteration 1 : int data --
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [12345]=>
-  string(8) "positive"
-  [-2345]=>
-  string(8) "negative"
-}
-
--- Iteration 2 : float data --
-array(3) {
-  [10]=>
-  string(8) "positive"
-  [-10]=>
-  string(8) "negative"
-  [0]=>
-  string(4) "half"
-}
-
--- Iteration 3 : extreme floats data --
-array(2) {
-  [12345678]=>
-  string(5) "large"
-  [0]=>
-  string(5) "small"
-}
-
--- Iteration 4 : null uppercase data --
-array(1) {
-  [""]=>
-  string(6) "null 1"
-}
-
--- Iteration 5 : null lowercase data --
-array(1) {
-  [""]=>
-  string(6) "null 2"
-}
-
--- Iteration 6 : bool lowercase data --
-array(2) {
-  [1]=>
-  string(6) "lowert"
-  [0]=>
-  string(6) "lowerf"
-}
-
--- Iteration 7 : bool uppercase data --
-array(2) {
-  [1]=>
-  string(6) "uppert"
-  [0]=>
-  string(6) "upperf"
-}
-
--- Iteration 8 : empty double quotes data --
-array(1) {
-  [""]=>
-  string(6) "emptyd"
-}
-
--- Iteration 9 : empty single quotes data --
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-
--- Iteration 10 : string data --
-array(3) {
-  ["STRINGD"]=>
-  string(7) "stringd"
-  ["STRINGS"]=>
-  string(7) "strings"
-  ["HELLO WORLD"]=>
-  string(7) "stringh"
-}
-
--- Iteration 11 : undefined data --
-array(1) {
-  [""]=>
-  string(9) "undefined"
-}
-
--- Iteration 12 : unset data --
-array(1) {
-  [""]=>
-  string(5) "unset"
-}
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- Iteration 1 : int data --
 array(4) {
   [0]=>
@@ -289,4 +194,4 @@ array(1) {
   [u""]=>
   unicode(5) "unset"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation4.phpt b/ext/standard/tests/array/array_change_key_case_variation4.phpt
index 71f89cb382634b1157d50e99b54d73c9134c9f37..8fb629b7c8d99aae204f5dcca9dbb09dda28098b 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation4.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation4.phpt
@@ -26,119 +26,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- $sort argument is -5 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is -4 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is -3 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is -2 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is -1 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 0 --
-array(3) {
-  ["one"]=>
-  string(2) "un"
-  ["two"]=>
-  string(4) "deux"
-  ["three"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 1 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 2 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 3 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 4 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-
--- $sort argument is 5 --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- $sort argument is -5 --
 array(3) {
   [u"ONE"]=>
@@ -248,4 +135,4 @@ array(3) {
   [u"THREE"]=>
   unicode(5) "trois"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation5.phpt b/ext/standard/tests/array/array_change_key_case_variation5.phpt
index 204e058402af019690285cbb0dc46209a59145c1..6bd96ff778ac92571cac9bd596308c2ef28e007c 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation5.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation5.phpt
@@ -29,24 +29,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- Call array_change_key_case() --
-array(3) {
-  ["ONE"]=>
-  string(2) "un"
-  ["TWO"]=>
-  string(4) "deux"
-  ["THREE"]=>
-  string(5) "trois"
-}
--- Position of Internal Pointer in Result: --
-ONE => un
-
--- Position of Internal Pointer in Original Array: --
-one => un
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- Call array_change_key_case() --
 array(3) {
   [u"ONE"]=>
@@ -61,4 +43,4 @@ ONE => un
 
 -- Position of Internal Pointer in Original Array: --
 one => un
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation6.phpt b/ext/standard/tests/array/array_change_key_case_variation6.phpt
index ecc852e9193bbc180433056e608bf5de2cf9253f..a5c23c865d5d57dde442bad4b725d9c0e2afde17 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation6.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation6.phpt
@@ -29,50 +29,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- Pass a two-dimensional array as $input argument --
-array(3) {
-  ["ENGLISH"]=>
-  array(3) {
-    ["one"]=>
-    int(1)
-    ["two"]=>
-    int(2)
-    ["three"]=>
-    int(3)
-  }
-  ["FRENCH"]=>
-  array(3) {
-    ["un"]=>
-    int(1)
-    ["deux"]=>
-    int(2)
-    ["trois"]=>
-    int(3)
-  }
-  ["GERMAN"]=>
-  array(3) {
-    ["eins"]=>
-    int(1)
-    ["zwei"]=>
-    int(2)
-    ["drei"]=>
-    int(3)
-  }
-}
-
--- Pass a sub-arry as $input argument --
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- Pass a two-dimensional array as $input argument --
 array(3) {
   [u"ENGLISH"]=>
@@ -113,4 +69,4 @@ array(3) {
   [u"THREE"]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_change_key_case_variation7.phpt b/ext/standard/tests/array/array_change_key_case_variation7.phpt
index e485556909fc02ee1e9919c6769a4ec0e8b3bacd..1577ecb1d1c0fadf50987b52a49e33500887e4ad 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation7.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation7.phpt
@@ -39,59 +39,6 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing array_change_key_case() : usage variations ***
 
--- $input argument is a reference to array --
-Result:
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["ABC"]=>
-  string(3) "xyz"
-}
-Original:
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["ABC"]=>
-  string(3) "xyz"
-}
-Referenced:
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["ABC"]=>
-  string(3) "xyz"
-}
-
--- $input is an array passed by reference --
-Result:
-array(3) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["ABC"]=>
-  string(3) "xyz"
-}
-Original:
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["ABC"]=>
-  string(3) "xyz"
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_change_key_case() : usage variations ***
-
 -- $input argument is a reference to array --
 Result:
 array(3) {

diff --git a/ext/standard/tests/array/array_change_key_case_variation8.phpt b/ext/standard/tests/array/array_change_key_case_variation8.phpt
index 400dd6da4b39c2b2cd5317021b10a83b21ba6b23..88e3f4a015ab374c1b6913ea90b4c78542616c76 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case_variation8.phpt
+++ b/ext/standard/tests/array/array_change_key_case_variation8.phpt
@@ -34,101 +34,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_change_key_case() : usage variations ***
 
--- $case = default --
-array(10) {
-  [""]=>
-  int(2)
-  ["\a"]=>
-  int(3)
-  ["\cx"]=>
-  int(4)
-  ["\e"]=>
-  int(5)
-  ["\f"]=>
-  int(6)
-  ["
-"]=>
-  int(7)
-  ["   "]=>
-  int(8)
-  ["\xhh"]=>
-  int(9)
-  ["\ddd"]=>
-  int(10)
-  ["\v"]=>
-  int(11)
-}
--- $case = upper --
-array(10) {
-  [""]=>
-  int(2)
-  ["\A"]=>
-  int(3)
-  ["\CX"]=>
-  int(4)
-  ["\E"]=>
-  int(5)
-  ["\f"]=>
-  int(6)
-  ["
-"]=>
-  int(7)
-  ["   "]=>
-  int(8)
-  ["\XHH"]=>
-  int(9)
-  ["\DDD"]=>
-  int(10)
-  ["\v"]=>
-  int(11)
-}
-
--- $case = default --
-array(9) {
-  ["lemon"]=>
-  int(1)
-  ["orange"]=>
-  int(11)
-  ["banana"]=>
-  int(12)
-  ["apple"]=>
-  int(4)
-  ["test"]=>
-  int(5)
-  ["tttt"]=>
-  int(6)
-  ["ttt"]=>
-  int(7)
-  ["ww"]=>
-  int(8)
-  ["x"]=>
-  int(10)
-}
--- $case = upper --
-array(9) {
-  ["LEMON"]=>
-  int(1)
-  ["ORANGE"]=>
-  int(11)
-  ["BANANA"]=>
-  int(12)
-  ["APPLE"]=>
-  int(4)
-  ["TEST"]=>
-  int(5)
-  ["TTTT"]=>
-  int(6)
-  ["TTT"]=>
-  int(7)
-  ["WW"]=>
-  int(8)
-  ["X"]=>
-  int(10)
-}
-Done
---UEXPECTF--
-*** Testing array_change_key_case() : usage variations ***
-
 -- $case = default --
 array(10) {
   [u""]=>
@@ -220,4 +125,4 @@ array(9) {
   [u"X"]=>
   int(10)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_chunk.phpt b/ext/standard/tests/array/array_chunk.phpt
index 8782dcfa58651d71b545b79e217e9680ec059c5e..2b2a9c589da457bdc5e7cf660b3fc61b55ebdb35 100644 (file)
--- a/ext/standard/tests/array/array_chunk.phpt
+++ b/ext/standard/tests/array/array_chunk.phpt
@@ -4312,5279 +4312,6 @@ array(1) {
 }
 
 
-===========================================
-array(1) {
-  ["a"]=>
-  int(1)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    ["a"]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-
-===========================================
-array(2) {
-  ["b"]=>
-  int(1)
-  ["c"]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    ["b"]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    ["c"]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    ["b"]=>
-    int(1)
-    ["c"]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(6) {
-  ["p"]=>
-  int(1)
-  ["q"]=>
-  int(2)
-  ["r"]=>
-  int(3)
-  ["s"]=>
-  int(4)
-  ["u"]=>
-  int(5)
-  ["v"]=>
-  int(6)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(6) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-}
-array(6) {
-  [0]=>
-  array(1) {
-    ["p"]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    ["q"]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    ["r"]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    ["s"]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    ["u"]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    ["v"]=>
-    int(6)
-  }
-}
-array(6) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-}
-
-[2]
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    ["p"]=>
-    int(1)
-    ["q"]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    ["r"]=>
-    int(3)
-    ["s"]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    ["u"]=>
-    int(5)
-    ["v"]=>
-    int(6)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-}
-
-[3]
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    ["p"]=>
-    int(1)
-    ["q"]=>
-    int(2)
-    ["r"]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    ["s"]=>
-    int(4)
-    ["u"]=>
-    int(5)
-    ["v"]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-  }
-}
-
-[4]
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    ["p"]=>
-    int(1)
-    ["q"]=>
-    int(2)
-    ["r"]=>
-    int(3)
-    ["s"]=>
-    int(4)
-  }
-  [1]=>
-  array(2) {
-    ["u"]=>
-    int(5)
-    ["v"]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-}
-
-[5]
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    ["p"]=>
-    int(1)
-    ["q"]=>
-    int(2)
-    ["r"]=>
-    int(3)
-    ["s"]=>
-    int(4)
-    ["u"]=>
-    int(5)
-  }
-  [1]=>
-  array(1) {
-    ["v"]=>
-    int(6)
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-}
-
-[6]
-array(1) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-}
-array(1) {
-  [0]=>
-  array(6) {
-    ["p"]=>
-    int(1)
-    ["q"]=>
-    int(2)
-    ["r"]=>
-    int(3)
-    ["s"]=>
-    int(4)
-    ["u"]=>
-    int(5)
-    ["v"]=>
-    int(6)
-  }
-}
-array(1) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-}
-
-
-===========================================
-array(1) {
-  ["a"]=>
-  string(1) "A"
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    ["a"]=>
-    string(1) "A"
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-}
-
-
-===========================================
-array(6) {
-  ["p"]=>
-  string(1) "A"
-  ["q"]=>
-  string(1) "B"
-  ["r"]=>
-  string(1) "C"
-  ["s"]=>
-  string(1) "D"
-  ["u"]=>
-  string(1) "E"
-  ["v"]=>
-  string(1) "F"
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(6) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    string(1) "D"
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    string(1) "E"
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    string(1) "F"
-  }
-}
-array(6) {
-  [0]=>
-  array(1) {
-    ["p"]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(1) {
-    ["q"]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(1) {
-    ["r"]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(1) {
-    ["s"]=>
-    string(1) "D"
-  }
-  [4]=>
-  array(1) {
-    ["u"]=>
-    string(1) "E"
-  }
-  [5]=>
-  array(1) {
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(6) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "A"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "B"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(1) "C"
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    string(1) "D"
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    string(1) "E"
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    string(1) "F"
-  }
-}
-
-[2]
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "C"
-    [1]=>
-    string(1) "D"
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "E"
-    [1]=>
-    string(1) "F"
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    ["p"]=>
-    string(1) "A"
-    ["q"]=>
-    string(1) "B"
-  }
-  [1]=>
-  array(2) {
-    ["r"]=>
-    string(1) "C"
-    ["s"]=>
-    string(1) "D"
-  }
-  [2]=>
-  array(2) {
-    ["u"]=>
-    string(1) "E"
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "C"
-    [1]=>
-    string(1) "D"
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "E"
-    [1]=>
-    string(1) "F"
-  }
-}
-
-[3]
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(1) "D"
-    [1]=>
-    string(1) "E"
-    [2]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    ["p"]=>
-    string(1) "A"
-    ["q"]=>
-    string(1) "B"
-    ["r"]=>
-    string(1) "C"
-  }
-  [1]=>
-  array(3) {
-    ["s"]=>
-    string(1) "D"
-    ["u"]=>
-    string(1) "E"
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(1) "D"
-    [1]=>
-    string(1) "E"
-    [2]=>
-    string(1) "F"
-  }
-}
-
-[4]
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "E"
-    [1]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    ["p"]=>
-    string(1) "A"
-    ["q"]=>
-    string(1) "B"
-    ["r"]=>
-    string(1) "C"
-    ["s"]=>
-    string(1) "D"
-  }
-  [1]=>
-  array(2) {
-    ["u"]=>
-    string(1) "E"
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "E"
-    [1]=>
-    string(1) "F"
-  }
-}
-
-[5]
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-    [4]=>
-    string(1) "E"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    ["p"]=>
-    string(1) "A"
-    ["q"]=>
-    string(1) "B"
-    ["r"]=>
-    string(1) "C"
-    ["s"]=>
-    string(1) "D"
-    ["u"]=>
-    string(1) "E"
-  }
-  [1]=>
-  array(1) {
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-    [4]=>
-    string(1) "E"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "F"
-  }
-}
-
-[6]
-array(1) {
-  [0]=>
-  array(6) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-    [4]=>
-    string(1) "E"
-    [5]=>
-    string(1) "F"
-  }
-}
-array(1) {
-  [0]=>
-  array(6) {
-    ["p"]=>
-    string(1) "A"
-    ["q"]=>
-    string(1) "B"
-    ["r"]=>
-    string(1) "C"
-    ["s"]=>
-    string(1) "D"
-    ["u"]=>
-    string(1) "E"
-    ["v"]=>
-    string(1) "F"
-  }
-}
-array(1) {
-  [0]=>
-  array(6) {
-    [0]=>
-    string(1) "A"
-    [1]=>
-    string(1) "B"
-    [2]=>
-    string(1) "C"
-    [3]=>
-    string(1) "D"
-    [4]=>
-    string(1) "E"
-    [5]=>
-    string(1) "F"
-  }
-}
-
-
-end
---UEXPECT--
-===========================================
-array(0) {
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-
-===========================================
-array(1) {
-  [0]=>
-  int(0)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-
-
-===========================================
-array(1) {
-  [0]=>
-  int(1)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-
-===========================================
-array(1) {
-  [0]=>
-  int(-1)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-}
-
-
-===========================================
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[3]
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
-
-===========================================
-array(1) {
-  [1]=>
-  int(0)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [1]=>
-    int(0)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-
-
-===========================================
-array(1) {
-  [2]=>
-  int(1)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [2]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
-
-===========================================
-array(1) {
-  [3]=>
-  int(-1)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [3]=>
-    int(-1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-}
-
-
-===========================================
-array(2) {
-  [1]=>
-  int(0)
-  [2]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [1]=>
-    int(0)
-    [2]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(3) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[3]
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
-
-===========================================
-array(2) {
-  [0]=>
-  int(0)
-  [3]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [3]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [3]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(3) {
-  [1]=>
-  int(1)
-  [5]=>
-  int(2)
-  [8]=>
-  int(3)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [5]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [8]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    int(1)
-    [5]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [8]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[3]
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [1]=>
-    int(1)
-    [5]=>
-    int(2)
-    [8]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
-
-===========================================
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
-[3]
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-}
-
-
-===========================================
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[3]
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
-
-===========================================
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-}
-
-[3]
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
-[4]
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-}
-
-
-===========================================
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    int(4)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-
-[2]
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-}
-
-[3]
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [3]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-
-[4]
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
-
-
-===========================================
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [4]=>
-    int(4)
-  }
-}
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-
-[2]
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [2]=>
-  array(1) {
-    [4]=>
-    int(4)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-
-[3]
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-}
-
-[4]
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [4]=>
-    int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-}
-
-[5]
-array(1) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-}
-array(1) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-}
-array(1) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-}
-
-
-===========================================
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(10) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-  [6]=>
-  array(1) {
-    [0]=>
-    int(7)
-  }
-  [7]=>
-  array(1) {
-    [0]=>
-    int(8)
-  }
-  [8]=>
-  array(1) {
-    [0]=>
-    int(9)
-  }
-  [9]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(10) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    [4]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    [5]=>
-    int(6)
-  }
-  [6]=>
-  array(1) {
-    [6]=>
-    int(7)
-  }
-  [7]=>
-  array(1) {
-    [7]=>
-    int(8)
-  }
-  [8]=>
-  array(1) {
-    [8]=>
-    int(9)
-  }
-  [9]=>
-  array(1) {
-    [9]=>
-    int(10)
-  }
-}
-array(10) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-  [6]=>
-  array(1) {
-    [0]=>
-    int(7)
-  }
-  [7]=>
-  array(1) {
-    [0]=>
-    int(8)
-  }
-  [8]=>
-  array(1) {
-    [0]=>
-    int(9)
-  }
-  [9]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[2]
-array(5) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-array(5) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [3]=>
-  array(2) {
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-  }
-  [4]=>
-  array(2) {
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(5) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-
-[3]
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [2]=>
-  array(3) {
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-  }
-  [3]=>
-  array(1) {
-    [9]=>
-    int(10)
-  }
-}
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[4]
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(7)
-    [3]=>
-    int(8)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(4) {
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-  }
-  [2]=>
-  array(2) {
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(7)
-    [3]=>
-    int(8)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-
-[5]
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-    [3]=>
-    int(9)
-    [4]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-    [3]=>
-    int(9)
-    [4]=>
-    int(10)
-  }
-}
-
-[6]
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-    [3]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-    [3]=>
-    int(10)
-  }
-}
-
-[7]
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-
-[8]
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-
-[9]
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [9]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[10]
-array(1) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(1) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-array(1) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-    [6]=>
-    int(7)
-    [7]=>
-    int(8)
-    [8]=>
-    int(9)
-    [9]=>
-    int(10)
-  }
-}
-
-
-===========================================
-array(11) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-  [6]=>
-  int(6)
-  [7]=>
-  int(7)
-  [8]=>
-  int(8)
-  [9]=>
-  int(9)
-  [10]=>
-  int(10)
-}
--------------------------------------------
-[0]
-NULL
-NULL
-NULL
-
-[1]
-array(11) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [6]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-  [7]=>
-  array(1) {
-    [0]=>
-    int(7)
-  }
-  [8]=>
-  array(1) {
-    [0]=>
-    int(8)
-  }
-  [9]=>
-  array(1) {
-    [0]=>
-    int(9)
-  }
-  [10]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(11) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [4]=>
-    int(4)
-  }
-  [5]=>
-  array(1) {
-    [5]=>
-    int(5)
-  }
-  [6]=>
-  array(1) {
-    [6]=>
-    int(6)
-  }
-  [7]=>
-  array(1) {
-    [7]=>
-    int(7)
-  }
-  [8]=>
-  array(1) {
-    [8]=>
-    int(8)
-  }
-  [9]=>
-  array(1) {
-    [9]=>
-    int(9)
-  }
-  [10]=>
-  array(1) {
-    [10]=>
-    int(10)
-  }
-}
-array(11) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(4)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-  [6]=>
-  array(1) {
-    [0]=>
-    int(6)
-  }
-  [7]=>
-  array(1) {
-    [0]=>
-    int(7)
-  }
-  [8]=>
-  array(1) {
-    [0]=>
-    int(8)
-  }
-  [9]=>
-  array(1) {
-    [0]=>
-    int(9)
-  }
-  [10]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[2]
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [2]=>
-  array(2) {
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-  }
-  [3]=>
-  array(2) {
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-  }
-  [4]=>
-  array(2) {
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-  }
-  [5]=>
-  array(1) {
-    [10]=>
-    int(10)
-  }
-}
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-  }
-  [5]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[3]
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-    [2]=>
-    int(5)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(3) {
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-  }
-  [2]=>
-  array(3) {
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-  }
-  [3]=>
-  array(2) {
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-    [2]=>
-    int(5)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-
-[4]
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-    [3]=>
-    int(7)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(4) {
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-  }
-  [2]=>
-  array(3) {
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(5)
-    [2]=>
-    int(6)
-    [3]=>
-    int(7)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-
-[5]
-array(3) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(7)
-    [3]=>
-    int(8)
-    [4]=>
-    int(9)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-  }
-  [2]=>
-  array(1) {
-    [10]=>
-    int(10)
-  }
-}
-array(3) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(7)
-    [3]=>
-    int(8)
-    [4]=>
-    int(9)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[6]
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-    [3]=>
-    int(9)
-    [4]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-    [2]=>
-    int(8)
-    [3]=>
-    int(9)
-    [4]=>
-    int(10)
-  }
-}
-
-[7]
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-    [3]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(7) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(7)
-    [1]=>
-    int(8)
-    [2]=>
-    int(9)
-    [3]=>
-    int(10)
-  }
-}
-
-[8]
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(8) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(8)
-    [1]=>
-    int(9)
-    [2]=>
-    int(10)
-  }
-}
-
-[9]
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(9) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(9)
-    [1]=>
-    int(10)
-  }
-}
-
-[10]
-array(2) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [10]=>
-    int(10)
-  }
-}
-array(2) {
-  [0]=>
-  array(10) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(10)
-  }
-}
-
-[11]
-array(1) {
-  [0]=>
-  array(11) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(1) {
-  [0]=>
-  array(11) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-array(1) {
-  [0]=>
-  array(11) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(1)
-    [2]=>
-    int(2)
-    [3]=>
-    int(3)
-    [4]=>
-    int(4)
-    [5]=>
-    int(5)
-    [6]=>
-    int(6)
-    [7]=>
-    int(7)
-    [8]=>
-    int(8)
-    [9]=>
-    int(9)
-    [10]=>
-    int(10)
-  }
-}
-
-
 ===========================================
 array(1) {
   [u"a"]=>

diff --git a/ext/standard/tests/array/array_chunk2.phpt b/ext/standard/tests/array/array_chunk2.phpt
index 43d12544295ac4d9bfab49edb3bb4fe97068b606..c9ee421b42dc921e1c43c5d4edaadc334566c362 100644 (file)
--- a/ext/standard/tests/array/array_chunk2.phpt
+++ b/ext/standard/tests/array/array_chunk2.phpt
@@ -16,138 +16,6 @@ var_dump(array_chunk($input_array, 10, true));
 Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "a"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(1) "b"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(1) "c"
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    string(1) "d"
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    string(1) "e"
-  }
-}
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(1) "a"
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    string(1) "b"
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    string(1) "c"
-  }
-  [3]=>
-  array(1) {
-    [3]=>
-    string(1) "d"
-  }
-  [4]=>
-  array(1) {
-    [4]=>
-    string(1) "e"
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(1) "c"
-    [1]=>
-    string(1) "d"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    string(1) "e"
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    string(1) "c"
-    [3]=>
-    string(1) "d"
-  }
-  [2]=>
-  array(1) {
-    [4]=>
-    string(1) "e"
-  }
-}
-array(1) {
-  [0]=>
-  array(5) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-    [3]=>
-    string(1) "d"
-    [4]=>
-    string(1) "e"
-  }
-}
-array(1) {
-  [0]=>
-  array(5) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-    [3]=>
-    string(1) "d"
-    [4]=>
-    string(1) "e"
-  }
-}
---UEXPECTF--
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
 Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
 NULL
 array(5) {

diff --git a/ext/standard/tests/array/array_chunk_basic1.phpt b/ext/standard/tests/array/array_chunk_basic1.phpt
index 68be1ce8c25697e6cebc8b5c88716489bde8b78f..b46e7b03f4dfeef740a43f2a30515ac8c56c63ae 100644 (file)
--- a/ext/standard/tests/array/array_chunk_basic1.phpt
+++ b/ext/standard/tests/array/array_chunk_basic1.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test array_chunk() function : basic functionality - defualt 'preserve_keys'
+Test array_chunk() function : basic functionality - default 'preserve_keys'
 --FILE--
 <?php
 /* Prototype  : array array_chunk(array $array, int $size [, bool $preserve_keys])
@@ -39,104 +39,7 @@ foreach ($input_arrays as $input_array){
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_chunk() : basic functionality ***
-
--- Iteration 1 --
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-}
-
--- Iteration 2 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(6) "value1"
-    [1]=>
-    string(6) "value2"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(6) "value3"
-  }
-}
-
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
--- Iteration 4 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(5) "three"
-  }
-}
-
--- Iteration 5 --
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(5) "three"
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_chunk() : basic functionality ***
 
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/array_chunk_basic2.phpt b/ext/standard/tests/array/array_chunk_basic2.phpt
index 75e41888a6c0d55bc6814febf268f00cd78a6173..73b78b877a948cde6fe0c039178b4bd51026eb64 100644 (file)
--- a/ext/standard/tests/array/array_chunk_basic2.phpt
+++ b/ext/standard/tests/array/array_chunk_basic2.phpt
@@ -39,188 +39,7 @@ foreach ($input_arrays as $input_array){
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_chunk() : basic functionality ***
-
--- Iteration 1 --
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    [4]=>
-    int(5)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-}
-
--- Iteration 2 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(6) "value1"
-    [1]=>
-    string(6) "value2"
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    string(6) "value3"
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(6) "value1"
-    [1]=>
-    string(6) "value2"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(6) "value3"
-  }
-}
-
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(2) {
-    ["key1"]=>
-    int(1)
-    ["key2"]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    ["key3"]=>
-    int(3)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-
--- Iteration 4 --
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(1) {
-    [3]=>
-    string(5) "three"
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(5) "three"
-  }
-}
-
--- Iteration 5 --
-array(3) {
-  [0]=>
-  array(2) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(2) {
-    [3]=>
-    string(5) "three"
-    [4]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    ["five"]=>
-    int(5)
-  }
-}
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(5) "three"
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(5)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_chunk() : basic functionality ***
 
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/array_chunk_error.phpt b/ext/standard/tests/array/array_chunk_error.phpt
index 18cd4a0af19c7bc01edeec44a50ea1b8ecac8268..5197945994ff7f42c6efffc1b3cb68d844200cc3 100644 (file)
--- a/ext/standard/tests/array/array_chunk_error.phpt
+++ b/ext/standard/tests/array/array_chunk_error.phpt
@@ -44,21 +44,3 @@ NULL
 Warning: array_chunk() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_chunk() : error conditions ***
-
--- Testing array_chunk() function with zero arguments --
-
-Warning: array_chunk() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
--- Testing array_chunk() function with more than expected no. of arguments --
-
-Warning: array_chunk() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
--- Testing array_chunk() function with less than expected no. of arguments --
-
-Warning: array_chunk() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_chunk_variation1.phpt b/ext/standard/tests/array/array_chunk_variation1.phpt
index 954a39fdb35bf65b252027d60cd619e2eb7ae4b9..d68a0275b94003f08efd74c3a2a3847534e99d01 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation1.phpt
+++ b/ext/standard/tests/array/array_chunk_variation1.phpt
@@ -248,251 +248,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_chunk() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, string given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_chunk() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_chunk_variation2.phpt b/ext/standard/tests/array/array_chunk_variation2.phpt
index a131fefb68cdc6db3068b253206cf97844d9a54d..920065ac8e240e582d308f39414d0c51ac8a000f 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation2.phpt
+++ b/ext/standard/tests/array/array_chunk_variation2.phpt
@@ -350,352 +350,6 @@ NULL
 
 -- Iteration 17 --
 
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_chunk() expects parameter 2 to be long, object given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, object given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, string given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Iteration 1 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 2 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 3 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 4 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
-Warning: array_chunk() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 13 --
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
--- Iteration 14 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 15 --
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-}
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-
--- Iteration 16 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Iteration 17 --
-
 Warning: array_chunk() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_chunk_variation3.phpt b/ext/standard/tests/array/array_chunk_variation3.phpt
index e9911bd8bd23f11edf2f9e8bf5a3990a37115649..452006a44d9cb0a19b44236512306633eff5471a 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation3.phpt
+++ b/ext/standard/tests/array/array_chunk_variation3.phpt
@@ -266,198 +266,3 @@ array(1) {
   }
 }
 Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Iteration 1 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 2 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 3 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 4 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 5 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 6 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 7 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 8 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 9 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 10 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 11 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 12 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 13 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 14 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 15 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 16 --
-
-Warning: array_chunk() expects parameter 3 to be boolean, object given in %s on line %d
-NULL
-
--- Iteration 17 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-
--- Iteration 18 --
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-Done

diff --git a/ext/standard/tests/array/array_chunk_variation4.phpt b/ext/standard/tests/array/array_chunk_variation4.phpt
index 7049d22697aa825efa7d271846db37fda081b5c6..daff8f21d6a608c5397adbad76b67ef2aa8d9e31 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation4.phpt
+++ b/ext/standard/tests/array/array_chunk_variation4.phpt
@@ -23,7 +23,7 @@ $input_array = array (
   "array3" =>  array(1) 
 );
 
-echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --\n"; 
+echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as default --\n"; 
 var_dump( array_chunk($input_array, $size) );
 
 echo "\n-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --\n"; 
@@ -37,91 +37,7 @@ echo "Done";
 --EXPECTF--
 *** Testing array_chunk() : usage variations ***
 
--- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    array(0) {
-    }
-    [1]=>
-    array(3) {
-      [0]=>
-      int(1)
-      [1]=>
-      int(2)
-      [2]=>
-      int(3)
-    }
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-  }
-}
-
--- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = true --
-array(2) {
-  [0]=>
-  array(2) {
-    ["array1"]=>
-    array(0) {
-    }
-    ["array2"]=>
-    array(3) {
-      [0]=>
-      int(1)
-      [1]=>
-      int(2)
-      [2]=>
-      int(3)
-    }
-  }
-  [1]=>
-  array(1) {
-    ["array3"]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-  }
-}
-
--- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' = false --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    array(0) {
-    }
-    [1]=>
-    array(3) {
-      [0]=>
-      int(1)
-      [1]=>
-      int(2)
-      [2]=>
-      int(3)
-    }
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-  }
-}
-Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as defualt --
+-- Testing array_chunk() by supplying an array containing different sub arrays & 'preserve_key' as default --
 array(2) {
   [0]=>
   array(2) {

diff --git a/ext/standard/tests/array/array_chunk_variation5.phpt b/ext/standard/tests/array/array_chunk_variation5.phpt
index 730ef6aa87cbb03feac2ce1b3ca40763c67a872a..8d3609282282c970c0901f1a826f33244d4957ef 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation5.phpt
+++ b/ext/standard/tests/array/array_chunk_variation5.phpt
@@ -146,116 +146,3 @@ array(3) {
   }
 }
 Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Testing array_chunk() when size = -1 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Testing array_chunk() when size = 4 --
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
--- Testing array_chunk() when size = 0 --
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
-Warning: array_chunk(): Size parameter expected to be greater than 0 in %s on line %d
-NULL
-
--- Testing array_chunk() when size = 1.5 --
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    int(3)
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(3)
-  }
-}
-Done

diff --git a/ext/standard/tests/array/array_chunk_variation6.phpt b/ext/standard/tests/array/array_chunk_variation6.phpt
index 4e93c3d9eb54a772f3f4151f9340e1246a9ceeb8..bf5cdd0753f41f3aab17cdb4b1ba7c4ec8dba208 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation6.phpt
+++ b/ext/standard/tests/array/array_chunk_variation6.phpt
@@ -47,93 +47,7 @@ foreach ($input_arrays as $input_array){
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_chunk() : usage variations ***
-
--- Testing array_chunk() by supplying various arrays --
-
--- Iteration 1 --
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-
--- Iteration 2 --
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(1) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(5)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    ["a"]=>
-    int(4)
-    ["b"]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    ["c"]=>
-    int(3)
-    ["d"]=>
-    int(5)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(5)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_chunk() : usage variations ***
 
 -- Testing array_chunk() by supplying various arrays --

diff --git a/ext/standard/tests/array/array_chunk_variation7.phpt b/ext/standard/tests/array/array_chunk_variation7.phpt
index ac70969cd5b7acb8ddb4b5c24bcb5bdcaac72207..e07bf6d64b524d1aae9e579e99f62c53b004dbb4 100644 (file)
--- a/ext/standard/tests/array/array_chunk_variation7.phpt
+++ b/ext/standard/tests/array/array_chunk_variation7.phpt
@@ -37,59 +37,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_chunk() : usage variations ***
 
--- Testing array_chunk(), input array containing references 
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    &int(1)
-    [1]=>
-    &int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    &int(3)
-    [1]=>
-    &int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    ["one"]=>
-    &int(1)
-    ["two"]=>
-    &int(2)
-  }
-  [1]=>
-  array(2) {
-    ["three"]=>
-    &int(3)
-    ["four"]=>
-    &int(4)
-  }
-}
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    &int(1)
-    [1]=>
-    &int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    &int(3)
-    [1]=>
-    &int(4)
-  }
-}
-Done
---UEXPECTF--
-*** Testing array_chunk() : usage variations ***
-
 -- Testing array_chunk(), input array containing references 
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_combine_basic.phpt b/ext/standard/tests/array/array_combine_basic.phpt
index 1a4f80ab55d2a704a2b8ca890a93b957ef67d275..02925121f810f60e8ad0012803c20c0500d555a8 100644 (file)
--- a/ext/standard/tests/array/array_combine_basic.phpt
+++ b/ext/standard/tests/array/array_combine_basic.phpt
@@ -29,28 +29,7 @@ var_dump( array_combine($keys_array, $values_array) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_combine() : basic functionality ***
-array(2) {
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-}
-array(2) {
-  ["a"]=>
-  string(1) "c"
-  ["b"]=>
-  string(1) "d"
-}
-array(2) {
-  [1]=>
-  string(1) "c"
-  ["b"]=>
-  int(4)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_combine() : basic functionality ***
 array(2) {
   [1]=>

diff --git a/ext/standard/tests/array/array_combine_error1.phpt b/ext/standard/tests/array/array_combine_error1.phpt
index 5737f5bb27b22ca333ac085e0a1c1e280ae18916..aa5a1afe1b32e0a7abffee38605b4d015c7ac449 100644 (file)
--- a/ext/standard/tests/array/array_combine_error1.phpt
+++ b/ext/standard/tests/array/array_combine_error1.phpt
@@ -46,21 +46,3 @@ NULL
 Warning: array_combine() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_combine() : error conditions ***
-
--- Testing array_combine() function with Zero arguments --
-
-Warning: array_combine() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
-
--- Testing array_combine() function with more than expected no. of arguments --
-
-Warning: array_combine() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
--- Testing array_combine() function with less than expected no. of arguments --
-
-Warning: array_combine() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_combine_error2.phpt b/ext/standard/tests/array/array_combine_error2.phpt
index 8157096f168f6319a75992eea5c999d875dced4d..c06fdb490a6e6ab9d2b1e8ccfee242aacc831dea 100644 (file)
--- a/ext/standard/tests/array/array_combine_error2.phpt
+++ b/ext/standard/tests/array/array_combine_error2.phpt
@@ -51,26 +51,3 @@ bool(false)
 Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_combine() : error conditions specific to array_combine() ***
-
--- Testing array_combine() function with empty arrays --
-
-Warning: array_combine(): Both parameters should have at least 1 element in %s on line %d
-bool(false)
-
--- Testing array_combine() function with empty array for $keys argument --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-
--- Testing array_combine() function with empty array for $values argument --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-
--- Testing array_combine() function by passing array with unequal number of elements --
-
-Warning: array_combine(): Both parameters should have an equal number of elements in %s on line %d
-bool(false)
-Done

diff --git a/ext/standard/tests/array/array_combine_variation1.phpt b/ext/standard/tests/array/array_combine_variation1.phpt
index 19b8803ed24dad169c9b2ab6706e137de9490e95..e7dbc3b24af74d52f2d957674d734df370f83a2b 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation1.phpt
+++ b/ext/standard/tests/array/array_combine_variation1.phpt
@@ -161,105 +161,6 @@ Warning: array_combine() expects parameter 1 to be array, boolean given in %s on
 NULL
 -- Iteration 16 --
 
-Warning: array_combine() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_combine() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_combine() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_combine() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_combine() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_combine() expects parameter 1 to be array, object given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_combine() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_combine() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 24 --
-
-Warning: array_combine() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_combine() : Passing non-array values to $keys argument ***
--- Iteration 1 --
-
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_combine() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_combine() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_combine() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_combine() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_combine() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_combine() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_combine() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_combine() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_combine() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: array_combine() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/array_combine_variation2.phpt b/ext/standard/tests/array/array_combine_variation2.phpt
index cfd1eecda686c249f77944d5845f0010cda2ff8d..1cac834681f273ee9d6eb3250e37f6ff3cd2c4da 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation2.phpt
+++ b/ext/standard/tests/array/array_combine_variation2.phpt
@@ -161,105 +161,6 @@ Warning: array_combine() expects parameter 2 to be array, boolean given in %s on
 NULL
 -- Iteration 16 --
 
-Warning: array_combine() expects parameter 2 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_combine() expects parameter 2 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_combine() expects parameter 2 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_combine() expects parameter 2 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_combine() expects parameter 2 to be array, string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_combine() expects parameter 2 to be array, object given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_combine() expects parameter 2 to be array, null given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_combine() expects parameter 2 to be array, null given in %s on line %d
-NULL
--- Iteration 24 --
-
-Warning: array_combine() expects parameter 2 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_combine() : Passing non-array values to $values argument ***
--- Iteration 1 --
-
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_combine() expects parameter 2 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_combine() expects parameter 2 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_combine() expects parameter 2 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_combine() expects parameter 2 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_combine() expects parameter 2 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_combine() expects parameter 2 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_combine() expects parameter 2 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_combine() expects parameter 2 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_combine() expects parameter 2 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: array_combine() expects parameter 2 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/array_combine_variation3.phpt b/ext/standard/tests/array/array_combine_variation3.phpt
index e9fb9afd4611f1951e32b1d7760186ec9388de8a..baa3754087d5dd99a5107c32740d8916b80a1843 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation3.phpt
+++ b/ext/standard/tests/array/array_combine_variation3.phpt
@@ -95,203 +95,6 @@ array(2) {
   int(2)
 }
 -- Iteration 2 --
-array(2) {
-  ["1.1"]=>
-  float(1.1)
-  ["2.2"]=>
-  float(2.2)
-}
--- Iteration 3 --
-array(2) {
-  [""]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iteration 4 --
-
-Warning: array_combine(): Both parameters should have at least 1 element in %s on line %d
-bool(false)
--- Iteration 5 --
-array(1) {
-  [""]=>
-  NULL
-}
--- Iteration 6 --
-array(6) {
-  ["a\v\f"]=>
-  string(3) "a\v\f"
-  ["aaaa
-"]=>
-  string(5) "aaaa
-"
-  ["b"]=>
-  string(1) "b"
-  ["b  bbb"]=>
-  string(5) "b bbb"
-  ["c"]=>
-  string(1) "c"
-  ["\[\]\!\@\#$\%\^\&\*\(\)\{\}"]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-}
--- Iteration 7 --
-array(6) {
-  ["a\v\f"]=>
-  string(5) "a\v\f"
-  ["aaaa\r"]=>
-  string(6) "aaaa\r"
-  ["b"]=>
-  string(1) "b"
-  ["b\tbbb"]=>
-  string(6) "b\tbbb"
-  ["c"]=>
-  string(1) "c"
-  ["\[\]\!\@\#\$\%\^\&\*\(\)\{\}"]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-}
--- Iteration 8 --
-array(4) {
-  ["
-"]=>
-  string(1) "
-"
-  ["hello world
-The quick brown fox jumped over;
-the lazy dog
-This is a double quoted string"]=>
-  string(88) "hello world
-The quick brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  ["11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"]=>
-  string(90) "11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"
-}
--- Iteration 9 --
-array(3) {
-  ["one"]=>
-  string(3) "one"
-  ["two"]=>
-  string(3) "two"
-  ["three"]=>
-  string(5) "three"
-}
--- Iteration 10 --
-array(3) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
--- Iteration 11 --
-array(4) {
-  [10]=>
-  int(10)
-  [20]=>
-  int(20)
-  [40]=>
-  int(40)
-  [30]=>
-  int(30)
-}
--- Iteration 12 --
-array(3) {
-  ["ten"]=>
-  string(3) "ten"
-  ["twenty"]=>
-  string(6) "twenty"
-  ["thirty"]=>
-  string(6) "thirty"
-}
--- Iteration 13 --
-array(3) {
-  [1]=>
-  int(1)
-  ["two"]=>
-  string(3) "two"
-  ["four"]=>
-  string(4) "four"
-}
--- Iteration 14 --
-array(2) {
-  ["null"]=>
-  string(4) "null"
-  [""]=>
-  NULL
-}
--- Iteration 15 --
-array(4) {
-  ["true"]=>
-  string(4) "true"
-  ["false"]=>
-  string(5) "false"
-  [""]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iteration 16 --
-array(2) {
-  ["emptys"]=>
-  string(6) "emptys"
-  [""]=>
-  string(0) ""
-}
--- Iteration 17 --
-array(2) {
-  [""]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iteration 18 --
-array(3) {
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-  [6]=>
-  int(6)
-}
--- Iteration 19 --
-array(3) {
-  [10]=>
-  int(10)
-  [20]=>
-  int(20)
-  [3]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing array_combine() : Passing different types of arrays to both $keys and $values argument ***
--- Iteration 1 --
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
--- Iteration 2 --
 array(2) {
   [u"1.1"]=>
   float(1.1)

diff --git a/ext/standard/tests/array/array_combine_variation4.phpt b/ext/standard/tests/array/array_combine_variation4.phpt
index 495205306e76810b74a92b6bdeb010ae32def8bd..382735b39d3ed9aa3b3bacee1088cbec5c0d370f 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation4.phpt
+++ b/ext/standard/tests/array/array_combine_variation4.phpt
@@ -102,109 +102,6 @@ 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)
--- Iteration 2 --
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  string(1) "1"
-}
--- Iteration 4 --
-array(4) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "3"
-  [4]=>
-  string(1) "4"
-}
--- Iteration 5 --
-array(1) {
-  ["float"]=>
-  string(5) "float"
-}
--- Iteration 6 --
-array(4) {
-  ["f1"]=>
-  string(2) "f1"
-  ["f2"]=>
-  string(2) "f2"
-  ["f3"]=>
-  string(2) "f3"
-  ["f4"]=>
-  string(2) "f4"
-}
--- Iteration 7 --
-array(4) {
-  [111]=>
-  int(111)
-  ["color"]=>
-  string(5) "color"
-  ["2.2"]=>
-  float(2.2)
-  [33]=>
-  int(33)
-}
--- Iteration 8 --
-array(4) {
-  [111]=>
-  int(111)
-  ["color"]=>
-  string(5) "color"
-  ["2.2"]=>
-  float(2.2)
-  [33]=>
-  int(33)
-}
--- Iteration 9 --
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["string"]=>
-  string(6) "string"
-}
--- Iteration 10 --
-array(1) {
-  ["hello"]=>
-  string(5) "hello"
-}
--- Iteration 11 --
-array(6) {
-  [1]=>
-  int(1)
-  ["2.2"]=>
-  float(2.2)
-  ["int"]=>
-  string(3) "int"
-  ["float"]=>
-  string(5) "float"
-  ["unset"]=>
-  string(5) "unset"
-  ["heredoc"]=>
-  string(7) "heredoc"
-}
-Done
---UEXPECTF--
-*** Testing array_combine() : assoc array with diff keys to both $keys and $values argument ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-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)
 -- Iteration 2 --

diff --git a/ext/standard/tests/array/array_combine_variation5.phpt b/ext/standard/tests/array/array_combine_variation5.phpt
index b1ad91683657ae8f236bd02e551462e367c4162c..4d44f8f26e3ae46b6f224a54643eaab624510431 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation5.phpt
+++ b/ext/standard/tests/array/array_combine_variation5.phpt
@@ -83,111 +83,6 @@ echo "Done";
 *** Testing array_combine() : assoc array with diff values to both $keys and $values argument ***
 -- Iteration 1 --
 
-Warning: array_combine(): Both parameters should have at least 1 element in %s on line %d
-bool(false)
--- Iteration 2 --
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  int(1)
-}
--- Iteration 4 --
-array(4) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-}
--- Iteration 5 --
-array(1) {
-  ["2.3333"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-array(4) {
-  ["1.2"]=>
-  float(1.2)
-  ["3.33"]=>
-  float(3.33)
-  ["4.8999992284"]=>
-  float(4.8999992284)
-  ["33333333.333"]=>
-  float(33333333.333)
-}
--- Iteration 7 --
-array(4) {
-  ["   Hello"]=>
-  string(6) "  Hello"
-  ["col        or"]=>
-  string(6) "col       or"
-  ["\v\fworld"]=>
-  string(7) "\v\fworld"
-  ["pen
-"]=>
-  string(4) "pen
-"
-}
--- Iteration 8 --
-array(4) {
-  ["\tHello"]=>
-  string(7) "\tHello"
-  ["col\tor"]=>
-  string(7) "col\tor"
-  ["\v\fworld"]=>
-  string(9) "\v\fworld"
-  ["pen\n"]=>
-  string(5) "pen\n"
-}
--- Iteration 9 --
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(11) "Hello world"
-}
--- Iteration 10 --
-array(3) {
-  ["Class A object"]=>
-  object(classA)#%d (0) {
-  }
-  [""]=>
-  NULL
-  ["Resource id #%d"]=>
-  resource(%d) of type (stream)
-}
--- Iteration 11 --
-array(8) {
-  ["hello"]=>
-  string(5) "hello"
-  ["Class A object"]=>
-  object(classA)#%d (0) {
-  }
-  ["fruit"]=>
-  string(5) "fruit"
-  ["Resource id #%d"]=>
-  resource(%d) of type (stream)
-  [133]=>
-  int(133)
-  ["444.432"]=>
-  float(444.432)
-  [""]=>
-  NULL
-  ["Hello world"]=>
-  string(11) "Hello world"
-}
-Done
---UEXPECTF--
-*** Testing array_combine() : assoc array with diff values to both $keys and $values argument ***
--- Iteration 1 --
-
 Warning: array_combine(): Both parameters should have at least 1 element in %s on line %d
 bool(false)
 -- Iteration 2 --

diff --git a/ext/standard/tests/array/array_combine_variation6.phpt b/ext/standard/tests/array/array_combine_variation6.phpt
index 204aa4eab4cf49e3b96d5b12a8056bd71e011899..6c4f12c796c827cd6032c82b701b034fa4aec497 100644 (file)
--- a/ext/standard/tests/array/array_combine_variation6.phpt
+++ b/ext/standard/tests/array/array_combine_variation6.phpt
@@ -30,28 +30,7 @@ var_dump( array_combine($arr_binary, $arr_normal) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_combine() : binary safe checking ***
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-array(2) {
-  ["hello"]=>
-  string(5) "hello"
-  ["world"]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_combine() : binary safe checking ***
 array(2) {
   ["hello"]=>

diff --git a/ext/standard/tests/array/array_count_values.phpt b/ext/standard/tests/array/array_count_values.phpt
index 7212db28a45edccf30af9bedab5dc13c96f638d2..0ac91f38ff5b335d57909750def3dac750a0501e 100644 (file)
--- a/ext/standard/tests/array/array_count_values.phpt
+++ b/ext/standard/tests/array/array_count_values.phpt
@@ -58,76 +58,6 @@ array(1) {
   int(2)
 }
 
-array(3) {
-  [1]=>
-  int(2)
-  ["hello"]=>
-  int(2)
-  ["world"]=>
-  int(1)
-}
-
-array(2) {
-  ["hello"]=>
-  int(2)
-  ["world"]=>
-  int(1)
-}
-
-array(3) {
-  [""]=>
-  int(2)
-  ["world"]=>
-  int(3)
-  ["hello"]=>
-  int(4)
-}
-
-array(1) {
-  [0]=>
-  int(1)
-}
-
-array(1) {
-  [1]=>
-  int(1)
-}
---UEXPECT--
-array(0) {
-}
-
-array(1) {
-  [0]=>
-  int(1)
-}
-
-array(1) {
-  [1]=>
-  int(1)
-}
-
-array(1) {
-  [-1]=>
-  int(1)
-}
-
-array(1) {
-  [0]=>
-  int(2)
-}
-
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-}
-
-array(1) {
-  [1]=>
-  int(2)
-}
-
 array(3) {
   [1]=>
   int(2)

diff --git a/ext/standard/tests/array/array_count_values2.phpt b/ext/standard/tests/array/array_count_values2.phpt
index 48a8e977c4dc0ca9e38f8f4a4b6fc4e61130b1f4..55745e13548c4ba954c6c6bf293e8fbbcbe2f717 100644 (file)
--- a/ext/standard/tests/array/array_count_values2.phpt
+++ b/ext/standard/tests/array/array_count_values2.phpt
@@ -18,30 +18,6 @@ $array1 = array(1,
 var_dump(array_count_values($array1));
 ?>
 --EXPECTF--
-Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s
-
-Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s
-
-Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %s
-array(8) {
-  [1]=>
-  int(2)
-  ["hello"]=>
-  int(2)
-  ["world"]=>
-  int(1)
-  [""]=>
-  int(1)
-  ["rabbit"]=>
-  int(1)
-  ["foo"]=>
-  int(1)
-  ["Foo"]=>
-  int(1)
-  [0]=>
-  int(1)
-}
---UEXPECTF--
 Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %d
 
 Warning: array_count_values(): Can only count STRING and INTEGER values! in %s on line %d

diff --git a/ext/standard/tests/array/array_diff_assoc.phpt b/ext/standard/tests/array/array_diff_assoc.phpt
index 29db107d65a8208d25cf59e8be5183247aff2361..9f7359a536672f63c0da902629b1efdb95e679ed 100755 (executable)
--- a/ext/standard/tests/array/array_diff_assoc.phpt
+++ b/ext/standard/tests/array/array_diff_assoc.phpt
@@ -44,6 +44,3 @@ Array
         )
 
 )
-
-
-

diff --git a/ext/standard/tests/array/array_diff_assoc_basic.phpt b/ext/standard/tests/array/array_diff_assoc_basic.phpt
index d2167544fe05a554f40d48c09a4b412f229d05b6..1c1367cdec6a1d62e1817b94fea1cef47766db66 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_basic.phpt
@@ -36,60 +36,7 @@ var_dump(array_diff_assoc($array_string_key, $array_numeric_key));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff_assoc() : basic functionality ***
--- Compare Default keys to numeric keys --
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "three"
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-
--- Compare Default keys to string keys --
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "three"
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-
--- Compare numeric keys to string keys --
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  int(4)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  string(1) "2"
-  [3]=>
-  string(5) "three"
-}
-Done
-
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff_assoc() : basic functionality ***
 -- Compare Default keys to numeric keys --
 array(3) {
@@ -140,4 +87,4 @@ array(3) {
   [3]=>
   unicode(5) "three"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_error.phpt b/ext/standard/tests/array/array_diff_assoc_error.phpt
index 211907c726d4854aa0789b3d292f80736fbccf71..1aa7a08bc53de4787416cbc9d137e57237e2711b 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_error.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_error.phpt
@@ -38,4 +38,4 @@ NULL
 
 Warning: array_diff_assoc(): at least 2 parameters are required, 1 given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation1.phpt b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
index 8394431c28315e4a97022a08490fab96f4d4072d..610f0a5eb14aa5df87e2d3feb86dee2d3a35bf28 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation1.phpt
@@ -232,136 +232,3 @@ NULL
 Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-
-Warning: array_diff_assoc(): Argument #1 is not an array in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_diff_assoc_variation10.phpt b/ext/standard/tests/array/array_diff_assoc_variation10.phpt
index 1425822bfaf58db2f81fb4902e3cf560f8c5d9d0..8f37a9c4e4710d6b6143fd29451716f427979032 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation10.phpt
@@ -31,24 +31,7 @@ var_dump(array_diff_assoc($array2, $array1));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
-array(3) {
-  [0]=>
-  string(1) "1"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-}
-array(2) {
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  string(4) "test"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff_assoc() : usage variations ***
 array(3) {
   [0]=>
@@ -64,4 +47,4 @@ array(2) {
   [4]=>
   unicode(4) "test"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation2.phpt b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
index 7d27189cab7833b87a36eabe188bb7ad07e5b361..7340a3f708aea35990dc011ccc55293d1afbcf3c 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation2.phpt
@@ -100,7 +100,6 @@ echo "Done";
 ?>
 
 --EXPECTF--
-
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
@@ -233,137 +232,3 @@ NULL
 Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-
-*** Testing array_diff_assoc() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-
-Warning: array_diff_assoc(): Argument #2 is not an array in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_diff_assoc_variation3.phpt b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
index fc5349bae3657811f600d36b78264ffda14edbad..7085a74463df08896f06864ea0e9a98c250cad4d 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation3.phpt
@@ -159,99 +159,6 @@ array(3) {
   bool(false)
 }
 
--- Iteration 5 --
-array(2) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
-
--- Iteration 6 --
-array(3) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  string(11) "hello world"
-}
-
--- Iteration 7 --
-array(2) {
-  [0]=>
-  string(6) "binary"
-  [1]=>
-  string(6) "binary"
-}
-
--- Iteration 8 --
-array(1) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-}
-
--- Iteration 9 --
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 10 --
-array(1) {
-  [0]=>
-  NULL
-}
-Done
---UEXPECTF--
-
-*** Testing array_diff_assoc() : usage variations ***
-
--- Iteration 1 --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(12345)
-  [3]=>
-  int(-2345)
-}
-
--- Iteration 2 --
-array(5) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  float(-10.5)
-  [2]=>
-  float(123456789000)
-  [3]=>
-  float(1.23456789E-9)
-  [4]=>
-  float(0.5)
-}
-
--- Iteration 3 --
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-
--- Iteration 4 --
-array(3) {
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(false)
-}
-
 -- Iteration 5 --
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_diff_assoc_variation4.phpt b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
index 1321df6727a9d00d5a06074cf56321e2e55ff52d..941be6bf073e47376e866ec3af426e3a99fdfc6b 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation4.phpt
@@ -101,83 +101,10 @@ foreach($inputs as $key => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 
 *** Testing array_diff_assoc() : usage variations ***
 
--- Iteration 1 --
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [12345]=>
-  string(8) "positive"
-  [-2345]=>
-  string(8) "negative"
-}
-
--- Iteration 2 --
-array(3) {
-  [10]=>
-  string(7) "float 1"
-  [-10]=>
-  string(7) "float 2"
-  [0]=>
-  string(7) "float 3"
-}
-
--- Iteration 3 --
-array(1) {
-  [""]=>
-  string(6) "null 2"
-}
-
--- Iteration 4 --
-array(2) {
-  [1]=>
-  string(5) "boolT"
-  [0]=>
-  string(5) "boolF"
-}
-
--- Iteration 5 --
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-
--- Iteration 6 --
-array(2) {
-  ["string"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-}
-
--- Iteration 7 --
-array(2) {
-  ["binary1"]=>
-  string(8) "binary 1"
-  ["binary2"]=>
-  string(8) "binary 2"
-}
-
--- Iteration 8 --
-array(1) {
-  [""]=>
-  string(9) "undefined"
-}
-
--- Iteration 9 --
-array(1) {
-  [""]=>
-  string(5) "unset"
-}
-Done
---UEXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
-
 -- Iteration 1 --
 array(4) {
   [0]=>
@@ -247,4 +174,4 @@ array(1) {
   [u""]=>
   unicode(5) "unset"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation5.phpt b/ext/standard/tests/array/array_diff_assoc_variation5.phpt
index d8c07818034440354f4e60c6591c8d7b5f1ce70e..fdc92678135e5c1ad6226b382e0980523984c64b 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation5.phpt
@@ -47,106 +47,8 @@ var_dump(array_diff_assoc($arr_default_int, $arr_float, $arr_string, $arr_string
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 
-*** Testing array_diff_assoc() : usage variations ***
--- Result of comparing integers and floating point numbers: --
-array(1) {
-  [3]=>
-  string(1) "a"
-}
-array(1) {
-  [3]=>
-  string(1) "b"
-}
--- Result of comparing integers and strings containing an integers : --
-array(1) {
-  [3]=>
-  string(1) "a"
-}
-array(1) {
-  [3]=>
-  string(1) "c"
-}
--- Result of comparing integers and strings containing floating points : --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  string(1) "a"
-}
-array(4) {
-  [0]=>
-  string(4) "1.00"
-  ["1.00"]=>
-  string(4) "2.00"
-  ["2.00"]=>
-  string(4) "3.00"
-  [1]=>
-  string(1) "d"
-}
--- Result of comparing floating points and strings containing integers : --
-array(1) {
-  [3]=>
-  string(1) "b"
-}
-array(1) {
-  [3]=>
-  string(1) "c"
-}
--- Result of comparing floating points and strings containing floating point: --
-array(4) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(2)
-  [2]=>
-  float(3)
-  [3]=>
-  string(1) "b"
-}
-array(4) {
-  [0]=>
-  string(4) "1.00"
-  ["1.00"]=>
-  string(4) "2.00"
-  ["2.00"]=>
-  string(4) "3.00"
-  [1]=>
-  string(1) "d"
-}
--- Result of comparing strings containing integers and strings containing floating points : --
-array(4) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-  [3]=>
-  string(1) "c"
-}
-array(4) {
-  [0]=>
-  string(4) "1.00"
-  ["1.00"]=>
-  string(4) "2.00"
-  ["2.00"]=>
-  string(4) "3.00"
-  [1]=>
-  string(1) "d"
-}
--- Result of comparing more than two arrays: --
-array(1) {
-  [3]=>
-  string(1) "a"
-}
-Done
---UEXPECTF--
 *** Testing array_diff_assoc() : usage variations ***
 -- Result of comparing integers and floating point numbers: --
 array(1) {
@@ -243,4 +145,4 @@ array(1) {
   [3]=>
   unicode(1) "a"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation6.phpt b/ext/standard/tests/array/array_diff_assoc_variation6.phpt
index fdeb77d78767f43f903ea3fc5bb481c7763092c4..1c9f57228c101138d8b6084f226b861e0fff9248 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation6.phpt
@@ -51,7 +51,7 @@ $inputs = array (
                  '1' => 1, 
                  '0' => 0),
                  
-//defualt keys => float values
+//default keys => float values
 /*7*/  array(2.00000000000001, 1.00, 0.01E-9),
                  
 //numeric keys => float values
@@ -75,126 +75,7 @@ foreach($inputs as $input) {
 };
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
-
--- Iteration 1 --
-array(2) {
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  float(2)
-}
-array(3) {
-  [0]=>
-  string(16) "2.00000000000001"
-  [2]=>
-  string(4) "zero"
-  [3]=>
-  string(1) "a"
-}
-
--- Iteration 2 --
-array(1) {
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [2]=>
-  string(16) "2.00000000000001"
-  [3]=>
-  string(1) "a"
-}
-
--- Iteration 3 --
-array(1) {
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [2]=>
-  string(16) "2.00000000000001"
-  [3]=>
-  string(1) "a"
-}
-
--- Iteration 4 --
-array(2) {
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [0]=>
-  int(2)
-  [2]=>
-  int(0)
-}
-
--- Iteration 5 --
-array(2) {
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [2]=>
-  int(2)
-  [0]=>
-  int(0)
-}
-
--- Iteration 6 --
-array(1) {
-  [0]=>
-  string(4) "zero"
-}
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- Iteration 7 --
-array(2) {
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [0]=>
-  float(2)
-  [2]=>
-  float(1.0E-11)
-}
-
--- Iteration 8 --
-array(2) {
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  float(2)
-}
-array(2) {
-  [2]=>
-  float(2)
-  [0]=>
-  float(1.0E-11)
-}
-
--- Iteration 9 --
-array(1) {
-  [0]=>
-  string(4) "zero"
-}
-array(1) {
-  [0]=>
-  float(1.0E-11)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff_assoc() : usage variations ***
 
 -- Iteration 1 --
@@ -312,4 +193,4 @@ array(1) {
   [0]=>
   float(1.0E-11)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation7.phpt b/ext/standard/tests/array/array_diff_assoc_variation7.phpt
index c3243cd2482c4cdc83e4329ca895087f722ffd78..c30d47d1483615c32b36310800b73217b142905a 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation7.phpt
@@ -47,59 +47,8 @@ var_dump(array_diff_assoc($arr2, $arr1));
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 
-*** Testing array_diff_assoc() : usage variations ***
--- Results when $a = a: --
-array(3) {
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "a"
-}
-array(3) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-}
--- Results when $a has been changed to 4: --
-array(4) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "a"
-}
-array(4) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-  [0]=>
-  &int(4)
-}
--- Results when $arr2 is referenced to $arr1 --
-array(0) {
-}
-array(0) {
-}
--- Results when $arr1 is changed --
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
 *** Testing array_diff_assoc() : usage variations ***
 -- Results when $a = a: --
 array(3) {
@@ -149,4 +98,4 @@ array(0) {
 }
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation8.phpt b/ext/standard/tests/array/array_diff_assoc_variation8.phpt
index 985cc29668df0d8048327475ea4556f843f96489..a1629790a81a4b67e6e0e0d195a6b9717253f888 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation8.phpt
@@ -30,24 +30,7 @@ var_dump(array_diff_assoc($array_assoc, $array_index));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff_assoc() : variation ***
-array(2) {
-  [0]=>
-  string(1) "d"
-  [3]=>
-  string(1) "b"
-}
-array(3) {
-  [0]=>
-  string(1) "a"
-  ["b"]=>
-  string(1) "3"
-  ["c"]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff_assoc() : variation ***
 array(2) {
   [0]=>
@@ -63,4 +46,4 @@ array(3) {
   [u"c"]=>
   int(2)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_assoc_variation9.phpt b/ext/standard/tests/array/array_diff_assoc_variation9.phpt
index 21628f0380b6c555eb94112b16094842e9e93358..0b12592e3cfe088e0d216bd42eeb98dacbcc2094 100644 (file)
--- a/ext/standard/tests/array/array_diff_assoc_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_assoc_variation9.phpt
@@ -37,109 +37,7 @@ var_dump(array_diff_assoc($array1, $array2['sub_arraya']));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff_assoc() : usage variations ***
--- Compare two 2-D arrays --
-array(2) {
-  ["sub_array1"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["sub_array2"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
-array(2) {
-  ["sub_arraya"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(3)
-    [2]=>
-    int(5)
-  }
-  ["sub_arrayb"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "z"
-    [2]=>
-    string(1) "y"
-  }
-}
-
--- Compare subarrays from two 2-D arrays --
-array(2) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(2) {
-  [1]=>
-  int(3)
-  [2]=>
-  int(5)
-}
-array(2) {
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "z"
-  [2]=>
-  string(1) "y"
-}
-
--- Compare a subarray from one 2-D array and one 2-D array --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(2) {
-  ["sub_array1"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["sub_array2"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff_assoc() : usage variations ***
 -- Compare two 2-D arrays --
 array(2) {
@@ -240,4 +138,4 @@ array(2) {
     unicode(1) "c"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_basic.phpt b/ext/standard/tests/array/array_diff_basic.phpt
index ebbdfb2f9dc23e3f279113fc095813651c9e09e3..21b7fdb3cd1f010656de0874889285fdd3f696b7 100644 (file)
--- a/ext/standard/tests/array/array_diff_basic.phpt
+++ b/ext/standard/tests/array/array_diff_basic.phpt
@@ -52,69 +52,7 @@ var_dump(array_diff($array_int1, $array_int2, $array_string1, $array_string2));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : basic functionality ***
--- Test indexed array with integers as elements --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [2]=>
-  int(5)
-  [3]=>
-  int(6)
-}
--- Test indexed array with strings as elements --
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
-array(2) {
-  [2]=>
-  string(4) "five"
-  [3]=>
-  string(3) "six"
-}
--- Test associative array with strings as keys and integers as elements --
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["five"]=>
-  int(5)
-  ["six"]=>
-  int(6)
-}
--- Test associative array with strings as keys and integers as elements --
-array(2) {
-  ["one"]=>
-  string(2) "un"
-  ["two"]=>
-  string(4) "deux"
-}
-array(2) {
-  ["five"]=>
-  string(4) "cinq"
-  ["six"]=>
-  string(3) "six"
-}
--- Test array_diff with more than 2 arguments --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : basic functionality ***
 -- Test indexed array with integers as elements --
 array(2) {

diff --git a/ext/standard/tests/array/array_diff_error.phpt b/ext/standard/tests/array/array_diff_error.phpt
index 95042cb30acc937e5830c7501a6807be1b8ffd36..019cffb1ef942e8391b2e8af7feb24304f0be601 100644 (file)
--- a/ext/standard/tests/array/array_diff_error.phpt
+++ b/ext/standard/tests/array/array_diff_error.phpt
@@ -35,19 +35,6 @@ NULL
 
 -- Testing array_diff() function with less than expected no. of arguments --
 
-Warning: array_diff(): at least 2 parameters are required, 1 given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_diff() : error conditions ***
-
--- Testing array_diff() function with zero arguments --
-
-Warning: array_diff(): at least 2 parameters are required, 0 given in %s on line %d
-NULL
-
--- Testing array_diff() function with less than expected no. of arguments --
-
 Warning: array_diff(): at least 2 parameters are required, 1 given in %s on line %d
 NULL
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_diff_key.phpt b/ext/standard/tests/array/array_diff_key.phpt
index 765431f1241ea4eafd03dcf322b26613f045ab74..4110a65a6c8394fef43f4ee4c04a7dc6f51e0654 100644 (file)
--- a/ext/standard/tests/array/array_diff_key.phpt
+++ b/ext/standard/tests/array/array_diff_key.phpt
@@ -62,7 +62,7 @@ function comp_func($a, $b) {
 
 }
 ?>
---EXPECTF--
+--EXPECT--
 ------ Test 1 --------
 array(4) {
   [1]=>

diff --git a/ext/standard/tests/array/array_diff_key2.phpt b/ext/standard/tests/array/array_diff_key2.phpt
index 66055cbedb6d7058c4a5fc9aebe0667b0423bd40..60d1da5d12f7c04e2b79af48e9b9110fcc22f02a 100644 (file)
--- a/ext/standard/tests/array/array_diff_key2.phpt
+++ b/ext/standard/tests/array/array_diff_key2.phpt
@@ -14,35 +14,6 @@ var_dump($result);
 
 ?>
 --EXPECT--
-array(4) {
-  [0]=>
-  array(2) {
-    ["b"]=>
-    string(5) "brown"
-    ["c"]=>
-    string(4) "blue"
-  }
-  [1]=>
-  array(2) {
-    ["b"]=>
-    string(5) "brown"
-    ["c"]=>
-    string(4) "blue"
-  }
-  [2]=>
-  array(1) {
-    [2]=>
-    bool(true)
-  }
-  [3]=>
-  array(2) {
-    ["b"]=>
-    string(5) "brown"
-    ["c"]=>
-    string(4) "blue"
-  }
-}
---UEXPECTF--
 array(4) {
   [0]=>
   array(2) {

diff --git a/ext/standard/tests/array/array_diff_key_basic.phpt b/ext/standard/tests/array/array_diff_key_basic.phpt
index 5514e30df423b7958fa749dc9621ac6ed53a9c34..b09ca24b7cb76693bdb16d81ba6f878464612a6d 100644 (file)
--- a/ext/standard/tests/array/array_diff_key_basic.phpt
+++ b/ext/standard/tests/array/array_diff_key_basic.phpt
@@ -11,16 +11,9 @@ $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8);
 var_dump(array_diff_key($array1, $array2));
 ?>
 --EXPECT--
-array(2) {
-  ["red"]=>
-  int(2)
-  ["purple"]=>
-  int(4)
-}
---UEXPECT--
 array(2) {
   [u"red"]=>
   int(2)
   [u"purple"]=>
   int(4)
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_diff_key_variation1.phpt b/ext/standard/tests/array/array_diff_key_variation1.phpt
index 00da7afa91da0951b6bcaee615c1b6f2e32d5288..b322a5fa93bae0dd9cae173bea196832cc56d318 100644 (file)
--- a/ext/standard/tests/array/array_diff_key_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_key_variation1.phpt
@@ -29,7 +29,7 @@ print "Result of comparing strings containing integers and strings containing fl
 print_r(array_diff_key($arr3, $arr4));
 print_r(array_diff_key($arr4, $arr3));
 ?>
---EXPECTF--
+--EXPECT--
 Result of comparing integers and floating point value:
 Array
 (

diff --git a/ext/standard/tests/array/array_diff_uassoc_basic.phpt b/ext/standard/tests/array/array_diff_uassoc_basic.phpt
index e1f8b5b523d5c1c943a59918cdf3f6ddf0875f19..57ebc81174e36cfd489f8810c74a8a3fd16bfb98 100644 (file)
--- a/ext/standard/tests/array/array_diff_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_diff_uassoc_basic.phpt
@@ -18,15 +18,6 @@ $result = array_diff_uassoc($array1, $array2, "key_compare_func");
 var_dump($result);
 ?>
 --EXPECT--
-array(3) {
-  ["b"]=>
-  string(5) "brown"
-  ["c"]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-}
---UEXPECT--
 array(3) {
   [u"b"]=>
   unicode(5) "brown"
@@ -34,4 +25,4 @@ array(3) {
   unicode(4) "blue"
   [0]=>
   unicode(3) "red"
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_diff_ukey_basic.phpt b/ext/standard/tests/array/array_diff_ukey_basic.phpt
index 8eab1961cafe7ea37c3ab8719493f5982a25ec82..6c3967664be89df0ce2ec55115400d60235c5baf 100644 (file)
--- a/ext/standard/tests/array/array_diff_ukey_basic.phpt
+++ b/ext/standard/tests/array/array_diff_ukey_basic.phpt
@@ -16,16 +16,9 @@ $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8);
 var_dump(array_diff_ukey($array1, $array2, 'key_compare_func'));
 ?>
 --EXPECT--
-array(2) {
-  ["red"]=>
-  int(2)
-  ["purple"]=>
-  int(4)
-}
---UEXPECT--
 array(2) {
   [u"red"]=>
   int(2)
   [u"purple"]=>
   int(4)
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_diff_variation1.phpt b/ext/standard/tests/array/array_diff_variation1.phpt
index 3ee34de24456ef773c083546d82abf5e089ab427..99d7716b1ab7088090d466a1e6c7fd1eaf258f52 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation1.phpt
+++ b/ext/standard/tests/array/array_diff_variation1.phpt
@@ -206,110 +206,3 @@ NULL
 Warning: array_diff(): Argument #1 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_diff() : usage variations ***
-
--- Iteration 1 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-Warning: array_diff(): Argument #1 is not an array in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_diff_variation10.phpt b/ext/standard/tests/array/array_diff_variation10.phpt
index b51d10326f3a95e84cd01a2de71521951b98d6f0..6528a0d3c9bdf25387b11df8f2eadc33f734ec3d 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation10.phpt
+++ b/ext/standard/tests/array/array_diff_variation10.phpt
@@ -31,18 +31,7 @@ var_dump(array_diff($array2, $array1));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
-array(1) {
-  [0]=>
-  string(1) "1"
-}
-array(1) {
-  [4]=>
-  string(4) "test"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 array(1) {
   [0]=>

diff --git a/ext/standard/tests/array/array_diff_variation2.phpt b/ext/standard/tests/array/array_diff_variation2.phpt
index 67e579f7537bc74bb1330e09d919b717e8312731..b8e3ced141923bec578f7a0ad68caee27a8613b3 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation2.phpt
+++ b/ext/standard/tests/array/array_diff_variation2.phpt
@@ -205,110 +205,3 @@ NULL
 Warning: array_diff(): Argument #2 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_diff() : usage variations ***
-
--- Iteration 1 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 26 --
-Warning: array_diff(): Argument #2 is not an array in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_diff_variation3.phpt b/ext/standard/tests/array/array_diff_variation3.phpt
index e9b7f66a4c1ce40fef6347dbbb9c27c3d793393f..6fd86281e66e6a60e9f043aaa535a45e3783fc9d 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation3.phpt
+++ b/ext/standard/tests/array/array_diff_variation3.phpt
@@ -103,92 +103,7 @@ foreach($values as $value) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
-
- Iteration: 1 
-array(0) {
-}
-
- Iteration: 2 
-array(3) {
-  [0]=>
-  int(0)
-  [2]=>
-  int(12345)
-  [3]=>
-  int(-2345)
-}
-
- Iteration: 3 
-array(5) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  float(-10.5)
-  [2]=>
-  float(123456789000)
-  [3]=>
-  float(1.23456789E-9)
-  [4]=>
-  float(0.5)
-}
-
- Iteration: 4 
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-
- Iteration: 5 
-array(2) {
-  [1]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-
- Iteration: 6 
-array(2) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
-
- Iteration: 7 
-array(3) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  string(17) "This is a heredoc"
-}
-
- Iteration: 8 
-array(2) {
-  [0]=>
-  string(6) "binary"
-  [1]=>
-  string(6) "binary"
-}
-
- Iteration: 9 
-array(1) {
-  [0]=>
-  NULL
-}
-
- Iteration: 10 
-array(1) {
-  [0]=>
-  NULL
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 
  Iteration: 1 
@@ -272,4 +187,4 @@ array(1) {
   [0]=>
   NULL
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_variation4.phpt b/ext/standard/tests/array/array_diff_variation4.phpt
index 0a4c7dcd26f8dfe17873568b4aa832b91a7d5ff4..01fb1a43ef93bdd6a8a560bb8ebc8a705fcd67a8 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation4.phpt
+++ b/ext/standard/tests/array/array_diff_variation4.phpt
@@ -103,86 +103,7 @@ foreach($values as $value) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
-
- Iteration: 1 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 2 
-array(1) {
-  [1]=>
-  int(2)
-}
-
- Iteration: 3 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 4 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 5 
-array(1) {
-  [1]=>
-  int(2)
-}
-
- Iteration: 6 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 7 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 8 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 9 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
- Iteration: 10 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 
  Iteration: 1 

diff --git a/ext/standard/tests/array/array_diff_variation5.phpt b/ext/standard/tests/array/array_diff_variation5.phpt
index b74c04b7a3e13a37dfbcf6c005aad5a192eaa31d..a733468f087fd27ca80c477ee89184b6978a8a71 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation5.phpt
+++ b/ext/standard/tests/array/array_diff_variation5.phpt
@@ -48,76 +48,7 @@ var_dump(array_diff($arr_float_str, $arr_int_str));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
--- Compare integers and floats: --
-array(0) {
-}
-array(0) {
-}
--- Compare integers and strings containing an integers: --
-array(0) {
-}
-array(0) {
-}
--- Compare integers and strings containing floats: --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(3) {
-  [0]=>
-  string(4) "1.00"
-  [1]=>
-  string(4) "2.00"
-  [2]=>
-  string(4) "3.00"
-}
--- Compare floats and strings containing integers: --
-array(0) {
-}
-array(0) {
-}
--- Compare floats and strings containing floats: --
-array(3) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(2)
-  [2]=>
-  float(3)
-}
-array(3) {
-  [0]=>
-  string(4) "1.00"
-  [1]=>
-  string(4) "2.00"
-  [2]=>
-  string(4) "3.00"
-}
--- Compare strings containing integers and strings containing floats: --
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(1) "2"
-  [2]=>
-  string(1) "3"
-}
-array(3) {
-  [0]=>
-  string(4) "1.00"
-  [1]=>
-  string(4) "2.00"
-  [2]=>
-  string(4) "3.00"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 -- Compare integers and floats: --
 array(0) {
@@ -185,4 +116,4 @@ array(3) {
   [2]=>
   unicode(4) "3.00"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_variation6.phpt b/ext/standard/tests/array/array_diff_variation6.phpt
index 05174cc035ef7ea2c8844b495c1fdb024a54c5b8..9fdb6269b4e61ad26efc7270965611ffbb9c1fc0 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation6.phpt
+++ b/ext/standard/tests/array/array_diff_variation6.phpt
@@ -29,22 +29,7 @@ var_dump(array_diff($array_assoc, $array_index));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_diff() : usage variations ***
-array(1) {
-  [0]=>
-  string(1) "d"
-}
-array(3) {
-  [0]=>
-  string(1) "a"
-  ["b"]=>
-  string(1) "3"
-  ["c"]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 array(1) {
   [0]=>
@@ -58,4 +43,4 @@ array(3) {
   [u"c"]=>
   int(2)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_variation7.phpt b/ext/standard/tests/array/array_diff_variation7.phpt
index 4bd218487f7c1cc1bf90af7fcb6789b2cb58960c..a0e0cb9cc0e4a8f5abc2052b55c7eefe355c8f95 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation7.phpt
+++ b/ext/standard/tests/array/array_diff_variation7.phpt
@@ -45,55 +45,7 @@ var_dump(array_diff($arr2, $arr1));
 echo "Done";
 ?>
 
---EXPECTF--
-
-*** Testing array_diff() : usage variations ***
--- Basic Comparison --
-array(3) {
-  [0]=>
-  string(2) "&a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
--- $a changed --
-array(3) {
-  [0]=>
-  string(2) "&a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
--- Arrays referenced to each other --
-array(0) {
-}
-array(0) {
-}
--- $arr1 changed --
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_diff() : usage variations ***
 -- Basic Comparison --
 array(3) {
@@ -139,4 +91,4 @@ array(0) {
 }
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_variation8.phpt b/ext/standard/tests/array/array_diff_variation8.phpt
index bc7c26ad9f4ef7c85dae4fd40454745d52ac970f..88ff47d669339b436be3a227ba7dcd5eab443df6 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation8.phpt
+++ b/ext/standard/tests/array/array_diff_variation8.phpt
@@ -71,143 +71,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_diff() : usage variations ***
 -- Iteration 1 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-}
--- Iteration 2 --
-array(1) {
-  ["c"]=>
-  string(1) "3"
-}
-array(0) {
-}
--- Iteration 3 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(2) {
-  ["float1"]=>
-  float(2.3333)
-  ["float2"]=>
-  float(2.3333)
-}
--- Iteration 4 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(4) {
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [3]=>
-  float(4.8999992284)
-  ["f4"]=>
-  float(1.2)
-}
--- Iteration 5 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(4) {
-  [111]=>
-  string(6) "  Hello"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(7) "\v\fworld"
-  [3]=>
-  string(6) "  Hello"
-}
--- Iteration 6 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(4) {
-  [111]=>
-  string(7) "\tHello"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(9) "\v\fworld"
-  [3]=>
-  string(7) "\tHello"
-}
--- Iteration 7 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(3) {
-  [1]=>
-  string(5) "hello"
-  ["heredoc"]=>
-  string(11) "Hello world"
-  [2]=>
-  string(11) "Hello world"
-}
--- Iteration 8 --
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["b"]=>
-  string(1) "2"
-  ["c"]=>
-  string(1) "3"
-}
-array(5) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["unset"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [12]=>
-  object(classA)#%d (0) {
-  }
-  [13]=>
-  resource(%d) of type (stream)
-}
-Done
---UEXPECTF--
-*** Testing array_diff() : usage variations ***
--- Iteration 1 --
 array(3) {
   [u"a"]=>
   unicode(1) "1"
@@ -341,4 +204,4 @@ array(5) {
   [13]=>
   resource(5) of type (stream)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_diff_variation9.phpt b/ext/standard/tests/array/array_diff_variation9.phpt
index 32a968e1b8ae4663756dd1f421bf1a09eb7f0cb0..9f0164a8253a1908f232887159ee1d0377a519e1 100644 (file)
--- a/ext/standard/tests/array/array_diff_variation9.phpt
+++ b/ext/standard/tests/array/array_diff_variation9.phpt
@@ -76,124 +76,6 @@ Notice: Array to string conversion in %s on line %d
 array(0) {
 }
 
--- Compare subarrays from two 2-D arrays --
-array(1) {
-  [1]=>
-  int(2)
-}
-array(1) {
-  [2]=>
-  int(5)
-}
-array(2) {
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "z"
-  [2]=>
-  string(1) "y"
-}
-
--- Compare a subarray from one 2-D array and one 2-D array --
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(2) {
-  ["sub_array1"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["sub_array2"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-*** Testing array_diff() : usage variations ***
--- Compare two 2-D arrays --
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(0) {
-}
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(0) {
-}
-
 -- Compare subarrays from two 2-D arrays --
 array(1) {
   [1]=>
@@ -271,4 +153,4 @@ array(2) {
     unicode(1) "c"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_fill.phpt b/ext/standard/tests/array/array_fill.phpt
index 790fd6d120d98b5a1d17abdc9d330ebda3f962e8..30654e80ac59b4d1b2972fb8ed40462ed78bc5cc 100644 (file)
--- a/ext/standard/tests/array/array_fill.phpt
+++ b/ext/standard/tests/array/array_fill.phpt
@@ -49,350 +49,6 @@ bool(false)
 ===========================
 start: 0 num: 0 value: f
 
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 1 value: 1
-array(1) {
-  [0]=>
-  bool(true)
-}
-===========================
-start: 0 num: 1 value: 
-array(1) {
-  [0]=>
-  bool(false)
-}
-===========================
-start: 0 num: 1 value: 
-array(1) {
-  [0]=>
-  NULL
-}
-===========================
-start: 0 num: 1 value: d
-array(1) {
-  [0]=>
-  string(1) "d"
-}
-===========================
-start: 0 num: 1 value: e
-array(1) {
-  [0]=>
-  string(1) "e"
-}
-===========================
-start: 0 num: 1 value: f
-array(1) {
-  [0]=>
-  string(1) "f"
-}
-===========================
-start: 0 num: 2.5 value: 1
-array(2) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-}
-===========================
-start: 0 num: 2.5 value: 
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-}
-===========================
-start: 0 num: 2.5 value: 
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-===========================
-start: 0 num: 2.5 value: d
-array(2) {
-  [0]=>
-  string(1) "d"
-  [1]=>
-  string(1) "d"
-}
-===========================
-start: 0 num: 2.5 value: e
-array(2) {
-  [0]=>
-  string(1) "e"
-  [1]=>
-  string(1) "e"
-}
-===========================
-start: 0 num: 2.5 value: f
-array(2) {
-  [0]=>
-  string(1) "f"
-  [1]=>
-  string(1) "f"
-}
-===========================
-start: 1 num: 0 value: 1
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 0 value: d
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 0 value: e
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 0 value: f
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 1 num: 1 value: 1
-array(1) {
-  [1]=>
-  bool(true)
-}
-===========================
-start: 1 num: 1 value: 
-array(1) {
-  [1]=>
-  bool(false)
-}
-===========================
-start: 1 num: 1 value: 
-array(1) {
-  [1]=>
-  NULL
-}
-===========================
-start: 1 num: 1 value: d
-array(1) {
-  [1]=>
-  string(1) "d"
-}
-===========================
-start: 1 num: 1 value: e
-array(1) {
-  [1]=>
-  string(1) "e"
-}
-===========================
-start: 1 num: 1 value: f
-array(1) {
-  [1]=>
-  string(1) "f"
-}
-===========================
-start: 1 num: 2.5 value: 1
-array(2) {
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(true)
-}
-===========================
-start: 1 num: 2.5 value: 
-array(2) {
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(false)
-}
-===========================
-start: 1 num: 2.5 value: 
-array(2) {
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
-===========================
-start: 1 num: 2.5 value: d
-array(2) {
-  [1]=>
-  string(1) "d"
-  [2]=>
-  string(1) "d"
-}
-===========================
-start: 1 num: 2.5 value: e
-array(2) {
-  [1]=>
-  string(1) "e"
-  [2]=>
-  string(1) "e"
-}
-===========================
-start: 1 num: 2.5 value: f
-array(2) {
-  [1]=>
-  string(1) "f"
-  [2]=>
-  string(1) "f"
-}
-===========================
-start: 2.5 num: 0 value: 1
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 0 value: d
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 0 value: e
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 0 value: f
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 2.5 num: 1 value: 1
-array(1) {
-  [2]=>
-  bool(true)
-}
-===========================
-start: 2.5 num: 1 value: 
-array(1) {
-  [2]=>
-  bool(false)
-}
-===========================
-start: 2.5 num: 1 value: 
-array(1) {
-  [2]=>
-  NULL
-}
-===========================
-start: 2.5 num: 1 value: d
-array(1) {
-  [2]=>
-  string(1) "d"
-}
-===========================
-start: 2.5 num: 1 value: e
-array(1) {
-  [2]=>
-  string(1) "e"
-}
-===========================
-start: 2.5 num: 1 value: f
-array(1) {
-  [2]=>
-  string(1) "f"
-}
-===========================
-start: 2.5 num: 2.5 value: 1
-array(2) {
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-===========================
-start: 2.5 num: 2.5 value: 
-array(2) {
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-===========================
-start: 2.5 num: 2.5 value: 
-array(2) {
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-===========================
-start: 2.5 num: 2.5 value: d
-array(2) {
-  [2]=>
-  string(1) "d"
-  [3]=>
-  string(1) "d"
-}
-===========================
-start: 2.5 num: 2.5 value: e
-array(2) {
-  [2]=>
-  string(1) "e"
-  [3]=>
-  string(1) "e"
-}
-===========================
-start: 2.5 num: 2.5 value: f
-array(2) {
-  [2]=>
-  string(1) "f"
-  [3]=>
-  string(1) "f"
-}
-== Done =================Done====================
---UEXPECTF--
-===========================
-start: 0 num: 0 value: 1
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 0 value: 
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 0 value: d
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 0 value: e
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-===========================
-start: 0 num: 0 value: f
-
 Warning: array_fill(): Number of elements must be positive in %s on line %d
 bool(false)
 ===========================

diff --git a/ext/standard/tests/array/array_fill_basic.phpt b/ext/standard/tests/array/array_fill_basic.phpt
index 1a60bdac9cac40cfe2eeafc40f2eda4cefb56f5a..40529420f0d8accb16f29e165fa45721446d4fb3 100644 (file)
--- a/ext/standard/tests/array/array_fill_basic.phpt
+++ b/ext/standard/tests/array/array_fill_basic.phpt
@@ -42,59 +42,7 @@ for($i = 0; $i < count($values); $i ++)
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_fill() : basic functionality ***
--- Iteration 1 --
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  float(1.5)
-  [1]=>
-  float(1.5)
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  string(2) "hi"
-  [1]=>
-  string(2) "hi"
-}
--- Iteration 6 --
-array(2) {
-  [0]=>
-  string(2) "hi"
-  [1]=>
-  string(2) "hi"
-}
--- Iteration 7 --
-array(2) {
-  [0]=>
-  string(5) "Hello"
-  [1]=>
-  string(5) "Hello"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_fill() : basic functionality ***
 -- Iteration 1 --
 array(2) {
@@ -145,4 +93,4 @@ array(2) {
   [1]=>
   unicode(5) "Hello"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_fill_error.phpt b/ext/standard/tests/array/array_fill_error.phpt
index b20a9851caf3a8f458c6b85a339440a92e4b1207..167163228d57405e80763c42294bce60b0e42a81 100644 (file)
--- a/ext/standard/tests/array/array_fill_error.phpt
+++ b/ext/standard/tests/array/array_fill_error.phpt
@@ -59,24 +59,3 @@ bool(false)
 Warning: array_fill(): Number of elements must be positive in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_fill() : error conditions ***
--- Testing array_fill() function with Zero arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
--- Testing array_fill() function with more than expected no. of arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
--- Testing array_fill() function with less than expected no. of arguments --
-
-Warning: array_fill() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-Done

diff --git a/ext/standard/tests/array/array_fill_keys.phpt b/ext/standard/tests/array/array_fill_keys.phpt
index cf1fbb5cb5adb7cbea2ee58a72ca51f18e237d44..202c2702ba47a8b692409065231babc55609e594 100755 (executable)
--- a/ext/standard/tests/array/array_fill_keys.phpt
+++ b/ext/standard/tests/array/array_fill_keys.phpt
@@ -12,38 +12,6 @@ precision=14
 ?>
 --EXPECTF--
 
-Warning: array_fill_keys() expects parameter 1 to be array, string given in %s on line %d
-NULL
-array(0) {
-}
-array(2) {
-  ["foo"]=>
-  NULL
-  ["bar"]=>
-  NULL
-}
-array(4) {
-  [5]=>
-  int(123)
-  ["foo"]=>
-  int(123)
-  [10]=>
-  int(123)
-  ["1.23"]=>
-  int(123)
-}
-array(4) {
-  ["test"]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [10]=>
-  string(0) ""
-  [100]=>
-  string(0) ""
-}
---UEXPECTF--
-
 Warning: array_fill_keys() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 array(0) {

diff --git a/ext/standard/tests/array/array_fill_object.phpt b/ext/standard/tests/array/array_fill_object.phpt
index 9e3393664dba66547bd425062ac2481f18034bbd..c349a0afeb1f4e9780b5fbe0fdc7ed5a3c2ce7aa 100644 (file)
--- a/ext/standard/tests/array/array_fill_object.phpt
+++ b/ext/standard/tests/array/array_fill_object.phpt
@@ -216,233 +216,6 @@ array(2) {
   }
 }
 -- Iteration 2 --
-array(2) {
-  [0]=>
-  object(Test1)#%d (3) {
-    ["member1"]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Test1)#%d (3) {
-    ["member1"]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  object(Child_test1)#%d (4) {
-    ["member2"]=>
-    int(102)
-    ["member1"]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Child_test1)#%d (4) {
-    ["member2"]=>
-    int(102)
-    ["member1"]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  object(Test2)#%d (3) {
-    ["member1":"Test2":private]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Test2)#%d (3) {
-    ["member1":"Test2":private]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  object(Child_test2)#%d (4) {
-    ["member1":"Child_test2":private]=>
-    int(102)
-    ["member1":"Test2":private]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Child_test2)#%d (4) {
-    ["member1":"Child_test2":private]=>
-    int(102)
-    ["member1":"Test2":private]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 6 --
-array(2) {
-  [0]=>
-  object(Test3)#%d (3) {
-    ["member1":protected]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Test3)#%d (3) {
-    ["member1":protected]=>
-    int(100)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 7 --
-array(2) {
-  [0]=>
-  object(Child_test3)#%d (3) {
-    ["member1":protected]=>
-    int(102)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-  [1]=>
-  object(Child_test3)#%d (3) {
-    ["member1":protected]=>
-    int(102)
-    ["var1"]=>
-    int(30)
-    ["var2"]=>
-    int(101)
-  }
-}
--- Iteration 8 --
-array(2) {
-  [0]=>
-  object(Test4)#%d (3) {
-    ["member1"]=>
-    int(100)
-    ["member2":"Test4":private]=>
-    int(101)
-    ["member3":protected]=>
-    int(102)
-  }
-  [1]=>
-  object(Test4)#%d (3) {
-    ["member1"]=>
-    int(100)
-    ["member2":"Test4":private]=>
-    int(101)
-    ["member3":protected]=>
-    int(102)
-  }
-}
--- Iteration 9 --
-array(2) {
-  [0]=>
-  object(Child_test4)#%d (4) {
-    ["var1"]=>
-    int(103)
-    ["member1"]=>
-    int(100)
-    ["member2":"Test4":private]=>
-    int(101)
-    ["member3":protected]=>
-    int(102)
-  }
-  [1]=>
-  object(Child_test4)#%d (4) {
-    ["var1"]=>
-    int(103)
-    ["member1"]=>
-    int(100)
-    ["member2":"Test4":private]=>
-    int(101)
-    ["member3":protected]=>
-    int(102)
-  }
-}
--- Iteration 10 --
-array(2) {
-  [0]=>
-  object(ConcreteClass1)#%d (4) {
-    ["member1"]=>
-    NULL
-    ["member2":"AbstractClass":private]=>
-    NULL
-    ["member3":protected]=>
-    NULL
-    ["var1"]=>
-    int(30)
-  }
-  [1]=>
-  object(ConcreteClass1)#%d (4) {
-    ["member1"]=>
-    NULL
-    ["member2":"AbstractClass":private]=>
-    NULL
-    ["member3":protected]=>
-    NULL
-    ["var1"]=>
-    int(30)
-  }
-}
--- Iteration 11 --
-array(2) {
-  [0]=>
-  object(Template1)#%d (0) {
-  }
-  [1]=>
-  object(Template1)#%d (0) {
-  }
-}
-Done
---UEXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different object values for 'val' argument ---
--- Iteration 1 --
-array(2) {
-  [0]=>
-  object(Test)#%d (0) {
-  }
-  [1]=>
-  object(Test)#%d (0) {
-  }
-}
--- Iteration 2 --
 array(2) {
   [0]=>
   object(Test1)#%d (3) {
@@ -656,4 +429,4 @@ array(2) {
   object(Template1)#%d (0) {
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_fill_variation1.phpt b/ext/standard/tests/array/array_fill_variation1.phpt
index 620a8850caa224051d9ef51285df58f0c5aab938..acce9984551f37b0b3a5a7dacdf1d8c09d0e35d6 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation1.phpt
+++ b/ext/standard/tests/array/array_fill_variation1.phpt
@@ -208,145 +208,6 @@ array(2) {
 }
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 1 to be long, string given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_fill() expects parameter 1 to be long, object given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 22 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 23 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 24 --
-
-Warning: array_fill() expects parameter 1 to be long, resource given in %sarray_fill_variation1.php on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different values for 'start_key' arg ---
--- Iteration 1 --
-array(2) {
-  [10]=>
-  int(100)
-  [11]=>
-  int(100)
-}
--- Iteration 2 --
-array(2) {
-  [-10]=>
-  int(100)
-  [0]=>
-  int(100)
-}
--- Iteration 3 --
-array(2) {
-  [2147483647]=>
-  int(100)
-  [-2147483648]=>
-  int(100)
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 6 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %sarray_fill_variation1.php on line %d
-NULL
--- Iteration 11 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 12 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 13 --
-array(2) {
-  [1]=>
-  int(100)
-  [2]=>
-  int(100)
-}
--- Iteration 14 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 15 --
-array(2) {
-  [1]=>
-  int(100)
-  [2]=>
-  int(100)
-}
--- Iteration 16 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 17 --
-
 Warning: array_fill() expects parameter 1 to be long, Unicode string given in %sarray_fill_variation1.php on line %d
 NULL
 -- Iteration 18 --

diff --git a/ext/standard/tests/array/array_fill_variation1_64bit.phpt b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
index 0f1cff56a48b59f0783474d7e4a54822dace07c0..ce95c0d1b38299afa3d6615aae216d7bea54a627 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation1_64bit.phpt
+++ b/ext/standard/tests/array/array_fill_variation1_64bit.phpt
@@ -208,145 +208,6 @@ array(2) {
 }
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 1 to be long, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_fill() expects parameter 1 to be long, string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_fill() expects parameter 1 to be long, object given in %s on line %d
-NULL
--- Iteration 22 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 23 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 24 --
-
-Warning: array_fill() expects parameter 1 to be long, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different values for 'start_key' arg ---
--- Iteration 1 --
-array(2) {
-  [10]=>
-  int(100)
-  [11]=>
-  int(100)
-}
--- Iteration 2 --
-array(2) {
-  [-10]=>
-  int(100)
-  [0]=>
-  int(100)
-}
--- Iteration 3 --
-array(2) {
-  [123456789000]=>
-  int(100)
-  [123456789001]=>
-  int(100)
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 6 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_fill() expects parameter 1 to be long, array given in %s on line %d
-NULL
--- Iteration 11 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 12 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 13 --
-array(2) {
-  [1]=>
-  int(100)
-  [2]=>
-  int(100)
-}
--- Iteration 14 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 15 --
-array(2) {
-  [1]=>
-  int(100)
-  [2]=>
-  int(100)
-}
--- Iteration 16 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 17 --
-
 Warning: array_fill() expects parameter 1 to be long, Unicode string given in %s on line %d
 NULL
 -- Iteration 18 --

diff --git a/ext/standard/tests/array/array_fill_variation2.phpt b/ext/standard/tests/array/array_fill_variation2.phpt
index 641f74e59ae1c148a8d5c71271536def888b958b..f15c77aff4fc7ab6ef8f34d84fabbc906ebe1da8 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation2.phpt
+++ b/ext/standard/tests/array/array_fill_variation2.phpt
@@ -177,116 +177,6 @@ Warning: array_fill(): Number of elements must be positive in %s on line %d
 bool(false)
 -- Iteration 17 --
 
-Warning: array_fill() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_fill() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_fill() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_fill() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_fill() expects parameter 2 to be long, object given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different values for 'num' arg ---
--- Iteration 1 --
-array(2) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-}
--- Iteration 2 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 3 --
-array(5) {
-  [0]=>
-  int(100)
-  [1]=>
-  int(100)
-  [2]=>
-  int(100)
-  [3]=>
-  int(100)
-  [4]=>
-  int(100)
-}
--- Iteration 4 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: array_fill() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_fill() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_fill() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_fill() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_fill() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 13 --
-array(1) {
-  [0]=>
-  int(100)
-}
--- Iteration 14 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 15 --
-array(1) {
-  [0]=>
-  int(100)
-}
--- Iteration 16 --
-
-Warning: array_fill(): Number of elements must be positive in %s on line %d
-bool(false)
--- Iteration 17 --
-
 Warning: array_fill() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 -- Iteration 18 --

diff --git a/ext/standard/tests/array/array_fill_variation3.phpt b/ext/standard/tests/array/array_fill_variation3.phpt
index 033dc6ff2aa4600eb706fb762c364bca539a24ac..30944eb27b08505dbe1988306184284abe509ec3 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation3.phpt
+++ b/ext/standard/tests/array/array_fill_variation3.phpt
@@ -67,51 +67,6 @@ echo"Done";
 *** Testing array_fill() : usage variations ***
 --- Testing array_fill() with different values for 'val' argument ---
 -- Iteration 1 --
-array(2) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  object(test)#%d (1) {
-    ["t"]=>
-    int(10)
-  }
-  [1]=>
-  object(test)#%d (1) {
-    ["t"]=>
-    int(10)
-  }
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-Done
---UEXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different values for 'val' argument ---
--- Iteration 1 --
 array(2) {
   [0]=>
   unicode(0) ""
@@ -152,4 +107,4 @@ array(2) {
   [1]=>
   NULL
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_fill_variation4.phpt b/ext/standard/tests/array/array_fill_variation4.phpt
index fd6c1d791e77f4871d95530925aa3ac49974d496..bb6488e952d7c27c254a6c80ca4ac71f992def7f 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation4.phpt
+++ b/ext/standard/tests/array/array_fill_variation4.phpt
@@ -43,130 +43,7 @@ for($i =0; $i < count($values); $i ++)
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_fill() : variation ***
-*** Filling 2 dimensional array with all basic valid values ***
--- Iteration 1 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-  }
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(0)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(0)
-    [1]=>
-    int(0)
-  }
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(1)
-  }
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    float(1)
-    [1]=>
-    float(1)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    float(1)
-    [1]=>
-    float(1)
-  }
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "hi"
-    [1]=>
-    string(2) "hi"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(2) "hi"
-    [1]=>
-    string(2) "hi"
-  }
-}
--- Iteration 6 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(2) "hi"
-    [1]=>
-    string(2) "hi"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(2) "hi"
-    [1]=>
-    string(2) "hi"
-  }
-}
--- Iteration 7 --
-array(2) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(5) "Hello"
-    [1]=>
-    string(5) "Hello"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(5) "Hello"
-    [1]=>
-    string(5) "Hello"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_fill() : variation ***
 *** Filling 2 dimensional array with all basic valid values ***
 -- Iteration 1 --
@@ -288,4 +165,4 @@ array(2) {
     unicode(5) "Hello"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_fill_variation5.phpt b/ext/standard/tests/array/array_fill_variation5.phpt
index 899e4fd29d56daebd10e2caaa64b9f77b294151c..120fb9d918471a3cada9893b0f22ef20c78f4cfb 100644 (file)
--- a/ext/standard/tests/array/array_fill_variation5.phpt
+++ b/ext/standard/tests/array/array_fill_variation5.phpt
@@ -52,244 +52,7 @@ for($i = 0; $i < count($values); $i++)
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_fill() : usage variations ***
---- Testing array_fill() with different types of array values for 'val' argument ---
--- Iteration 1 --
-array(2) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(0) {
-  }
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    string(2) "Hi"
-    [2]=>
-    string(5) "Hello"
-  }
-  [1]=>
-  array(2) {
-    [1]=>
-    string(2) "Hi"
-    [2]=>
-    string(5) "Hello"
-  }
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(7) "Saffron"
-    [1]=>
-    string(5) "White"
-    [2]=>
-    string(5) "Green"
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(7) "Saffron"
-    [1]=>
-    string(5) "White"
-    [2]=>
-    string(5) "Green"
-  }
-}
--- Iteration 5 --
-array(2) {
-  [0]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [1]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-}
--- Iteration 6 --
-array(2) {
-  [0]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    [2]=>
-    string(6) "green "
-  }
-  [1]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    [2]=>
-    string(6) "green "
-  }
-}
--- Iteration 7 --
-array(2) {
-  [0]=>
-  array(2) {
-    ["colour"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [1]=>
-  array(2) {
-    ["colour"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-}
--- Iteration 8 --
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    string(3) "red"
-    [0]=>
-    string(5) "green"
-  }
-  [1]=>
-  array(2) {
-    [1]=>
-    string(3) "red"
-    [0]=>
-    string(5) "green"
-  }
-}
--- Iteration 9 --
-array(2) {
-  [0]=>
-  array(2) {
-    [1]=>
-    string(3) "red"
-    [0]=>
-    string(5) "green"
-  }
-  [1]=>
-  array(2) {
-    [1]=>
-    string(3) "red"
-    [0]=>
-    string(5) "green"
-  }
-}
--- Iteration 10 --
-array(2) {
-  [0]=>
-  array(3) {
-    [1]=>
-    string(2) "Hi"
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [1]=>
-  array(3) {
-    [1]=>
-    string(2) "Hi"
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-}
--- Iteration 11 --
-array(2) {
-  [0]=>
-  array(2) {
-    [""]=>
-    string(2) "Hi"
-    [1]=>
-    string(5) "Green"
-  }
-  [1]=>
-  array(2) {
-    [""]=>
-    string(2) "Hi"
-    [1]=>
-    string(5) "Green"
-  }
-}
--- Iteration 12 --
-array(2) {
-  [0]=>
-  array(2) {
-    [""]=>
-    int(1)
-    ["color"]=>
-    string(5) "green"
-  }
-  [1]=>
-  array(2) {
-    [""]=>
-    int(1)
-    ["color"]=>
-    string(5) "green"
-  }
-}
--- Iteration 13 --
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(7) "Saffron"
-    [1]=>
-    string(5) "White"
-    [2]=>
-    string(5) "Green"
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(7) "Saffron"
-    [1]=>
-    string(5) "White"
-    [2]=>
-    string(5) "Green"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_fill() : usage variations ***
 --- Testing array_fill() with different types of array values for 'val' argument ---
 -- Iteration 1 --
@@ -525,4 +288,4 @@ array(2) {
     unicode(5) "Green"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_filter.phpt b/ext/standard/tests/array/array_filter.phpt
index 21be6e9c417c8e4490a2c792d56f8aa9fc084f8a..de76991ceb0c73f832dd4a59b50b6307d13f4fee 100644 (file)
--- a/ext/standard/tests/array/array_filter.phpt
+++ b/ext/standard/tests/array/array_filter.phpt
@@ -34,65 +34,6 @@ echo '== DONE ==';
 ?> 
 --EXPECTF--
 Odd :
-array(3) {
-  ["a"]=>
-  int(1)
-  ["c"]=>
-  int(3)
-  ["e"]=>
-  int(5)
-}
-array(3) {
-  [1]=>
-  int(7)
-  [3]=>
-  int(9)
-  [5]=>
-  int(11)
-}
-array(1) {
-  [0]=>
-  bool(true)
-}
-Even:
-array(2) {
-  ["b"]=>
-  int(2)
-  ["d"]=>
-  int(4)
-}
-array(5) {
-  [0]=>
-  int(6)
-  [2]=>
-  int(8)
-  [4]=>
-  int(10)
-  [6]=>
-  int(12)
-  [7]=>
-  int(0)
-}
-array(2) {
-  [1]=>
-  bool(false)
-  [2]=>
-  NULL
-}
-array(0) {
-}
-
-Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-== DONE ==
---UEXPECTF--
-Odd :
 array(3) {
   [u"a"]=>
   int(1)
@@ -144,7 +85,7 @@ array(0) {
 Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
 NULL
 
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
+Warning: array_filter() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 
 Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d

diff --git a/ext/standard/tests/array/array_filter_basic.phpt b/ext/standard/tests/array/array_filter_basic.phpt
index 9ffb3691f874b23fa67a56882a38e3e45c93b612..28c10ff2e677326b29bd7913a41dff7db8ca4b2e 100644 (file)
--- a/ext/standard/tests/array/array_filter_basic.phpt
+++ b/ext/standard/tests/array/array_filter_basic.phpt
@@ -34,26 +34,7 @@ var_dump( array_filter($input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : basic functionality ***
-array(2) {
-  [1]=>
-  int(2)
-  [3]=>
-  int(0)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [4]=>
-  int(-1)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : basic functionality ***
 array(2) {
   [1]=>

diff --git a/ext/standard/tests/array/array_filter_error.phpt b/ext/standard/tests/array/array_filter_error.phpt
index d898056750c6117092ff20de23ccd4151ab32e18..20e89aa4b776e6518e1b72c66f5c970df284f52c 100644 (file)
--- a/ext/standard/tests/array/array_filter_error.phpt
+++ b/ext/standard/tests/array/array_filter_error.phpt
@@ -48,15 +48,3 @@ NULL
 Warning: array_filter() expects parameter 2 to be a valid callback, function 'even' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_filter() : error conditions ***
--- Testing array_filter() function with Zero arguments --
-Warning: array_filter() expects at least 1 parameter, 0 given in %s on line %d
-NULL
--- Testing array_filter() function with more than expected no. of arguments --
-Warning: array_filter() expects at most 2 parameters, 3 given in %s on line %d
-NULL
--- Testing array_filter() function with incorrect callback --
-Warning: array_filter() expects parameter 2 to be a valid callback, function 'even' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_filter_object.phpt b/ext/standard/tests/array/array_filter_object.phpt
index 7d7759d26ba6ef918821d96b6accc0bd1ad22cc1..96612cb639b958775d0cf6bffff883f22f51dd8c 100644 (file)
--- a/ext/standard/tests/array/array_filter_object.phpt
+++ b/ext/standard/tests/array/array_filter_object.phpt
@@ -100,61 +100,6 @@ echo "Done"
 ?>
 --EXPECTF--
 *** Testing array_filter() : object functionality ***
-array(5) {
-  [0]=>
-  object(SimpleClass)#%d (1) {
-    ["var1"]=>
-    int(10)
-  }
-  [1]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [2]=>
-  object(ChildClass)#%d (2) {
-    ["var3":"ChildClass":private]=>
-    NULL
-    ["var2":protected]=>
-    int(5)
-  }
-  [3]=>
-  object(FinalClass)#%d (1) {
-    ["var4":"FinalClass":private]=>
-    NULL
-  }
-  [4]=>
-  object(StaticClass)#%d (0) {
-  }
-}
-array(5) {
-  [0]=>
-  object(SimpleClass)#%d (1) {
-    ["var1"]=>
-    int(10)
-  }
-  [1]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [2]=>
-  object(ChildClass)#%d (2) {
-    ["var3":"ChildClass":private]=>
-    NULL
-    ["var2":protected]=>
-    int(5)
-  }
-  [3]=>
-  object(FinalClass)#%d (1) {
-    ["var4":"FinalClass":private]=>
-    NULL
-  }
-  [4]=>
-  object(StaticClass)#%d (0) {
-  }
-}
-array(0) {
-}
-Done
---UEXPECTF--
-*** Testing array_filter() : object functionality ***
 array(5) {
   [0]=>
   object(SimpleClass)#%d (1) {

diff --git a/ext/standard/tests/array/array_filter_variation1.phpt b/ext/standard/tests/array/array_filter_variation1.phpt
index e1cb88d9cb89b47f81b5bc2a25f14abf7b57213a..abc9b676d1593d1c0a50a4a78d602505bbe38b1c 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation1.phpt
+++ b/ext/standard/tests/array/array_filter_variation1.phpt
@@ -162,101 +162,6 @@ Warning: array_filter() expects parameter 1 to be array, boolean given in %s on
 NULL
 -- Iteration 16 --
 
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_filter() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_filter() expects parameter 1 to be array, object given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_filter() expects parameter 1 to be array, resource given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_filter() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_filter() expects parameter 1 to be array, null given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_filter() : usage variations - unexpected values for 'input'***
--- Iteration 1 --
-
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_filter() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_filter() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_filter() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_filter() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_filter() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_filter() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_filter() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_filter() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_filter() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: array_filter() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/array_filter_variation2.phpt b/ext/standard/tests/array/array_filter_variation2.phpt
index bf92132dd4fd1aa8ecdd359ed33584d23de4bbbb..1aa262ba62b48a824e2040f00a3b7cdc39b18a3f 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation2.phpt
+++ b/ext/standard/tests/array/array_filter_variation2.phpt
@@ -182,90 +182,3 @@ NULL
 Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_filter() : usage variations - unexpected values for 'callback' function***
--- Iteration 1 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 2 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 3 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 4 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 5 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 6 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 7 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 8 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 9 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 10 --
-Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 11 --
-Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 12 --
-Warning: array_filter() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 13 --
-Warning: array_filter() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 14 --
-Warning: array_filter() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 15 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 16 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 17 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 18 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 19 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 20 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 21 --
-Warning: array_filter() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 22 --
-Warning: array_filter() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 23 --
-Warning: array_filter() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
-NULL
--- Iteration 24 --
-Warning: array_filter() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
-NULL
--- Iteration 25 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 26 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 27 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 28 --
-Warning: array_filter() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_filter_variation3.phpt b/ext/standard/tests/array/array_filter_variation3.phpt
index 9966ad85b6acca691286f364ada66b65c2bc0fbe..6b10f6ae70757a7798a99b4f5232087b23efd5b3 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation3.phpt
+++ b/ext/standard/tests/array/array_filter_variation3.phpt
@@ -49,172 +49,7 @@ for($count = 0; $count < count($input_values); $count++)
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variations - different types of array for 'input' argument***
--- Iteration 1 --
-array(5) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(-1)
-  [4]=>
-  int(28)
-  [5]=>
-  int(74)
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(-1)
-  [4]=>
-  int(28)
-  [5]=>
-  int(74)
-}
-array(0) {
-}
--- Iteration 2 --
-array(3) {
-  [1]=>
-  float(1.2)
-  [2]=>
-  float(1200)
-  [3]=>
-  float(0.0012)
-}
-array(4) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(1.2)
-  [2]=>
-  float(1200)
-  [3]=>
-  float(0.0012)
-}
-array(0) {
-}
--- Iteration 3 --
-array(3) {
-  [0]=>
-  string(6) "value1"
-  [1]=>
-  string(6) "value2"
-  [3]=>
-  string(1) " "
-}
-array(5) {
-  [0]=>
-  string(6) "value1"
-  [1]=>
-  string(6) "value2"
-  [2]=>
-  string(0) ""
-  [3]=>
-  string(1) " "
-  [4]=>
-  string(0) ""
-}
-array(0) {
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  bool(true)
-  [2]=>
-  bool(true)
-}
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(false)
-}
-array(0) {
-}
--- Iteration 5 --
-array(0) {
-}
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-array(0) {
-}
--- Iteration 6 --
-array(2) {
-  [1]=>
-  string(3) "one"
-  [-2]=>
-  string(5) "value"
-}
-array(3) {
-  [1]=>
-  string(3) "one"
-  ["zero"]=>
-  int(0)
-  [-2]=>
-  string(5) "value"
-}
-array(0) {
-}
--- Iteration 7 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [""]=>
-  string(5) "empty"
-  [5]=>
-  string(5) "float"
-  [1]=>
-  int(1)
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  [""]=>
-  string(5) "empty"
-  [5]=>
-  string(5) "float"
-  [1]=>
-  int(1)
-}
-array(0) {
-}
--- Iteration 8 --
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["key"]=>
-  string(5) "value"
-}
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["key"]=>
-  string(5) "value"
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variations - different types of array for 'input' argument***
 -- Iteration 1 --
 array(5) {

diff --git a/ext/standard/tests/array/array_filter_variation4.phpt b/ext/standard/tests/array/array_filter_variation4.phpt
index 04afbc5a70787353247dcf67af271f43c13f1da9..a15c1a2833992a54df54028d8a711573705da8ea 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation4.phpt
+++ b/ext/standard/tests/array/array_filter_variation4.phpt
@@ -58,44 +58,7 @@ var_dump( array_filter($input, "callback4") );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variation - different 'callback' functions***
--- Callback function without parameter and with return --
-array(8) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(-1)
-  [2]=>
-  int(2)
-  [3]=>
-  float(0.0034)
-  [4]=>
-  string(5) "hello"
-  [5]=>
-  string(5) "value"
-  ["key"]=>
-  int(4)
-  ["null"]=>
-  NULL
-}
--- Callback funciton with parameter and without return --
-array(0) {
-}
--- Callback function without parameter and return --
-array(0) {
-}
--- Callback function with parameter and return --
-array(3) {
-  [2]=>
-  int(2)
-  [3]=>
-  float(0.0034)
-  ["key"]=>
-  int(4)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variation - different 'callback' functions***
 -- Callback function without parameter and with return --
 array(8) {

diff --git a/ext/standard/tests/array/array_filter_variation5.phpt b/ext/standard/tests/array/array_filter_variation5.phpt
index 58e79d976ae6b80664057b6e77e927000a1c6b3b..6dcb3e81647a896ef0ed56383423fc3488c7d0b2 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation5.phpt
+++ b/ext/standard/tests/array/array_filter_variation5.phpt
@@ -65,49 +65,7 @@ var_dump( array_filter($input, 'always_false') );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variations - different false elements in 'input' ***
-array(0) {
-}
-array(16) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  string(0) ""
-  [3]=>
-  string(0) ""
-  [4]=>
-  int(0)
-  [5]=>
-  float(0)
-  [6]=>
-  NULL
-  [7]=>
-  NULL
-  [8]=>
-  string(1) "0"
-  [9]=>
-  string(1) "0"
-  [10]=>
-  array(0) {
-  }
-  [11]=>
-  bool(false)
-  [12]=>
-  bool(false)
-  [13]=>
-  string(0) ""
-  [14]=>
-  NULL
-  [15]=>
-  NULL
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variations - different false elements in 'input' ***
 array(0) {
 }

diff --git a/ext/standard/tests/array/array_filter_variation6.phpt b/ext/standard/tests/array/array_filter_variation6.phpt
index 6fd439b79b8d6d7fe7ae87d04e79c34fe76f99d2..df377443d99a5184f63ec890aefffd4307914b6d 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation6.phpt
+++ b/ext/standard/tests/array/array_filter_variation6.phpt
@@ -43,56 +43,7 @@ var_dump( array_filter($input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variations - 'input' containing references ***
-array(3) {
-  [0]=>
-  &array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(8)
-  }
-  [1]=>
-  int(10)
-  [2]=>
-  &array(3) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(4)
-  }
-}
-array(4) {
-  [0]=>
-  &array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(8)
-  }
-  [1]=>
-  int(10)
-  [2]=>
-  &array(3) {
-    [0]=>
-    int(5)
-    [1]=>
-    int(6)
-    [2]=>
-    int(4)
-  }
-  [3]=>
-  string(5) "value"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variations - 'input' containing references ***
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/array_filter_variation7.phpt b/ext/standard/tests/array/array_filter_variation7.phpt
index a76e1bd50c8e3c300254aaabcb0dd270cc6620af..9f5ce0e942c007609422dc5443532e1d74c54b83 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation7.phpt
+++ b/ext/standard/tests/array/array_filter_variation7.phpt
@@ -33,52 +33,7 @@ var_dump( array_filter($input, create_function('$input', null) ) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variations - Anonymous callback functions ***
-Anonymous callback function with regular parameter and statement
-array(3) {
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-}
-Anonymous callback function with reference parameter
-array(4) {
-  [0]=>
-  int(0)
-  [2]=>
-  int(-1)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-}
-Anonymous callback funciton with null argument
-array(8) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-}
-Anonymous callback function with regular argument and null statement
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variations - Anonymous callback functions ***
 Anonymous callback function with regular parameter and statement
 array(3) {

diff --git a/ext/standard/tests/array/array_filter_variation8.phpt b/ext/standard/tests/array/array_filter_variation8.phpt
index 45139342c6607f77ffd4009493f3910f4146ea88..d3a0d48010f6051f61baaef4c7f35c65fcf71367 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation8.phpt
+++ b/ext/standard/tests/array/array_filter_variation8.phpt
@@ -59,97 +59,7 @@ var_dump( array_filter($input, 'callback5') );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_filter() : usage variations - callback function with different return values***
-callback function with int return value
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-  [8]=>
-  bool(true)
-}
-callback function with float return value
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-  [8]=>
-  bool(true)
-}
-callback function with string return value
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-  [8]=>
-  bool(true)
-}
-callback function with null return value
-array(0) {
-}
-callback function with array as return value
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-  [8]=>
-  bool(true)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_filter() : usage variations - callback function with different return values***
 callback function with int return value
 array(9) {

diff --git a/ext/standard/tests/array/array_filter_variation9.phpt b/ext/standard/tests/array/array_filter_variation9.phpt
index 9d6c645f4e098f4a77aa75d57d91b8b74d276ee2..d0ac77d653eb24bc93691c0e40af6a041796364d 100644 (file)
--- a/ext/standard/tests/array/array_filter_variation9.phpt
+++ b/ext/standard/tests/array/array_filter_variation9.phpt
@@ -45,47 +45,6 @@ array(6) {
   [5]=>
   int(1000)
 }
-array(8) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-  [6]=>
-  string(5) "Hello"
-  [7]=>
-  NULL
-}
-
-Warning: array_filter() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
-
-Warning: array_filter() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_filter() : usage variations - built-in functions as 'callback' argument ***
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(-1)
-  [3]=>
-  int(10)
-  [4]=>
-  int(100)
-  [5]=>
-  int(1000)
-}
 array(8) {
   [0]=>
   int(0)

diff --git a/ext/standard/tests/array/array_flip.phpt b/ext/standard/tests/array/array_flip.phpt
index c4b533935ae62bd88d7f6c50d9773a4c89dcd7aa..1e61f7517df0b159a7531865f1e4e7da980f9a7f 100644 (file)
--- a/ext/standard/tests/array/array_flip.phpt
+++ b/ext/standard/tests/array/array_flip.phpt
@@ -20,26 +20,6 @@ Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
 
 Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
 
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-array(6) {
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [0]=>
-  string(1) "z"
-  ["G"]=>
-  int(0)
-  ["h"]=>
-  int(1)
-  ["i"]=>
-  int(2)
-}
---UEXPECTF--
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
 Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
 array(6) {
   [1]=>

diff --git a/ext/standard/tests/array/array_flip_basic.phpt b/ext/standard/tests/array/array_flip_basic.phpt
index 7c3b08e534ad89704f7183add4a7b214f968ace7..0d01f4886fc983a4f02ece0092a1e7b0f77fbeff 100644 (file)
--- a/ext/standard/tests/array/array_flip_basic.phpt
+++ b/ext/standard/tests/array/array_flip_basic.phpt
@@ -30,46 +30,7 @@ $input = array(1 => 'one','two', 3 => 'three', 4, "five" => 5);
 var_dump( array_flip($input) );
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_flip() : basic functionality ***
-array(2) {
-  [1]=>
-  int(0)
-  [2]=>
-  int(1)
-}
-array(2) {
-  ["value1"]=>
-  int(0)
-  ["value2"]=>
-  int(1)
-}
-array(2) {
-  [1]=>
-  string(4) "key1"
-  [2]=>
-  string(4) "key2"
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(5) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  string(4) "five"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_flip() : basic functionality ***
 array(2) {
   [1]=>

diff --git a/ext/standard/tests/array/array_flip_error.phpt b/ext/standard/tests/array/array_flip_error.phpt
index f9be2fc26989cf61e5c49cd3c67b84869513829c..3aa0f98271a19ca82823816ab51e041b26440a39 100644 (file)
--- a/ext/standard/tests/array/array_flip_error.phpt
+++ b/ext/standard/tests/array/array_flip_error.phpt
@@ -32,14 +32,3 @@ NULL
 Warning: array_flip() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_flip() : error conditions ***
--- Testing array_flip() function with Zero arguments --
-
-Warning: array_flip() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
--- Testing array_flip() function with more than expected no. of arguments --
-
-Warning: array_flip() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_flip_variation1.phpt b/ext/standard/tests/array/array_flip_variation1.phpt
index 3207f0102ce5710c367a6c5b5188d3d15d44c6b4..d6719bba65021ba829f70416b81d04a87c550e8c 100644 (file)
--- a/ext/standard/tests/array/array_flip_variation1.phpt
+++ b/ext/standard/tests/array/array_flip_variation1.phpt
@@ -146,101 +146,6 @@ Warning: array_flip() expects parameter 1 to be array, boolean given in %s on li
 NULL
 -- Iteration 16 --
 
-Warning: array_flip() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_flip() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_flip() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_flip() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_flip() expects parameter 1 to be array, object given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_flip() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_flip() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_flip() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_flip() : usage variations - unexpected values for 'input' ***
--- Iteration 1 --
-
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_flip() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_flip() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_flip() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_flip() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_flip() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_flip() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_flip() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_flip() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_flip() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: array_flip() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/array_flip_variation2.phpt b/ext/standard/tests/array/array_flip_variation2.phpt
index b03fa0fa85730bc7e3aba465cb3626caa0387da2..db44b81cd63c40863b2a2c6f03ee08bda6d2fd0c 100644 (file)
Binary files a/ext/standard/tests/array/array_flip_variation2.phpt and b/ext/standard/tests/array/array_flip_variation2.phpt differ

diff --git a/ext/standard/tests/array/array_flip_variation3.phpt b/ext/standard/tests/array/array_flip_variation3.phpt
index c9bd34838d4360886dd579a14b378703d40a61d2..16db9c5ec031d7b0534aa7c1fce1d520f71b6f15 100644 (file)
Binary files a/ext/standard/tests/array/array_flip_variation3.phpt and b/ext/standard/tests/array/array_flip_variation3.phpt differ

diff --git a/ext/standard/tests/array/array_flip_variation4.phpt b/ext/standard/tests/array/array_flip_variation4.phpt
index 2c6cde3c30c2237cd5d920d42415832a5d05f761..2420c7e00fd4f97d343b94aa98d34346f7969011 100644 (file)
--- a/ext/standard/tests/array/array_flip_variation4.phpt
+++ b/ext/standard/tests/array/array_flip_variation4.phpt
@@ -88,32 +88,3 @@ Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
 array(0) {
 }
 Done
---UEXPECTF--
-*** Testing array_flip() : different invalid values in 'input' array argument ***
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-
-Warning: array_flip(): Can only flip STRING and INTEGER values! in %s on line %d
-array(0) {
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_flip_variation5.phpt b/ext/standard/tests/array/array_flip_variation5.phpt
index d45af595f7b1607e268d6cf7b74e6af4e74b7886..61e32132dfa2f2215889e2868ed7ce74dce8d8b2 100644 (file)
--- a/ext/standard/tests/array/array_flip_variation5.phpt
+++ b/ext/standard/tests/array/array_flip_variation5.phpt
@@ -39,48 +39,7 @@ var_dump( array_flip($input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_flip() : 'input' array with repeatitive keys/values ***
-array(3) {
-  ["VaLuE"]=>
-  int(1)
-  ["VALUE"]=>
-  int(2)
-  [5]=>
-  int(3)
-}
-array(3) {
-  ["FOUR"]=>
-  string(3) "key"
-  ["TWO"]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-}
-array(2) {
-  [-1]=>
-  int(1)
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  string(0) ""
-}
-array(2) {
-  [1]=>
-  string(5) "index"
-  [2]=>
-  string(3) "two"
-}
-array(2) {
-  ["value1"]=>
-  string(4) "key3"
-  [2]=>
-  string(4) "key2"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_flip() : 'input' array with repeatitive keys/values ***
 array(3) {
   [u"VaLuE"]=>

diff --git a/ext/standard/tests/array/array_intersect_1.phpt b/ext/standard/tests/array/array_intersect_1.phpt
index 61f4859e8f8e8204eb9327c54d5dd9407ea59bf6..35033b43d6074b961f2d4889c5787f1a266e92c1 100644 (file)
--- a/ext/standard/tests/array/array_intersect_1.phpt
+++ b/ext/standard/tests/array/array_intersect_1.phpt
@@ -119,306 +119,6 @@ $b=array (
   )),
 );
 var_dump(array_uintersect($a, $b, "comp_func_cr"));
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(9)
-    ["public_member"]=>
-    int(9)
-  }
-  [1]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(4)
-    ["public_member"]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-    ["public_member"]=>
-    int(-15)
-  }
-}
-end   ------------ array_uintersect() ---------------------------
-begin ------------ array_uintersect_assoc() ---------------------
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_uintersect_assoc($a, $b, "comp_func_cr"));
-array(2) {
-  [1]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(4)
-    ["public_member"]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-    ["public_member"]=>
-    int(-15)
-  }
-}
-end   ------------ array_uintersect_assoc() ---------------------
-begin ------------ array_uintersect_uassoc() with ordinary func -
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_uintersect_uassoc($a, $b, "comp_func_cr", "comp_func"));
-array(2) {
-  [1]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(4)
-    ["public_member"]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-    ["public_member"]=>
-    int(-15)
-  }
-}
-end   ------------ array_uintersect_uassoc() with ordinary func -
-begin ------------ array_uintersect_uassoc() with method --------
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), "comp_func"));
-array(2) {
-  [1]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(4)
-    ["public_member"]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (2) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-    ["public_member"]=>
-    int(-15)
-  }
-}
-end   ------------ array_uintersect_uassoc() with method --------
---UEXPECTF--
-begin ------------ array_uintersect() ---------------------------
-$a=array (
-  '0.1' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 12,
-     'public_member' => 12,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 23,
-     'public_member' => 23,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-$b=array (
-  '0.2' => 
-  cr::__set_state(array(
-     'priv_member' => 9,
-     'public_member' => 9,
-  )),
-  '0.5' => 
-  cr::__set_state(array(
-     'priv_member' => 22,
-     'public_member' => 22,
-  )),
-  0 => 
-  cr::__set_state(array(
-     'priv_member' => 3,
-     'public_member' => 3,
-  )),
-  1 => 
-  cr::__set_state(array(
-     'priv_member' => 4,
-     'public_member' => 4,
-  )),
-  2 => 
-  cr::__set_state(array(
-     'priv_member' => -15,
-     'public_member' => -15,
-  )),
-);
-var_dump(array_uintersect($a, $b, "comp_func_cr"));
 array(3) {
   [u"0.1"]=>
   object(cr)#%d (2) {

diff --git a/ext/standard/tests/array/array_intersect_assoc_basic.phpt b/ext/standard/tests/array/array_intersect_assoc_basic.phpt
index 1c04b997cf716dfbbf6151ed77e48d0ca546d53f..a4499dbb081d15f315e8d38deaed349edbe499d2 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_basic.phpt
@@ -42,33 +42,6 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing array_intersect_assoc() : basic functionality ***
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  string(5) "world"
-}
-array(0) {
-}
-array(0) {
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : basic functionality ***
 array(4) {
   [0]=>
   int(1)

diff --git a/ext/standard/tests/array/array_intersect_assoc_error.phpt b/ext/standard/tests/array/array_intersect_assoc_error.phpt
index a3a92978f4f5fd45d61f7a27e4062276876010a2..d2d9c64f05702945adb8246e488e2741343fae1b 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_error.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_error.phpt
@@ -34,17 +34,3 @@ NULL
 Warning: array_intersect_assoc(): at least 2 parameters are required, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : error conditions ***
-
--- Testing array_intersect_assoc() function with Zero arguments --
-
-Warning: array_intersect_assoc(): at least 2 parameters are required, 0 given in %s on line %d
-NULL
-
--- Testing array_intersect_assoc() function with less than expected no. of arguments --
-
-Warning: array_intersect_assoc(): at least 2 parameters are required, 1 given in %s on line %d
-NULL
-Done
-

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
index 35e2c1e4df8402bc7797e4cf43db9fdefc6453e0..f90cd3cb45fa8e38e83e5713e1a245c031c943f7 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation10.phpt
@@ -31,28 +31,7 @@ var_dump( array_intersect_assoc($arr_binary, $arr_binary) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect_assoc() : binary safe checking ***
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect_assoc() : binary safe checking ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
index 3d545372fb8974f23638d84ecaabe9d7aa945129..142d44778e4849b1c59d76603686bb95e68b3fdb 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation3.phpt
@@ -101,149 +101,7 @@ foreach($arrays as $arr1) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect_assoc() : Passing different types of arrays to $arr1 argument ***
--- Iteration 1 --
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iteration 2 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 3 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 4 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 5 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 6 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 7 --
-array(1) {
-  [1]=>
-  string(6) "aaaa\r"
-}
-array(1) {
-  [1]=>
-  string(6) "aaaa\r"
-}
--- Iteration 8 --
-array(1) {
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
-array(1) {
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
--- Iteration 9 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 10 --
-array(1) {
-  ["two"]=>
-  int(2)
-}
-array(1) {
-  ["two"]=>
-  int(2)
-}
--- Iteration 11 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 12 --
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
--- Iteration 13 --
-array(1) {
-  [4]=>
-  string(4) "four"
-}
-array(1) {
-  [4]=>
-  string(4) "four"
-}
--- Iteration 14 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 15 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 16 --
-array(2) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-}
-array(2) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-}
--- Iteration 17 --
-array(1) {
-  [5]=>
-  bool(false)
-}
-array(1) {
-  [5]=>
-  bool(false)
-}
--- Iteration 18 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 19 --
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect_assoc() : Passing different types of arrays to $arr1 argument ***
 -- Iteration 1 --
 array(1) {

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
index 81c24006fbba3270a89dc9613eb79e109c09f646..2a62ea27eb800f98f04a7771b1983a469e2b4b66 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation4.phpt
@@ -100,161 +100,7 @@ foreach($arrays as $arr2) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect_assoc() : Passing different types of arrays to $arr2 argument ***
--- Iteration 1 --
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iteration 2 --
-array(1) {
-  [2]=>
-  float(1.3)
-}
-array(1) {
-  [2]=>
-  float(1.3)
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  bool(true)
-}
-array(1) {
-  [1]=>
-  bool(true)
-}
--- Iteration 4 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 5 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 6 --
-array(1) {
-  [3]=>
-  string(5) "b bbb"
-}
-array(1) {
-  [3]=>
-  string(5) "b bbb"
-}
--- Iteration 7 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 8 --
-array(1) {
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
-array(1) {
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
--- Iteration 9 --
-array(1) {
-  [6]=>
-  string(3) "six"
-}
-array(1) {
-  [6]=>
-  string(3) "six"
-}
--- Iteration 10 --
-array(1) {
-  ["two"]=>
-  int(2)
-}
-array(1) {
-  ["two"]=>
-  int(2)
-}
--- Iteration 11 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 12 --
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
--- Iteration 13 --
-array(1) {
-  [4]=>
-  string(4) "four"
-}
-array(1) {
-  [4]=>
-  string(4) "four"
-}
--- Iteration 14 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 15 --
-array(1) {
-  ["true"]=>
-  bool(true)
-}
-array(1) {
-  ["true"]=>
-  bool(true)
-}
--- Iteration 16 --
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
--- Iteration 17 --
-array(1) {
-  [5]=>
-  NULL
-}
-array(1) {
-  [5]=>
-  NULL
-}
--- Iteration 18 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 19 --
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect_assoc() : Passing different types of arrays to $arr2 argument ***
 -- Iteration 1 --
 array(1) {

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
index 0cd97e9ece675ee1c8e44a1f1e137fdcd69f1262..be308a48d3dc918733198ab9b546d9f8aea4c29b 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation5.phpt
@@ -104,108 +104,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 2 --
-array(1) {
-  [0]=>
-  string(1) "0"
-}
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 3 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 4 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 5 --
-array(1) {
-  [2]=>
-  string(5) "float"
-}
-array(1) {
-  [2]=>
-  string(5) "float"
-}
--- Iteration 6 --
-array(2) {
-  [4]=>
-  string(2) "f3"
-  [33333333]=>
-  string(2) "f4"
-}
-array(2) {
-  [4]=>
-  string(2) "f3"
-  [33333333]=>
-  string(2) "f4"
-}
--- Iteration 7 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 8 --
-array(2) {
-  ["   Hello"]=>
-  int(111)
-  ["pen
-"]=>
-  int(33)
-}
-array(2) {
-  ["   Hello"]=>
-  int(111)
-  ["pen
-"]=>
-  int(33)
-}
--- Iteration 9 --
-array(1) {
-  ["Hello world"]=>
-  string(6) "string"
-}
-array(1) {
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iteration 10 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 11 --
-array(1) {
-  [133]=>
-  string(3) "int"
-}
-array(1) {
-  [133]=>
-  string(3) "int"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : assoc array with diff keys to $arr1 argument ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 array(0) {

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
index 506a824080785649c4b0d449a40de7c0e1728e90..099599328875a087200ace0d719c3aebeb14b3bc 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation6.phpt
@@ -104,108 +104,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 2 --
-array(1) {
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 3 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 4 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 5 --
-array(1) {
-  [2]=>
-  string(5) "float"
-}
-array(1) {
-  [2]=>
-  string(5) "float"
-}
--- Iteration 6 --
-array(2) {
-  [4]=>
-  string(2) "f3"
-  [33333333]=>
-  string(2) "f4"
-}
-array(2) {
-  [4]=>
-  string(2) "f3"
-  [33333333]=>
-  string(2) "f4"
-}
--- Iteration 7 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 8 --
-array(2) {
-  ["   Hello"]=>
-  int(111)
-  ["pen
-"]=>
-  int(33)
-}
-array(2) {
-  ["   Hello"]=>
-  int(111)
-  ["pen
-"]=>
-  int(33)
-}
--- Iteration 9 --
-array(1) {
-  ["Hello world"]=>
-  string(6) "string"
-}
-array(1) {
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iteration 10 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 11 --
-array(1) {
-  [133]=>
-  string(3) "int"
-}
-array(1) {
-  [133]=>
-  string(3) "int"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : assoc array with diff keys to $arr2 argument ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 array(0) {

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
index 396e7ba1516a0c20bf7a129fdb24660fc5cf095d..d7e08244eab41d474008f82bdc0dd79b199e121e 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation7.phpt
@@ -116,126 +116,6 @@ array(1) {
   int(1)
 }
 -- Iteration 4 --
-array(1) {
-  ["two"]=>
-  int(2)
-}
-array(1) {
-  ["two"]=>
-  int(2)
-}
--- Iteration 5 --
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-array(2) {
-  ["f1"]=>
-  float(1.2)
-  ["f4"]=>
-  float(33333333.333)
-}
-array(2) {
-  ["f1"]=>
-  float(1.2)
-  ["f4"]=>
-  float(33333333.333)
-}
--- Iteration 7 --
-array(1) {
-  [111]=>
-  string(6) "  Hello"
-}
-array(1) {
-  [111]=>
-  string(6) "  Hello"
-}
--- Iteration 8 --
-array(1) {
-  [3]=>
-  string(5) "pen\n"
-}
-array(1) {
-  [3]=>
-  string(5) "pen\n"
-}
--- Iteration 9 --
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iteration 10 --
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
--- Iteration 11 --
-array(4) {
-  [222]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-array(4) {
-  [222]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : assoc array with diff values to $arr1 argument ***
--- Iteration 1 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 2 --
-array(1) {
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  int(1)
-}
-array(1) {
-  [1]=>
-  int(1)
-}
--- Iteration 4 --
 array(1) {
   [u"two"]=>
   int(2)

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
index e1443e8137d50adceb6907b3410c72556547f98d..e3d5eaf14bce94b10834d9218d27f3289cd4c039 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation8.phpt
@@ -98,126 +98,6 @@ array(0) {
 array(0) {
 }
 -- Iteration 2 --
-array(1) {
-  [0]=>
-  string(1) "0"
-}
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  int(1)
-}
-array(1) {
-  [1]=>
-  int(1)
-}
--- Iteration 4 --
-array(1) {
-  ["two"]=>
-  int(2)
-}
-array(1) {
-  ["two"]=>
-  int(2)
-}
--- Iteration 5 --
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-array(2) {
-  ["f1"]=>
-  float(1.2)
-  ["f4"]=>
-  float(33333333.333)
-}
-array(2) {
-  ["f1"]=>
-  float(1.2)
-  ["f4"]=>
-  float(33333333.333)
-}
--- Iteration 7 --
-array(1) {
-  [111]=>
-  string(6) "  Hello"
-}
-array(1) {
-  [111]=>
-  string(6) "  Hello"
-}
--- Iteration 8 --
-array(1) {
-  [3]=>
-  string(5) "pen\n"
-}
-array(1) {
-  [3]=>
-  string(5) "pen\n"
-}
--- Iteration 9 --
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iteration 10 --
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
--- Iteration 11 --
-array(4) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  [222]=>
-  string(5) "fruit"
-}
-array(4) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  [222]=>
-  string(5) "fruit"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : assoc array with diff values to $arr2 argument ***
--- Iteration 1 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 2 --
 array(1) {
   [0]=>
   unicode(1) "0"

diff --git a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
index 7121863efcc322c73b7608618551edcf2b493406..1aeb779fefb8d2262d4d244da1033f6cc7196879 100644 (file)
--- a/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_assoc_variation9.phpt
@@ -68,99 +68,6 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    string(5) "hello"
-    [3]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
-- With more arguments -
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(2) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    string(5) "hello"
-    [3]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-}
--- Passing the sub-array to $arr1 and $arr2 --
-- With default arguments -
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-- With more arguments -
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing array_intersect_assoc() : passing two dimensional array to both $arr1 and $arr2 arguments ***
--- Passing the entire 2-D array to $arr1 and $arr2 --
-- With default arguments -
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
 Notice: Array to string conversion in %s on line %d
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_intersect_basic.phpt b/ext/standard/tests/array/array_intersect_basic.phpt
index 3018b39e7a4a0041716135e990712d70cce6eb8c..4b7306a86baa37a1f787e4dc1370a887ebcbf41d 100644 (file)
--- a/ext/standard/tests/array/array_intersect_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_basic.phpt
@@ -39,46 +39,7 @@ var_dump( array_intersect($arr_associative, $arr_default_keys, $arr3, $arr_assoc
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect() : basic functionality ***
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(1) {
-  [1]=>
-  int(2)
-}
-array(1) {
-  ["two"]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect() : basic functionality ***
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/array_intersect_error.phpt b/ext/standard/tests/array/array_intersect_error.phpt
index 507dd91b5a70a9df714f76f010e258e9110671b5..46f77ac9bd3cac959829219e523a5435c064636f 100644 (file)
--- a/ext/standard/tests/array/array_intersect_error.phpt
+++ b/ext/standard/tests/array/array_intersect_error.phpt
@@ -33,16 +33,3 @@ NULL
 Warning: array_intersect(): at least 2 parameters are required, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_intersect() : error conditions ***
-
--- Testing array_intersect() function with Zero arguments --
-
-Warning: array_intersect(): at least 2 parameters are required, 0 given in %s on line %d
-NULL
-
--- Testing array_intersect() function with less than expected no. of arguments --
-
-Warning: array_intersect(): at least 2 parameters are required, 1 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_intersect_key.phpt b/ext/standard/tests/array/array_intersect_key.phpt
index 6d27839404332f2d5c7c2dd60a6210b2bb64d807..52a0ee5e97dbcf78aa96aca934b12b0bad4d5085 100644 (file)
--- a/ext/standard/tests/array/array_intersect_key.phpt
+++ b/ext/standard/tests/array/array_intersect_key.phpt
@@ -59,7 +59,7 @@ function comp_func($a, $b) {
 
 }
 ?>
---EXPECTF--
+--EXPECT--
 array(3) {
   [2]=>
   int(4)

diff --git a/ext/standard/tests/array/array_intersect_key_basic.phpt b/ext/standard/tests/array/array_intersect_key_basic.phpt
index 324a5af72809c0c2f08fbd1f6728f16130e85417..1ac048760545cc00247962481e962f18c3f32e99 100644 (file)
--- a/ext/standard/tests/array/array_intersect_key_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_key_basic.phpt
@@ -11,16 +11,9 @@ $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8);
 var_dump(array_intersect_key($array1, $array2));
 ?>
 --EXPECT--
-array(2) {
-  ["blue"]=>
-  int(1)
-  ["green"]=>
-  int(3)
-}
---UEXPECT--
 array(2) {
   [u"blue"]=>
   int(1)
   [u"green"]=>
   int(3)
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_intersect_uassoc_basic.phpt b/ext/standard/tests/array/array_intersect_uassoc_basic.phpt
index ea8a3e94f6d7785d99a0d8c594b927474ef00d29..c5fc59767449e3775f80555d7d1836a8850afe5b 100644 (file)
--- a/ext/standard/tests/array/array_intersect_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_uassoc_basic.phpt
@@ -18,12 +18,7 @@ $result = array_intersect_uassoc($array1, $array2, "key_compare_func");
 var_dump($result);
 ?>
 --EXPECT--
-array(1) {
-  ["a"]=>
-  string(5) "green"
-}
---UEXPECT--
 array(1) {
   [u"a"]=>
   unicode(5) "green"
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_intersect_ukey_basic.phpt b/ext/standard/tests/array/array_intersect_ukey_basic.phpt
index 09791e0357da7bd28ffcef20a4f71c1f8abb87b5..553d5c5fe2a5fdaeb86b5d508bd39f5007c6108f 100644 (file)
--- a/ext/standard/tests/array/array_intersect_ukey_basic.phpt
+++ b/ext/standard/tests/array/array_intersect_ukey_basic.phpt
@@ -16,13 +16,6 @@ $array2 = array('green' => 5, 'blue' => 6, 'yellow' => 7, 'cyan' => 8);
 var_dump(array_intersect_ukey($array1, $array2, 'key_compare_func'));
 ?>
 --EXPECT--
-array(2) {
-  ["blue"]=>
-  int(1)
-  ["green"]=>
-  int(3)
-}
---UEXPECT--
 array(2) {
   [u"blue"]=>
   int(1)

diff --git a/ext/standard/tests/array/array_intersect_variation1.phpt b/ext/standard/tests/array/array_intersect_variation1.phpt
index 95d14e3933c5c1748ebf9185b1a197683b669bda..ca203ff4651643ead365debe922cfd7386211b1c 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation1.phpt
+++ b/ext/standard/tests/array/array_intersect_variation1.phpt
@@ -278,174 +278,3 @@ NULL
 Warning: array_intersect(): Argument #1 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr1 argument ***
-
--- Iterator 1 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 2 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 3 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 4 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 5 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 6 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 7 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 8 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 9 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 10 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 11 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 12 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 13 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 14 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 15 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 16 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 17 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 18 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 19 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 20 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 21 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 22 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 23 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iterator 24 --
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #1 is not an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_intersect_variation10.phpt b/ext/standard/tests/array/array_intersect_variation10.phpt
index b4f44a574d49aa7ffe74330c08d25b230b057c56..21b97c1f99fa305d0bc306a738e685641a05dc4b 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation10.phpt
+++ b/ext/standard/tests/array/array_intersect_variation10.phpt
@@ -30,28 +30,7 @@ var_dump( array_intersect($arr_binary, $arr_binary) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect() : binary safe checking ***
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect() : binary safe checking ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_intersect_variation2.phpt b/ext/standard/tests/array/array_intersect_variation2.phpt
index 9887ac7d8612c6b00004ff2deb0a15059c572ade..b690fc9958a400f0f1a0b5dc88f78aa5c8948b7a 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation2.phpt
+++ b/ext/standard/tests/array/array_intersect_variation2.phpt
@@ -279,174 +279,3 @@ NULL
 Warning: array_intersect(): Argument #2 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_intersect() : Passing non-array values to $arr2 argument ***
-
--- Iterator 1 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 2 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 3 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 4 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 5 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 6 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 7 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 8 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 9 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 10 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 11 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 12 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 13 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 14 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 15 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 16 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 17 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 18 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 19 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 20 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 21 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 22 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 23 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iterator 24 --
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_intersect(): Argument #2 is not an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_intersect_variation3.phpt b/ext/standard/tests/array/array_intersect_variation3.phpt
index cde3db4ed26abd23f787c1b56d867337062dec1a..fea579eee207fd46b8bf204017850e223c281d34 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation3.phpt
+++ b/ext/standard/tests/array/array_intersect_variation3.phpt
@@ -100,251 +100,7 @@ foreach($arrays as $arr1) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_intersect() : Passing different types of arrays to $arr1 argument ***
--- Iterator 1 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iterator 2 --
-array(1) {
-  [0]=>
-  float(1.1)
-}
-array(1) {
-  [0]=>
-  float(1.1)
-}
--- Iterator 3 --
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iterator 4 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 5 --
-array(1) {
-  [0]=>
-  NULL
-}
-array(1) {
-  [0]=>
-  NULL
-}
--- Iterator 6 --
-array(1) {
-  [1]=>
-  string(5) "aaaa
-"
-}
-array(1) {
-  [1]=>
-  string(5) "aaaa
-"
-}
--- Iterator 7 --
-array(1) {
-  [1]=>
-  string(6) "aaaa\r"
-}
-array(1) {
-  [1]=>
-  string(6) "aaaa\r"
-}
--- Iterator 8 --
-array(2) {
-  [2]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [3]=>
-  string(90) "11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"
-}
-array(2) {
-  [2]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [3]=>
-  string(90) "11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"
-}
--- Iterator 9 --
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
--- Iterator 10 --
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
--- Iterator 11 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 12 --
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
-array(1) {
-  ["one"]=>
-  string(3) "ten"
-}
--- Iterator 13 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [2]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  [2]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
--- Iterator 14 --
-array(2) {
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
-array(2) {
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
--- Iterator 15 --
-array(2) {
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
-array(2) {
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- Iterator 16 --
-array(3) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
-array(3) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
--- Iterator 17 --
-array(6) {
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
-array(6) {
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
--- Iterator 18 --
-array(1) {
-  [0]=>
-  int(5)
-}
-array(1) {
-  [0]=>
-  int(5)
-}
--- Iterator 19 --
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_intersect() : Passing different types of arrays to $arr1 argument ***
 -- Iterator 1 --
 array(2) {

diff --git a/ext/standard/tests/array/array_intersect_variation5.phpt b/ext/standard/tests/array/array_intersect_variation5.phpt
index bea88f1dad3313c4a98c8f2244127bdd1c827bb6..abb2407792c451d7aef39832e52494b93d3fdfca 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation5.phpt
+++ b/ext/standard/tests/array/array_intersect_variation5.phpt
@@ -99,128 +99,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iterator 1 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 2 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 3 --
-array(1) {
-  [1]=>
-  string(1) "1"
-}
-array(1) {
-  [1]=>
-  string(1) "1"
-}
--- Iterator 4 --
-array(1) {
-  [1]=>
-  string(1) "1"
-}
-array(1) {
-  [1]=>
-  string(1) "1"
-}
--- Iterator 5 --
-array(1) {
-  [2]=>
-  string(5) "float"
-}
-array(1) {
-  [2]=>
-  string(5) "float"
-}
--- Iterator 6 --
-array(1) {
-  [33333333]=>
-  string(2) "f4"
-}
-array(1) {
-  [33333333]=>
-  string(2) "f4"
-}
--- Iterator 7 --
-array(2) {
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
-array(2) {
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
--- Iterator 8 --
-array(2) {
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
-array(2) {
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
--- Iterator 9 --
-array(2) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
-array(2) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iterator 10 --
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
--- Iterator 11 --
-array(3) {
-  ["hello"]=>
-  int(1)
-  ["fruit"]=>
-  float(2.2)
-  [444]=>
-  string(5) "float"
-}
-array(3) {
-  ["hello"]=>
-  int(1)
-  ["fruit"]=>
-  float(2.2)
-  [444]=>
-  string(5) "float"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect() : assoc array with diff keys to $arr1 argument ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iterator 1 --
 array(0) {

diff --git a/ext/standard/tests/array/array_intersect_variation6.phpt b/ext/standard/tests/array/array_intersect_variation6.phpt
index 2e148f3590c2c16e9f2d686591d0f6a601e58313..d288b57b6c353840c80fef294f7643496444f998 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation6.phpt
+++ b/ext/standard/tests/array/array_intersect_variation6.phpt
@@ -99,128 +99,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iterator 1 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 2 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 3 --
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iterator 4 --
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iterator 5 --
-array(1) {
-  [1]=>
-  string(5) "float"
-}
-array(1) {
-  [1]=>
-  string(5) "float"
-}
--- Iterator 6 --
-array(1) {
-  [2]=>
-  string(2) "f4"
-}
-array(1) {
-  [2]=>
-  string(2) "f4"
-}
--- Iterator 7 --
-array(2) {
-  [4]=>
-  float(2.2)
-  [5]=>
-  string(5) "color"
-}
-array(2) {
-  [4]=>
-  float(2.2)
-  [5]=>
-  string(5) "color"
-}
--- Iterator 8 --
-array(2) {
-  [4]=>
-  float(2.2)
-  [5]=>
-  string(5) "color"
-}
-array(2) {
-  [4]=>
-  float(2.2)
-  [5]=>
-  string(5) "color"
-}
--- Iterator 9 --
-array(2) {
-  [3]=>
-  string(5) "hello"
-  [6]=>
-  string(6) "string"
-}
-array(2) {
-  [3]=>
-  string(5) "hello"
-  [6]=>
-  string(6) "string"
-}
--- Iterator 10 --
-array(1) {
-  [3]=>
-  string(5) "hello"
-}
-array(1) {
-  [3]=>
-  string(5) "hello"
-}
--- Iterator 11 --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(5) "float"
-  [4]=>
-  float(2.2)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(5) "float"
-  [4]=>
-  float(2.2)
-}
-Done
---UEXPECTF--
-*** Testing array_intersect() : assoc array with diff keys to $arr2 argument ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iterator 1 --
 array(0) {

diff --git a/ext/standard/tests/array/array_intersect_variation7.phpt b/ext/standard/tests/array/array_intersect_variation7.phpt
index 2b216d0ee7adee8aaf4710797bb1a02fe5440e8b..f5137a83e2f0eeb331fa7cf0f5e0a3c22c1cc1cd 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation7.phpt
+++ b/ext/standard/tests/array/array_intersect_variation7.phpt
@@ -109,128 +109,6 @@ array(1) {
   int(1)
 }
 -- Iterator 4 --
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
--- Iterator 5 --
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
--- Iterator 6 --
-array(1) {
-  ["f1"]=>
-  float(1.2)
-}
-array(1) {
-  ["f1"]=>
-  float(1.2)
-}
--- Iterator 7 --
-array(1) {
-  ["red"]=>
-  string(6) "col       or"
-}
-array(1) {
-  ["red"]=>
-  string(6) "col       or"
-}
--- Iterator 8 --
-array(1) {
-  [2]=>
-  string(9) "\v\fworld"
-}
-array(1) {
-  [2]=>
-  string(9) "\v\fworld"
-}
--- Iterator 9 --
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-array(1) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iterator 10 --
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
-array(2) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
--- Iterator 11 --
-array(5) {
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [222]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["float"]=>
-  float(444.432)
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-array(5) {
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [222]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["float"]=>
-  float(444.432)
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect() : assoc array with diff values to $arr1 argument ***
--- Iterator 1 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 2 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 3 --
-array(1) {
-  [1]=>
-  int(1)
-}
-array(1) {
-  [1]=>
-  int(1)
-}
--- Iterator 4 --
 array(2) {
   [u"one"]=>
   int(1)

diff --git a/ext/standard/tests/array/array_intersect_variation8.phpt b/ext/standard/tests/array/array_intersect_variation8.phpt
index 1a92cf06d0a8969f52593981e97d1d0c8a409054..91c22cb725f7677a2c98daa5997482b34ab56b88 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation8.phpt
+++ b/ext/standard/tests/array/array_intersect_variation8.phpt
@@ -140,136 +140,6 @@ array(1) {
   float(1.2)
 }
 -- Iterator 7 --
-array(1) {
-  [4]=>
-  string(6) "col       or"
-}
-array(1) {
-  [4]=>
-  string(6) "col       or"
-}
--- Iterator 8 --
-array(1) {
-  [5]=>
-  string(9) "\v\fworld"
-}
-array(1) {
-  [5]=>
-  string(9) "\v\fworld"
-}
--- Iterator 9 --
-array(2) {
-  [7]=>
-  string(11) "Hello world"
-  [8]=>
-  string(11) "Hello world"
-}
-array(2) {
-  [7]=>
-  string(11) "Hello world"
-  [8]=>
-  string(11) "Hello world"
-}
--- Iterator 10 --
-array(2) {
-  [6]=>
-  resource(%d) of type (stream)
-  [9]=>
-  object(classA)#%d (0) {
-  }
-}
-array(2) {
-  [6]=>
-  resource(%d) of type (stream)
-  [9]=>
-  object(classA)#%d (0) {
-  }
-}
--- Iterator 11 --
-array(6) {
-  [6]=>
-  resource(%d) of type (stream)
-  [7]=>
-  string(11) "Hello world"
-  [8]=>
-  string(11) "Hello world"
-  [9]=>
-  object(classA)#%d (0) {
-  }
-  [10]=>
-  float(444.432)
-  [11]=>
-  string(5) "fruit"
-}
-array(6) {
-  [6]=>
-  resource(%d) of type (stream)
-  [7]=>
-  string(11) "Hello world"
-  [8]=>
-  string(11) "Hello world"
-  [9]=>
-  object(classA)#%d (0) {
-  }
-  [10]=>
-  float(444.432)
-  [11]=>
-  string(5) "fruit"
-}
-Done
---UEXPECTF--
-*** Testing array_intersect() : assoc array with diff values to $arr2 argument ***
--- Iterator 1 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 2 --
-array(0) {
-}
-array(0) {
-}
--- Iterator 3 --
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iterator 4 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iterator 5 --
-array(1) {
-  [3]=>
-  float(2.3333)
-}
-array(1) {
-  [3]=>
-  float(2.3333)
-}
--- Iterator 6 --
-array(1) {
-  [2]=>
-  float(1.2)
-}
-array(1) {
-  [2]=>
-  float(1.2)
-}
--- Iterator 7 --
 array(1) {
   [4]=>
   unicode(6) "col      or"

diff --git a/ext/standard/tests/array/array_intersect_variation9.phpt b/ext/standard/tests/array/array_intersect_variation9.phpt
index 0fec5cc9f1830b9a51a29a3e705982ccc8f77c0a..e4a0f7a180c3bf9d945317ba8c1b924795638e92 100644 (file)
--- a/ext/standard/tests/array/array_intersect_variation9.phpt
+++ b/ext/standard/tests/array/array_intersect_variation9.phpt
@@ -95,203 +95,6 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-array(4) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    string(5) "hello"
-    [3]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [2]=>
-  array(3) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    string(5) "three"
-  }
-  [3]=>
-  array(3) {
-    ["ten"]=>
-    int(10)
-    ["twenty"]=>
-    float(20)
-    ["thirty"]=>
-    int(30)
-  }
-}
-- With more arguments -
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(4) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    string(5) "hello"
-    [3]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-  }
-  [2]=>
-  array(3) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    string(5) "three"
-  }
-  [3]=>
-  array(3) {
-    ["ten"]=>
-    int(10)
-    ["twenty"]=>
-    float(20)
-    ["thirty"]=>
-    int(30)
-  }
-}
--- Passing the sub-array to $arr1 and $arr2 --
-- With default arguments -
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-- With more arguments -
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing array_intersect() : passing two dimensional array to both $arr1 and $arr2 arguments ***
--- Passing the entire 2-D array to $arr1 and $arr2 --
-- With default arguments -
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
 Notice: Array to string conversion in %s on line %d
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/array_key_exists.phpt b/ext/standard/tests/array/array_key_exists.phpt
index 66f8a5ab9c36976e9373dc6c3230aee78550ebdf..4611017bec9086b2f9df374e55ff3984f2432fb0 100644 (file)
--- a/ext/standard/tests/array/array_key_exists.phpt
+++ b/ext/standard/tests/array/array_key_exists.phpt
@@ -118,7 +118,7 @@ var_dump(array_key_exists("var", $key_check_obj->arr)); //found,  key is in memb
 var_dump( array_key_exists($key_check_obj, $key_check_obj) );
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 *** Testing basic functionalities ***
 -- Iteration 1 --
 bool(true)

diff --git a/ext/standard/tests/array/array_key_exists_basic.phpt b/ext/standard/tests/array/array_key_exists_basic.phpt
index 1fbfb5005d59fc78b5f1e31762828436b90cc92e..12b21d4613cf5dd2ee4bb9e6a1ed594dbd4a8c89 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_basic.phpt
+++ b/ext/standard/tests/array/array_key_exists_basic.phpt
@@ -22,13 +22,8 @@ var_dump(array_key_exists($key2, $search));
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing array_key_exists() : basic functionality ***
 bool(true)
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : basic functionality ***
-bool(true)
-bool(false)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_error.phpt b/ext/standard/tests/array/array_key_exists_error.phpt
index 2cfe62a3db424798cdaabbe931140450b7dbb728..617006a71742fc67d97640159c37f193c6cef5c3 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_error.phpt
+++ b/ext/standard/tests/array/array_key_exists_error.phpt
@@ -42,16 +42,3 @@ NULL
 Warning: array_key_exists() expects exactly 2 parameters, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_key_exists() : error conditions ***
-
--- Testing array_key_exists() function with more than expected no. of arguments --
-
-Warning: array_key_exists() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-
--- Testing array_key_exists() function with less than expected no. of arguments --
-
-Warning: array_key_exists() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_object1.phpt b/ext/standard/tests/array/array_key_exists_object1.phpt
index f4bfe5a39e906e9ef22f84cc409abbd436212253..e246f9fdc9084a55a8eff0417915c39d4afd3981 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_object1.phpt
+++ b/ext/standard/tests/array/array_key_exists_object1.phpt
@@ -50,37 +50,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_key_exists() : object functionality ***
 
--- Do not assign a value to $class1->var3 --
-$key = var1:
-bool(true)
-$key = var3:
-bool(true)
-$class1:
-object(myClass)#%d (3) {
-  ["var1"]=>
-  string(1) "a"
-  ["var2"]=>
-  string(1) "b"
-  ["var3"]=>
-  NULL
-}
-
--- Assign a value to $class2->var3 --
-$key = var3:
-bool(true)
-$class2:
-object(myClass)#%d (3) {
-  ["var1"]=>
-  string(1) "x"
-  ["var2"]=>
-  string(1) "y"
-  ["var3"]=>
-  string(1) "z"
-}
-Done
---UEXPECTF--
-*** Testing array_key_exists() : object functionality ***
-
 -- Do not assign a value to $class1->var3 --
 $key = var1:
 bool(true)
@@ -108,4 +77,4 @@ object(myClass)#%d (3) {
   [u"var3"]=>
   unicode(1) "z"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_key_exists_object2.phpt b/ext/standard/tests/array/array_key_exists_object2.phpt
index c00eb921ad8d7ab9823b814f80832b47c447b6fc..0983da7582a8bedbafe6c41ded7d6c68c2163633 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_object2.phpt
+++ b/ext/standard/tests/array/array_key_exists_object2.phpt
@@ -52,39 +52,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_key_exists() : object functionality ***
 
--- Do not assign a value to $class1->var3 --
-$key = var1:
-bool(true)
-$key = var2:
-bool(false)
-$key = var3:
-bool(false)
-$class1:
-object(myClass)#%d (3) {
-  ["var1"]=>
-  string(1) "a"
-  ["var2":protected]=>
-  string(1) "b"
-  ["var3":"myClass":private]=>
-  NULL
-}
-
--- Assign a value to $class2->var3 --
-$key = var3:
-bool(false)
-$class2:
-object(myClass)#%d (3) {
-  ["var1"]=>
-  string(1) "x"
-  ["var2":protected]=>
-  string(1) "y"
-  ["var3":"myClass":private]=>
-  string(1) "z"
-}
-Done
---UEXPECTF--
-*** Testing array_key_exists() : object functionality ***
-
 -- Do not assign a value to $class1->var3 --
 $key = var1:
 bool(true)
@@ -114,4 +81,4 @@ object(myClass)#2 (3) {
   [u"var3":u"myClass":private]=>
   unicode(1) "z"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_key_exists_variation1.phpt b/ext/standard/tests/array/array_key_exists_variation1.phpt
index 3fca68468cbf61cf4bf37fc0189e972cb671a8b5..b8770cb4b92e506286b7d0027211fb5ea7fc6879 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation1.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation1.phpt
@@ -201,105 +201,3 @@ bool(false)
 Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Iteration 1 --
-bool(true)
-
--- Iteration 2 --
-bool(true)
-
--- Iteration 3 --
-bool(false)
-
--- Iteration 4 --
-bool(false)
-
--- Iteration 5 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 6 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 7 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 8 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 9 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 10 --
-bool(false)
-
--- Iteration 11 --
-bool(false)
-
--- Iteration 12 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 13 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 14 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 15 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 16 --
-bool(false)
-
--- Iteration 17 --
-bool(false)
-
--- Iteration 18 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 19 --
-bool(true)
-
--- Iteration 20 --
-bool(true)
-
--- Iteration 21 --
-bool(true)
-
--- Iteration 22 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-
--- Iteration 23 --
-bool(false)
-
--- Iteration 24 --
-bool(false)
-
--- Iteration 25 --
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation2.phpt b/ext/standard/tests/array/array_key_exists_variation2.phpt
index c01a03351e4605136ec480bfc8e026c1cb97755a..12d7db7358f155974cd6e32ae7824a52c4e771c4 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation2.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation2.phpt
@@ -223,127 +223,3 @@ bool(false)
 Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 2 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 3 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 4 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 5 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 6 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 7 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 8 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 9 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 10 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 11 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 12 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 13 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 14 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 15 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 16 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 17 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 18 --
-bool(false)
-
--- Iteration 19 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 20 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 21 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 22 --
-bool(false)
-
--- Iteration 23 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 24 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-
--- Iteration 25 --
-
-Warning: array_key_exists(): The second argument should be either an array or an object in %s on line %d
-bool(false)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation3.phpt b/ext/standard/tests/array/array_key_exists_variation3.phpt
index c2c60352dd85827507178805de75df491488e4bb..dff6d8b169dc935d82304cee28a39e098f8cc084 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation3.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation3.phpt
@@ -58,30 +58,3 @@ bool(false)
 Cast float to int:
 bool(true)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Iteration 1 --
-Pass float as $key:
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-Cast float to int:
-bool(true)
-
--- Iteration 1 --
-Pass float as $key:
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-Cast float to int:
-bool(true)
-
--- Iteration 1 --
-Pass float as $key:
-
-Warning: array_key_exists(): The first argument should be either a string or an integer in %s on line %d
-bool(false)
-Cast float to int:
-bool(true)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation4.phpt b/ext/standard/tests/array/array_key_exists_variation4.phpt
index a9c7b32a32d1eb9668d11cf511b32e923942da92..1e3c81e308dc1c1dd1218729c8590f12ad9d0e5b 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation4.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation4.phpt
@@ -47,20 +47,3 @@ bool(true)
 -- Both arguments are referenced variables --
 bool(true)
 Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_key_exists() : usage variations ***
-
--- $search is a reference to $array --
-bool(true)
-
--- $key is a referenced variable --
-bool(true)
-
--- Both arguments are referenced variables --
-bool(true)
-Done

diff --git a/ext/standard/tests/array/array_key_exists_variation5.phpt b/ext/standard/tests/array/array_key_exists_variation5.phpt
index 9e7ba631def4689f40733a61a0059c9b15591b6a..40a19ccfb2e687ec618c256f640b55fa6038a05b 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation5.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation5.phpt
@@ -28,7 +28,7 @@ var_dump(array_key_exists(0, $multi_array['sub1']));
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing array_key_exists() : usage variations ***
 
 -- Attempt to match key in sub-array --
@@ -37,12 +37,3 @@ bool(false)
 -- $search arg points to sub-array --
 bool(true)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Attempt to match key in sub-array --
-bool(false)
-
--- $search arg points to sub-array --
-bool(true)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation6.phpt b/ext/standard/tests/array/array_key_exists_variation6.phpt
index 6274fb2b1f32079cacc7dca4d4521852d1a60c49..f0b080f2d464064320642834d10849e8fdb7cbfe 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation6.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation6.phpt
@@ -43,7 +43,7 @@ foreach($array as $name => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing array_key_exists() : usage variations ***
 
 -- Key in $search array is : null --
@@ -94,54 +94,3 @@ Iteration 4:  bool(true)
 Iteration 5:  bool(true)
 Iteration 6:  bool(true)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Key in $search array is : null --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-
--- Key in $search array is : NULL --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-
--- Key in $search array is : empty single quoted string --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-
--- Key in $search array is : empty double quoted string --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-
--- Key in $search array is : undefined variable --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-
--- Key in $search array is : unset variable --
-Iteration 1:  bool(true)
-Iteration 2:  bool(true)
-Iteration 3:  bool(true)
-Iteration 4:  bool(true)
-Iteration 5:  bool(true)
-Iteration 6:  bool(true)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation7.phpt b/ext/standard/tests/array/array_key_exists_variation7.phpt
index 53fd18d7c8289625cd8bf5bab6dc0a9a73cfc227..d0820e099fa1db35dd96aeee61d2a25cca16c17b 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation7.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation7.phpt
@@ -25,7 +25,7 @@ echo key($input) . " => " . current ($input) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing array_key_exists() : usage variations ***
 
 -- Call array_key_exists() --
@@ -34,12 +34,3 @@ bool(true)
 -- Position of Internal Pointer in Original Array: --
 one => un
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Call array_key_exists() --
-bool(true)
-
--- Position of Internal Pointer in Original Array: --
-one => un
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_key_exists_variation8.phpt b/ext/standard/tests/array/array_key_exists_variation8.phpt
index a3cc5db9f6842d3fc27a7d11e7ad12ed7438d0e7..81eedc881dc9c47393285ae7a19ca976378f22fa 100644 (file)
--- a/ext/standard/tests/array/array_key_exists_variation8.phpt
+++ b/ext/standard/tests/array/array_key_exists_variation8.phpt
@@ -110,7 +110,7 @@ foreach($inputs as $type => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing array_key_exists() : usage variations ***
 
 -- Iteration 1: int data --
@@ -545,438 +545,3 @@ bool(true)
 -- $key arguments are unset data:
 bool(true)
 Done
---UEXPECTF--
-*** Testing array_key_exists() : usage variations ***
-
--- Iteration 1: int data --
--- $key arguments are int data:
-bool(true)
-bool(true)
-bool(true)
-bool(true)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(true)
--- $key arguments are extreme floats data:
-bool(false)
-bool(true)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(true)
-bool(true)
--- $key arguments are bool uppercase data:
-bool(true)
-bool(true)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 2: float data --
--- $key arguments are int data:
-bool(true)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(true)
-bool(true)
-bool(true)
--- $key arguments are extreme floats data:
-bool(false)
-bool(true)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(true)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(true)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 3: extreme floats data --
--- $key arguments are int data:
-bool(true)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(true)
--- $key arguments are extreme floats data:
-bool(true)
-bool(true)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(true)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(true)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 4: null uppercase data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-
--- Iteration 5: null lowercase data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-
--- Iteration 6: bool lowercase data --
--- $key arguments are int data:
-bool(true)
-bool(true)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(true)
--- $key arguments are extreme floats data:
-bool(false)
-bool(true)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(true)
-bool(true)
--- $key arguments are bool uppercase data:
-bool(true)
-bool(true)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 7: bool uppercase data --
--- $key arguments are int data:
-bool(true)
-bool(true)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(true)
--- $key arguments are extreme floats data:
-bool(false)
-bool(true)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(true)
-bool(true)
--- $key arguments are bool uppercase data:
-bool(true)
-bool(true)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 8: empty double quotes data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-
--- Iteration 9: empty single quotes data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-
--- Iteration 10: string data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(false)
--- $key arguments are null lowercase data:
-bool(false)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(false)
--- $key arguments are empty single quotes data:
-bool(false)
--- $key arguments are string data:
-bool(true)
-bool(true)
-bool(true)
--- $key arguments are undefined data:
-bool(false)
--- $key arguments are unset data:
-bool(false)
-
--- Iteration 11: undefined data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-
--- Iteration 12: unset data --
--- $key arguments are int data:
-bool(false)
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are float data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are extreme floats data:
-bool(false)
-bool(false)
--- $key arguments are null uppercase data:
-bool(true)
--- $key arguments are null lowercase data:
-bool(true)
--- $key arguments are bool lowercase data:
-bool(false)
-bool(false)
--- $key arguments are bool uppercase data:
-bool(false)
-bool(false)
--- $key arguments are empty double quotes data:
-bool(true)
--- $key arguments are empty single quotes data:
-bool(true)
--- $key arguments are string data:
-bool(false)
-bool(false)
-bool(false)
--- $key arguments are undefined data:
-bool(true)
--- $key arguments are unset data:
-bool(true)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_keys_basic.phpt b/ext/standard/tests/array/array_keys_basic.phpt
index a770bda65774843da3501dbf491de6ae2acabe64..0e2eaba360ef428a63301a76e77f22072a970f51 100644 (file)
--- a/ext/standard/tests/array/array_keys_basic.phpt
+++ b/ext/standard/tests/array/array_keys_basic.phpt
@@ -10,22 +10,7 @@ var_dump(array_keys($basic_arr));
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on basic array operation ***
-array(5) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  int(2)
-  [3]=>
-  int(-23)
-  [4]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on basic array operation ***
 array(5) {
   [0]=>

diff --git a/ext/standard/tests/array/array_keys_error.phpt b/ext/standard/tests/array/array_keys_error.phpt
index 4522fe0098e17652381f78f5f671199a01822a18..dedf804420e4d76f5bff250dcb296229339affd1 100644 (file)
--- a/ext/standard/tests/array/array_keys_error.phpt
+++ b/ext/standard/tests/array/array_keys_error.phpt
@@ -18,33 +18,6 @@ echo "Done\n";
 Warning: array_keys() expects parameter 1 to be array, integer given in %s on line %d
 NULL
 
-Warning: array_keys() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_keys() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_keys() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: array_keys() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
-Warning: Illegal offset type in %s on line %d
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing error conditions ***
-Warning: array_keys() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
 Warning: array_keys() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_keys_variation_001.phpt b/ext/standard/tests/array/array_keys_variation_001.phpt
index 91b5744bc40fdd093ad84008004500446d6be8cd..e19696cca440b0fc33f3b14b719ff87747f39504 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_001.phpt
+++ b/ext/standard/tests/array/array_keys_variation_001.phpt
@@ -29,123 +29,7 @@ foreach ($arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on various arrays ***
--- Iteration 0 --
-array(0) {
-}
-
--- Iteration 1 --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- Iteration 2 --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- Iteration 3 --
-array(1) {
-  [0]=>
-  string(5) "Hello"
-}
-
--- Iteration 4 --
-array(1) {
-  [0]=>
-  string(0) ""
-}
-
--- Iteration 5 --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  string(1) "d"
-}
-
--- Iteration 6 --
-array(4) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-}
-
--- Iteration 7 --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-
--- Iteration 8 --
-array(5) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "a"
-  [3]=>
-  int(3)
-  [4]=>
-  int(5)
-}
-
--- Iteration 9 --
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-  [2]=>
-  string(0) ""
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-}
-
--- Iteration 10 --
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(2) "ab"
-  [2]=>
-  string(2) "cd"
-}
-
--- Iteration 11 --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  string(0) ""
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on various arrays ***
 -- Iteration 0 --
 array(0) {

diff --git a/ext/standard/tests/array/array_keys_variation_002.phpt b/ext/standard/tests/array/array_keys_variation_002.phpt
index 0aa01f69c909b59343e6b5e5706cb93183755343..83af31f42ea061d6f94f70512331adceb2b72196 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_002.phpt
+++ b/ext/standard/tests/array/array_keys_variation_002.phpt
@@ -25,32 +25,7 @@ var_dump(array_keys(array()));  // null array
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on range of values ***
-array(4) {
-  [0]=>
-  int(2147483647)
-  [1]=>
-  int(-2147483648)
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  int(0)
-}
-
-*** Testing array_keys() on an array created on the fly ***
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on range of values ***
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
index fe32075b55d113a642e1a67e02c8ff317314645c..0090e01bdadd5ef696c854a54dea2c36139e80cd 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
+++ b/ext/standard/tests/array/array_keys_variation_002_64bit.phpt
@@ -25,36 +25,7 @@ var_dump(array_keys(array()));  // null array
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on range of values ***
-array(6) {
-  [0]=>
-  int(2147483647)
-  [1]=>
-  int(2147483648)
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  int(-2147483648)
-  [4]=>
-  int(-2147483649)
-  [5]=>
-  int(0)
-}
-
-*** Testing array_keys() on an array created on the fly ***
-array(3) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-}
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on range of values ***
 array(6) {
   [0]=>

diff --git a/ext/standard/tests/array/array_keys_variation_003.phpt b/ext/standard/tests/array/array_keys_variation_003.phpt
index ccf43506387fc6abf2dfa2b2f18337de77c0b796..c27a67fee2041ff5758bf5c960685eab8f87f0b0 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_003.phpt
+++ b/ext/standard/tests/array/array_keys_variation_003.phpt
@@ -26,95 +26,7 @@ foreach ($values as $value){
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on all the types other than arrays ***
-bool(true)
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(-1)
-  [2]=>
-  string(3) "php"
-}
-bool(false)
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  string(0) ""
-}
-int(1)
-array(1) {
-  [0]=>
-  int(1)
-}
-int(0)
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(2)
-  [2]=>
-  string(3) "php"
-  [3]=>
-  string(0) ""
-}
-int(-1)
-array(1) {
-  [0]=>
-  int(-1)
-}
-string(1) "1"
-array(1) {
-  [0]=>
-  int(1)
-}
-string(1) "0"
-array(1) {
-  [0]=>
-  int(0)
-}
-string(2) "-1"
-array(1) {
-  [0]=>
-  int(-1)
-}
-NULL
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  string(0) ""
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-string(3) "php"
-array(1) {
-  [0]=>
-  string(3) "php"
-}
-string(0) ""
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  string(0) ""
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on all the types other than arrays ***
 bool(true)
 array(3) {

diff --git a/ext/standard/tests/array/array_keys_variation_004.phpt b/ext/standard/tests/array/array_keys_variation_004.phpt
index 49ca95adbd458a9e68e23aadf35eebc1276d41c5..8c72f8c38d7248af8d15374d741131323ddc946c 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_004.phpt
+++ b/ext/standard/tests/array/array_keys_variation_004.phpt
@@ -25,48 +25,7 @@ foreach ($values as $value){
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_keys() on all the types other than arrays ***
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(1)
-}
-array(1) {
-  [0]=>
-  int(0)
-}
-array(1) {
-  [0]=>
-  int(-1)
-}
-array(1) {
-  [0]=>
-  int(2)
-}
-array(1) {
-  [0]=>
-  int(3)
-}
-array(1) {
-  [0]=>
-  string(3) "php"
-}
-array(1) {
-  [0]=>
-  string(0) ""
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_keys() on all the types other than arrays ***
 array(0) {
 }

diff --git a/ext/standard/tests/array/array_keys_variation_005.phpt b/ext/standard/tests/array/array_keys_variation_005.phpt
index 9a912d68ed8495833fbb7f10df42f11a8a0c81d6..ee37400801164f135a2821a95ecdc0beeae95c5a 100644 (file)
--- a/ext/standard/tests/array/array_keys_variation_005.phpt
+++ b/ext/standard/tests/array/array_keys_variation_005.phpt
@@ -20,7 +20,7 @@ fclose( $resource1 );
 closedir( $resource2 );
 
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing array_keys() with resource type ***
 array(1) {
   [0]=>

diff --git a/ext/standard/tests/array/array_map_001.phpt b/ext/standard/tests/array/array_map_001.phpt
index e4dd279ff744f27c464b965fd23008da273257b9..868d5ff374e8bd7b625755cfe0e10da3a4bd429f 100644 (file)
--- a/ext/standard/tests/array/array_map_001.phpt
+++ b/ext/standard/tests/array/array_map_001.phpt
@@ -17,11 +17,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: array_map(): An error occurred while invoking the map callback in %s on line %d
-string(17) "exception caught!"
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: array_map(): An error occurred while invoking the map callback in %s on line %d
 unicode(17) "exception caught!"
 Done

diff --git a/ext/standard/tests/array/array_map_basic.phpt b/ext/standard/tests/array/array_map_basic.phpt
index 5eab9c6bf755fb6dd13a0ccf1daf31ca48bdb27f..a8670e99f7d45e2756d773bbfd5475ed2299e3b4 100644 (file)
--- a/ext/standard/tests/array/array_map_basic.phpt
+++ b/ext/standard/tests/array/array_map_basic.phpt
@@ -40,35 +40,7 @@ var_dump( array_map('concatenate', $arr1, $arr2) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : basic functionality ***
--- With two integer array --
-array(3) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(10)
-  [2]=>
-  int(18)
-}
--- With single integer array --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(4)
-  [2]=>
-  int(9)
-}
--- With string array --
-array(2) {
-  [0]=>
-  string(12) "one = single"
-  [1]=>
-  string(12) "two = double"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : basic functionality ***
 -- With two integer array --
 array(3) {
@@ -95,4 +67,4 @@ array(2) {
   [1]=>
   unicode(12) "two = double"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_error.phpt b/ext/standard/tests/array/array_map_error.phpt
index 78924d31667478009fcc3f7e729a50660f925dc4..d59ba0a60d92bf2d1975dc8a1b6b1e250042cb30 100644 (file)
--- a/ext/standard/tests/array/array_map_error.phpt
+++ b/ext/standard/tests/array/array_map_error.phpt
@@ -39,43 +39,6 @@ echo "Done";
 
 -- Testing array_map() function with Zero arguments --
 
-Warning: array_map() expects at least 2 parameters, 0 given in %s on line %d%d
-NULL
-
--- Testing array_map() function with one less than expected no. of arguments --
-
-Warning: array_map() expects at least 2 parameters, 1 given in %s on line %d%d
-NULL
-
--- Testing array_map() function with less no. of arrays than callback function arguments --
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: q in %s on line %d%d
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: q in %s on line %d%d
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-}
-
--- Testing array_map() function with more no. of arrays than callback function arguments --
-array(2) {
-  [0]=>
-  int(3)
-  [1]=>
-  int(8)
-}
-Done
---UEXPECTF--
-*** Testing array_map() : error conditions ***
-
--- Testing array_map() function with Zero arguments --
-
 Warning: array_map() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_map_object2.phpt b/ext/standard/tests/array/array_map_object2.phpt
index bf004973f8ca6c570aeca2b667409eae3ae9b32f..1b181b0593f51de2a6d7e0c35362f2313582a6f0 100644 (file)
--- a/ext/standard/tests/array/array_map_object2.phpt
+++ b/ext/standard/tests/array/array_map_object2.phpt
@@ -44,14 +44,3 @@ NULL
 Warning: array_map() expects parameter 1 to be a valid callback, class 'SimpleClass' does not have a method 'non-existent' in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() :  with non-existent class and method ***
--- with non-existent class --
-
-Warning: array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name in %s on line %d
-NULL
--- with existent class and non-existent method --
-
-Warning: array_map() expects parameter 1 to be a valid callback, class 'SimpleClass' does not have a method 'non-existent' in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_object3.phpt b/ext/standard/tests/array/array_map_object3.phpt
index 66e1c994145a58cbb794772b83160d3a15ac5016..d1a6d8062955da7694941b985fe9818db28f2a3a 100644 (file)
--- a/ext/standard/tests/array/array_map_object3.phpt
+++ b/ext/standard/tests/array/array_map_object3.phpt
@@ -90,32 +90,3 @@ array(3) {
 Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : class methods as callback function ***
--- accessing parent method from child class --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(7)
-}
--- accessing child method from parent class --
-
-Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
-NULL
--- accessing parent method using child class object --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(7)
-}
--- accessing child method using parent class object --
-
-Warning: array_map() expects parameter 1 to be a valid callback, class 'ParentClass' does not have a method 'staticchild' in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation1.phpt b/ext/standard/tests/array/array_map_variation1.phpt
index c55ff5d7374b55a2e7cdc295704cadf535a1cb07..0e41e1e69ff88129dde16e569678a28ddad0d9f6 100644 (file)
--- a/ext/standard/tests/array/array_map_variation1.phpt
+++ b/ext/standard/tests/array/array_map_variation1.phpt
@@ -23,38 +23,6 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing array_map() : string keys ***
-array(1) {
-  ["stringkey"]=>
-  array(1) {
-    [0]=>
-    string(5) "value"
-  }
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(5) "value"
-    [1]=>
-    string(5) "value"
-  }
-}
-array(1) {
-  ["stringkey"]=>
-  string(5) "value"
-}
-array(1) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(5) "value"
-    [1]=>
-    string(5) "value"
-  }
-}
-Done
---UEXPECT--
-*** Testing array_map() : string keys ***
 array(1) {
   [u"stringkey"]=>
   array(1) {
@@ -84,4 +52,4 @@ array(1) {
     unicode(5) "value"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_variation10.phpt b/ext/standard/tests/array/array_map_variation10.phpt
index 8e4063a43b1ae6b3f220f00b73b4acf0d8002333..cc75436999d08a0d1a7a88251a5d3e18e374ede2 100644 (file)
--- a/ext/standard/tests/array/array_map_variation10.phpt
+++ b/ext/standard/tests/array/array_map_variation10.phpt
@@ -118,88 +118,3 @@ array(3) {
 Warning: array_map(): Argument #2 should be an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : anonymous callback function ***
--- anonymous function with all parameters and body --
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(3)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(4)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    int(5)
-  }
-}
--- anonymous function with two parameters and passing one array --
-
-Warning: Missing argument 2 for __lambda_func() in %s(20) : runtime-created function on line %d
-
-Notice: Undefined variable: b in %s(20) : runtime-created function on line %d
-
-Warning: Missing argument 2 for __lambda_func() in %s(20) : runtime-created function on line %d
-
-Notice: Undefined variable: b in %s(20) : runtime-created function on line %d
-
-Warning: Missing argument 2 for __lambda_func() in %s(20) : runtime-created function on line %d
-
-Notice: Undefined variable: b in %s(20) : runtime-created function on line %d
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    NULL
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    NULL
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(3)
-    [1]=>
-    NULL
-  }
-}
--- anonymous function with NULL parameter --
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
--- anonymous function with NULL body --
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
--- passing NULL as 'arr1' --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation11.phpt b/ext/standard/tests/array/array_map_variation11.phpt
index 34d7054ad4274f5e6a4e476dbad543d7eb149ab0..6a17b299ee448033d1d7b832af12ae988b00f8cb 100644 (file)
--- a/ext/standard/tests/array/array_map_variation11.phpt
+++ b/ext/standard/tests/array/array_map_variation11.phpt
@@ -26,31 +26,7 @@ var_dump( array_map('square_recur_single_array', $array1));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : recursive callback function ***
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  array(3) {
-    [0]=>
-    int(4)
-    [1]=>
-    int(9)
-    [2]=>
-    array(1) {
-      [0]=>
-      int(25)
-    }
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(16)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : recursive callback function ***
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/array_map_variation12.phpt b/ext/standard/tests/array/array_map_variation12.phpt
index 4d187baac184a50db8c9a131441e710f745adcb5..5c6d9fb97a69ad0d6b457e5f2fc8cb9d608dd0c0 100644 (file)
--- a/ext/standard/tests/array/array_map_variation12.phpt
+++ b/ext/standard/tests/array/array_map_variation12.phpt
@@ -58,34 +58,3 @@ array(3) {
 Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : built-in function ***
--- with built-in function 'pow' and two parameters --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(16)
-  [2]=>
-  int(243)
-}
--- with built-in function 'pow' and one parameter --
-
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
-
-Warning: pow() expects exactly 2 parameters, 1 given in %s on line %d
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
--- with language construct --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation13.phpt b/ext/standard/tests/array/array_map_variation13.phpt
index 002c18e64122939638108bf50d83ecc2894b87c9..1558f5178f0e370c6a430bdb622d3b91a98282cd 100644 (file)
--- a/ext/standard/tests/array/array_map_variation13.phpt
+++ b/ext/standard/tests/array/array_map_variation13.phpt
@@ -54,58 +54,7 @@ var_dump( array_map('callback_without_ret', $array1));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : callback with diff return value ***
--- with integer return value --
-array(3) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(6)
-  [2]=>
-  int(8)
-}
--- with string return value --
-array(3) {
-  [0]=>
-  string(2) "13"
-  [1]=>
-  string(2) "24"
-  [2]=>
-  string(2) "35"
-}
--- with bool return value --
-array(3) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(true)
-}
--- with null return value --
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
--- with no return value --
-callback_without_ret called
-callback_without_ret called
-callback_without_ret called
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : callback with diff return value ***
 -- with integer return value --
 array(3) {

diff --git a/ext/standard/tests/array/array_map_variation14.phpt b/ext/standard/tests/array/array_map_variation14.phpt
index 6400789731f4ee4858c3106a81c807522ec278e2..80a0bcbdf8f0278fa86c5e59e32b961ee730e3b3 100644 (file)
--- a/ext/standard/tests/array/array_map_variation14.phpt
+++ b/ext/standard/tests/array/array_map_variation14.phpt
@@ -46,86 +46,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : null value for 'callback' argument ***
 -- with null --
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    string(3) "one"
-    [2]=>
-    float(1.1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    string(3) "two"
-    [2]=>
-    float(2.2)
-  }
-}
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    string(3) "one"
-    [2]=>
-    float(1.1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    string(3) "two"
-    [2]=>
-    float(2.2)
-  }
-}
--- with unset variable --
-array(2) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    string(3) "one"
-    [2]=>
-    float(1.1)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    string(3) "two"
-    [2]=>
-    float(2.2)
-  }
-}
--- with undefined variable --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- with empty string --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- with empty array --
-
-Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_map() : null value for 'callback' argument ***
--- with null --
 array(2) {
   [0]=>
   array(3) {

diff --git a/ext/standard/tests/array/array_map_variation15.phpt b/ext/standard/tests/array/array_map_variation15.phpt
index c164bbfec59e9e89f91f2dcb2f0d6a2d4c32a0cf..b29af47713ffb42182521a39671ddaa8c3c7a4ed 100644 (file)
--- a/ext/standard/tests/array/array_map_variation15.phpt
+++ b/ext/standard/tests/array/array_map_variation15.phpt
@@ -28,9 +28,3 @@ echo "Done";
 Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : non existent 'callback' function ***
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation16.phpt b/ext/standard/tests/array/array_map_variation16.phpt
index e3f4bcc1aa433a7fd1ec3121391d95d03728eaca..c4987cb385405f128e3ded2073cc8c5e349096bb 100644 (file)
--- a/ext/standard/tests/array/array_map_variation16.phpt
+++ b/ext/standard/tests/array/array_map_variation16.phpt
@@ -71,38 +71,3 @@ NULL
 Warning: array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : non-permmited built-in functions ***
--- Iteration 1 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'array' not found or invalid function name in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'empty' not found or invalid function name in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'eval' not found or invalid function name in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'isset' not found or invalid function name in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'list' not found or invalid function name in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_map() expects parameter 1 to be a valid callback, function 'print' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation17.phpt b/ext/standard/tests/array/array_map_variation17.phpt
index 526f8b915effab59117107782dc42ccc99475922..d9440bb2c17c95add8dacc4440c7146bad2022af 100644 (file)
--- a/ext/standard/tests/array/array_map_variation17.phpt
+++ b/ext/standard/tests/array/array_map_variation17.phpt
@@ -156,86 +156,3 @@ NULL
 Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_map() : unexpected values for 'callback' argument ***
-
--- Iteration 1 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_map() expects parameter 1 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
--- Iteration 16 --
-Warning: array_map() expects parameter 1 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_map() expects parameter 1 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_map() expects parameter 1 to be a valid callback, no array or string given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_map_variation18.phpt b/ext/standard/tests/array/array_map_variation18.phpt
index c369c3c52fc73d81902b21f6583202181f208e28..8170fb8466c00d7600642c2de5e16c88f9bcaba9 100644 (file)
--- a/ext/standard/tests/array/array_map_variation18.phpt
+++ b/ext/standard/tests/array/array_map_variation18.phpt
@@ -104,109 +104,6 @@ echo "Done";
 *** Testing array_map() : unexpected values for 'arr1' ***
 -- Iteration 1 --
 
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 2 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 3 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 4 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 5 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 6 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 7 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 8 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 9 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 10 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 11 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 12 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 13 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 14 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 15 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 16 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 17 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 18 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 19 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 20 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 21 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 22 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 23 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 24 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
--- Iteration 25 --
-
-Warning: array_map(): Argument #2 should be an array in %s on line %d%d
-NULL
-Done
---UEXPECTF--
-*** Testing array_map() : unexpected values for 'arr1' ***
--- Iteration 1 --
-
 Warning: array_map(): Argument #2 should be an array in %s on line %d
 NULL
 -- Iteration 2 --

diff --git a/ext/standard/tests/array/array_map_variation2.phpt b/ext/standard/tests/array/array_map_variation2.phpt
index ce25869e9854bf96eaaa66560d5c2e109df6662e..6b6f29b31560b316fdc851cae09497cc7e971311 100644 (file)
--- a/ext/standard/tests/array/array_map_variation2.phpt
+++ b/ext/standard/tests/array/array_map_variation2.phpt
@@ -27,254 +27,6 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing array_map() : references ***
-string(2) "v1"
-string(2) "v2"
-string(2) "v1"
-array(4) {
-  ["k1"]=>
-  &string(2) "v1"
-  ["k2"]=>
-  string(2) "v2"
-  [0]=>
-  &string(2) "v1"
-  [1]=>
-  &array(4) {
-    ["k1"]=>
-    &string(2) "v1"
-    ["k2"]=>
-    string(2) "v2"
-    [0]=>
-    &string(2) "v1"
-    [1]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      *RECURSION*
-    }
-  }
-}
-array(4) {
-  ["k1"]=>
-  array(1) {
-    [0]=>
-    string(2) "v1"
-  }
-  ["k2"]=>
-  array(1) {
-    [0]=>
-    string(2) "v2"
-  }
-  [0]=>
-  array(1) {
-    [0]=>
-    string(2) "v1"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      &array(4) {
-        ["k1"]=>
-        &string(2) "v1"
-        ["k2"]=>
-        string(2) "v2"
-        [0]=>
-        &string(2) "v1"
-        [1]=>
-        &array(4) {
-          ["k1"]=>
-          &string(2) "v1"
-          ["k2"]=>
-          string(2) "v2"
-          [0]=>
-          &string(2) "v1"
-          [1]=>
-          *RECURSION*
-        }
-      }
-    }
-  }
-}
-string(2) "v1"
-string(2) "v2"
-string(2) "v1"
-array(4) {
-  ["k1"]=>
-  &string(2) "v1"
-  ["k2"]=>
-  string(2) "v2"
-  [0]=>
-  &string(2) "v1"
-  [1]=>
-  &array(4) {
-    ["k1"]=>
-    &string(2) "v1"
-    ["k2"]=>
-    string(2) "v2"
-    [0]=>
-    &string(2) "v1"
-    [1]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      *RECURSION*
-    }
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    &string(2) "v1"
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    string(2) "v2"
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    &string(2) "v1"
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      &array(4) {
-        ["k1"]=>
-        &string(2) "v1"
-        ["k2"]=>
-        string(2) "v2"
-        [0]=>
-        &string(2) "v1"
-        [1]=>
-        *RECURSION*
-      }
-    }
-  }
-}
-array(4) {
-  ["k1"]=>
-  &string(2) "v1"
-  ["k2"]=>
-  string(2) "v2"
-  [0]=>
-  &string(2) "v1"
-  [1]=>
-  &array(4) {
-    ["k1"]=>
-    &string(2) "v1"
-    ["k2"]=>
-    string(2) "v2"
-    [0]=>
-    &string(2) "v1"
-    [1]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      *RECURSION*
-    }
-  }
-}
-array(4) {
-  [0]=>
-  array(2) {
-    [0]=>
-    &string(2) "v1"
-    [1]=>
-    &string(2) "v1"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(2) "v2"
-    [1]=>
-    string(2) "v2"
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    &string(2) "v1"
-    [1]=>
-    &string(2) "v1"
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      &array(4) {
-        ["k1"]=>
-        &string(2) "v1"
-        ["k2"]=>
-        string(2) "v2"
-        [0]=>
-        &string(2) "v1"
-        [1]=>
-        *RECURSION*
-      }
-    }
-    [1]=>
-    &array(4) {
-      ["k1"]=>
-      &string(2) "v1"
-      ["k2"]=>
-      string(2) "v2"
-      [0]=>
-      &string(2) "v1"
-      [1]=>
-      &array(4) {
-        ["k1"]=>
-        &string(2) "v1"
-        ["k2"]=>
-        string(2) "v2"
-        [0]=>
-        &string(2) "v1"
-        [1]=>
-        *RECURSION*
-      }
-    }
-  }
-}
-Done
---UEXPECT--
-*** Testing array_map() : references ***
 unicode(2) "v1"
 unicode(2) "v2"
 unicode(2) "v1"

diff --git a/ext/standard/tests/array/array_map_variation3.phpt b/ext/standard/tests/array/array_map_variation3.phpt
index eadf4e641579b68cbaebb43710e0bb012ebc65d9..c40631f96ba8ad4f782b79e62b3092fe99e54bf0 100644 (file)
--- a/ext/standard/tests/array/array_map_variation3.phpt
+++ b/ext/standard/tests/array/array_map_variation3.phpt
@@ -56,176 +56,7 @@ foreach($arrays as $arr1) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : different arrays for 'arr1' argument ***
--- Iteration 1 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
--- Iteration 4 --
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iteration 5 --
-array(0) {
-}
--- Iteration 6 --
-array(1) {
-  [0]=>
-  NULL
-}
--- Iteration 7 --
-array(6) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(4) "aaaa"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(4) "bbbb"
-  [4]=>
-  string(1) "c"
-  [5]=>
-  string(5) "ccccc"
-}
--- Iteration 8 --
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-}
--- Iteration 9 --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
--- Iteration 10 --
-array(4) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(20)
-  [4]=>
-  int(40)
-  [3]=>
-  int(30)
-}
--- Iteration 11 --
-array(3) {
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  ["three"]=>
-  string(6) "thirty"
-}
--- Iteration 12 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [2]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
--- Iteration 13 --
-array(3) {
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
--- Iteration 14 --
-array(4) {
-  [1]=>
-  string(4) "true"
-  [0]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- Iteration 15 --
-array(3) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
--- Iteration 16 --
-array(6) {
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
--- Iteration 17 --
-array(3) {
-  [""]=>
-  int(4)
-  [0]=>
-  int(5)
-  [1]=>
-  int(6)
-}
--- Iteration 18 --
-array(3) {
-  ["One"]=>
-  int(10)
-  ["two"]=>
-  int(20)
-  ["three"]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : different arrays for 'arr1' argument ***
 -- Iteration 1 --
 array(2) {
@@ -393,4 +224,4 @@ array(3) {
   [u"three"]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_variation4.phpt b/ext/standard/tests/array/array_map_variation4.phpt
index bbf975de9bbd20060021f9d54ba1abc81b3a235e..548d1634b6547eea85fbb9ac756498ed0d8f324c 100644 (file)
--- a/ext/standard/tests/array/array_map_variation4.phpt
+++ b/ext/standard/tests/array/array_map_variation4.phpt
@@ -79,107 +79,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : associative array with diff. keys for 'arr1' argument ***
 
-Warning: Illegal offset type in %s on line %d%d
-
-Warning: Illegal offset type in %s on line %d%d
-
-Warning: Illegal offset type in %s on line %d%d
-
-Warning: Illegal offset type in %s on line %d%d
--- Iteration 1 --
-array(0) {
-}
--- Iteration 2 --
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  string(1) "1"
-}
--- Iteration 4 --
-array(4) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "3"
-  [4]=>
-  string(1) "4"
-}
--- Iteration 5 --
-array(1) {
-  [2]=>
-  string(5) "float"
-}
--- Iteration 6 --
-array(4) {
-  [1]=>
-  string(2) "f1"
-  [3]=>
-  string(2) "f2"
-  [4]=>
-  string(2) "f3"
-  [33333333]=>
-  string(2) "f4"
-}
--- Iteration 7 --
-array(4) {
-  ["\tHello"]=>
-  int(111)
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen\n"]=>
-  int(33)
-}
--- Iteration 8 --
-array(4) {
-  ["   Hello"]=>
-  int(111)
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen
-"]=>
-  int(33)
-}
--- Iteration 9 --
-array(2) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iteration 10 --
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
--- Iteration 11 --
-array(6) {
-  ["hello"]=>
-  int(1)
-  ["fruit"]=>
-  float(2.2)
-  [133]=>
-  string(3) "int"
-  [444]=>
-  string(5) "float"
-  [""]=>
-  string(5) "unset"
-  ["Hello world"]=>
-  string(7) "heredoc"
-}
-Done
---UEXPECTF--
-*** Testing array_map() : associative array with diff. keys for 'arr1' argument ***
-
 Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d

diff --git a/ext/standard/tests/array/array_map_variation5.phpt b/ext/standard/tests/array/array_map_variation5.phpt
index fc469ef14e5615c84533527d207f8a74d54f5831..55fddc9362c5eb27f35e849fe20088256112e9e5 100644 (file)
--- a/ext/standard/tests/array/array_map_variation5.phpt
+++ b/ext/standard/tests/array/array_map_variation5.phpt
@@ -92,109 +92,6 @@ array(1) {
   int(1)
 }
 -- Iteration 4 --
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [4]=>
-  int(4)
-}
--- Iteration 5 --
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-array(4) {
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [3]=>
-  float(4.8999992284)
-  ["f4"]=>
-  float(33333333.3333)
-}
--- Iteration 7 --
-array(4) {
-  [111]=>
-  string(6) "  Hello"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(7) "\v\fworld"
-  [3]=>
-  string(4) "pen
-"
-}
--- Iteration 8 --
-array(4) {
-  [111]=>
-  string(7) "\tHello"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(9) "\v\fworld"
-  [3]=>
-  string(5) "pen\n"
-}
--- Iteration 9 --
-array(2) {
-  [1]=>
-  string(5) "hello"
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iteration 10 --
-array(3) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["unset"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
--- Iteration 11 --
-array(8) {
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [222]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  ["float"]=>
-  float(444.432)
-  ["unset"]=>
-  NULL
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-Done
---UEXPECTF--
-*** Testing array_map() : associative array with diff. values for 'arr1' argument ***
--- Iteration 1 --
-array(0) {
-}
--- Iteration 2 --
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 3 --
-array(1) {
-  [1]=>
-  int(1)
-}
--- Iteration 4 --
 array(4) {
   [u"one"]=>
   int(1)

diff --git a/ext/standard/tests/array/array_map_variation6.phpt b/ext/standard/tests/array/array_map_variation6.phpt
index ffc34b7580a5b94594b7064d0d80bfa81f627674..f310e031683dc0bb719b16d7ed04ea6c1cf63434 100644 (file)
--- a/ext/standard/tests/array/array_map_variation6.phpt
+++ b/ext/standard/tests/array/array_map_variation6.phpt
@@ -30,47 +30,7 @@ $arr1 = array(
 var_dump( array_map('callback', $arr1));
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : array having subarrays ***
-array(5) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-  }
-  [3]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    string(1) "a"
-    [3]=>
-    string(1) "b"
-  }
-  [4]=>
-  array(2) {
-    [1]=>
-    string(1) "a"
-    ["b"]=>
-    int(2)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : array having subarrays ***
 array(5) {
   [0]=>
@@ -109,4 +69,4 @@ array(5) {
     int(2)
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_variation7.phpt b/ext/standard/tests/array/array_map_variation7.phpt
index 412f50af1a7afd1ff551d2bd912a89065829a5cd..c7177d31994a4d51ea32f974f1f60cbace0a5c8a 100644 (file)
--- a/ext/standard/tests/array/array_map_variation7.phpt
+++ b/ext/standard/tests/array/array_map_variation7.phpt
@@ -32,95 +32,7 @@ var_dump( array_map('callback', array(), array(1, 2, 3), array('a', 'b')) );  //
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : arrays with diff. size ***
-array(3) {
-  [0]=>
-  array(1) {
-    [1]=>
-    NULL
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    NULL
-  }
-  [2]=>
-  array(1) {
-    [3]=>
-    NULL
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [""]=>
-    string(1) "a"
-  }
-  [1]=>
-  array(1) {
-    [""]=>
-    string(1) "b"
-  }
-  [2]=>
-  array(1) {
-    [""]=>
-    string(1) "c"
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [1]=>
-    string(1) "a"
-  }
-  [1]=>
-  array(1) {
-    [2]=>
-    string(1) "b"
-  }
-  [2]=>
-  array(1) {
-    [3]=>
-    NULL
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [10]=>
-    float(2.3)
-  }
-  [1]=>
-  array(1) {
-    [47]=>
-    float(1240)
-  }
-  [2]=>
-  array(1) {
-    [26]=>
-    NULL
-  }
-}
-array(3) {
-  [0]=>
-  array(1) {
-    [""]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [""]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [""]=>
-    int(3)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : arrays with diff. size ***
 array(3) {
   [0]=>
@@ -207,4 +119,4 @@ array(3) {
     int(3)
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_variation8.phpt b/ext/standard/tests/array/array_map_variation8.phpt
index 293d3be7d74e0b41707e225eaedb4b3b046db948..6043ee7e186f2dc4472c8c8bf72a7301bed4f22c 100644 (file)
--- a/ext/standard/tests/array/array_map_variation8.phpt
+++ b/ext/standard/tests/array/array_map_variation8.phpt
@@ -46,40 +46,7 @@ var_dump( array_map('callback_cat', $arr1, $arr1) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_map() : array with references for 'arr1' argument ***
--- with one array --
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  int(0)
-  ["hello"]=>
-  string(5) "hello"
-}
--- with two arrays --
-array(6) {
-  [0]=>
-  string(2) "00"
-  [1]=>
-  string(10) "hellohello"
-  [2]=>
-  string(10) "hellohello"
-  [3]=>
-  string(10) "hellohello"
-  [4]=>
-  string(2) "00"
-  [5]=>
-  string(10) "hellohello"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_map() : array with references for 'arr1' argument ***
 -- with one array --
 array(6) {
@@ -111,4 +78,4 @@ array(6) {
   [5]=>
   unicode(10) "hellohello"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_map_variation9.phpt b/ext/standard/tests/array/array_map_variation9.phpt
index dc28838d2e21359107e85f0742a42677ce3d9fb0..92dcc2c78c903361b318927de488e38615bf2030 100644 (file)
--- a/ext/standard/tests/array/array_map_variation9.phpt
+++ b/ext/standard/tests/array/array_map_variation9.phpt
@@ -36,59 +36,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_map() : array with binary data for 'arr1' argument ***
 -- checking binary safe array with one parameter callback function --
-array(4) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  [2]=>
-  string(1) "1"
-  [3]=>
-  string(5) "22.22"
-}
--- checking binary safe array with two parameter callback function --
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: b in %s on line %d%d
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: b in %s on line %d%d
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: b in %s on line %d%d
-
-Warning: Missing argument 2 for callback2() in %s on line %d%d
-
-Notice: Undefined variable: b in %s on line %d%d
-array(4) {
-  [0]=>
-  array(1) {
-    ["hello"]=>
-    NULL
-  }
-  [1]=>
-  array(1) {
-    ["world"]=>
-    NULL
-  }
-  [2]=>
-  array(1) {
-    [1]=>
-    NULL
-  }
-  [3]=>
-  array(1) {
-    ["22.22"]=>
-    NULL
-  }
-}
-Done
---UEXPECTF--
-*** Testing array_map() : array with binary data for 'arr1' argument ***
--- checking binary safe array with one parameter callback function --
 array(4) {
   [0]=>
   string(5) "hello"

diff --git a/ext/standard/tests/array/array_merge.phpt b/ext/standard/tests/array/array_merge.phpt
index 72142373f6be2f832988ad07f5ea73d0b660e27e..8067ef5dd664d055ba19287bdd9982acc714e3c3 100644 (file)
--- a/ext/standard/tests/array/array_merge.phpt
+++ b/ext/standard/tests/array/array_merge.phpt
@@ -636,681 +636,6 @@ Array
 
 )
 
-*** Testing array_merge() with three or more arrays ***
-array(12) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(6) "string"
-  [2]=>
-  NULL
-  [3]=>
-  float(-2.344)
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  string(6) "string"
-  ["c"]=>
-  NULL
-  ["d"]=>
-  float(-2.344)
-  [4]=>
-  NULL
-  [5]=>
-  string(2) "Hi"
-  ["string"]=>
-  string(5) "hello"
-  [6]=>
-  array(3) {
-    [""]=>
-    string(5) "World"
-    ["-2.34"]=>
-    string(1) "a"
-    [0]=>
-    string(1) "b"
-  }
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(6) "string"
-  [2]=>
-  NULL
-  [3]=>
-  float(-2.344)
-  [4]=>
-  string(12) "array on fly"
-  ["nullarray"]=>
-  array(0) {
-  }
-}
-
-*** Testing single array argument ***
-array(0) {
-}
-array(4) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  string(6) "string"
-  ["c"]=>
-  NULL
-  ["d"]=>
-  float(-2.344)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(6) "string"
-  [2]=>
-  NULL
-  [3]=>
-  float(-2.344)
-}
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  string(2) "Hi"
-  ["string"]=>
-  string(5) "hello"
-  [2]=>
-  array(3) {
-    [""]=>
-    string(5) "World"
-    ["-2.34"]=>
-    string(1) "a"
-    [0]=>
-    string(1) "b"
-  }
-}
-
-*** Testing array_merge() with typecasting non-array to array ***
-array(7) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  string(6) "string"
-  ["c"]=>
-  NULL
-  ["d"]=>
-  float(-2.344)
-  [0]=>
-  string(5) "type1"
-  [1]=>
-  int(10)
-  [2]=>
-  float(12.34)
-}
-
-*** Testing error conditions ***
-Warning: Wrong parameter count for array_merge() in %s on line %d
-NULL
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
-Warning: array_merge(): Argument #3 is not an array in %s on line %d
-NULL
-
-Notice: Undefined variable: arr4 in %s on line %d
-
-Warning: array_merge(): Argument #3 is not an array in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_merge() basic functionality ***
-
---- Iteration 0 ---
--- Inner iteration 0 of Iteration 0 --
-Array
-(
-)
-
--- Inner iteration 1 of Iteration 0 --
-Array
-(
-    [0] => string
-)
-
--- Inner iteration 2 of Iteration 0 --
-Array
-(
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 0 --
-Array
-(
-    [0] => 12
-)
-
--- Inner iteration 4 of Iteration 0 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 0 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-)
-
--- Inner iteration 6 of Iteration 0 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 1 ---
--- Inner iteration 0 of Iteration 1 --
-Array
-(
-    [0] => string
-)
-
--- Inner iteration 1 of Iteration 1 --
-Array
-(
-    [0] => string
-    [1] => string
-)
-
--- Inner iteration 2 of Iteration 1 --
-Array
-(
-    [0] => string
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 1 --
-Array
-(
-    [0] => string
-    [1] => 12
-)
-
--- Inner iteration 4 of Iteration 1 --
-Array
-(
-    [0] => string
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 1 --
-Array
-(
-    [0] => string
-    [1] => 1
-    [2] => string
-    [3] => 
-    [4] => -2.344
-)
-
--- Inner iteration 6 of Iteration 1 --
-Array
-(
-    [0] => string
-    [1] => 
-    [2] => Hi
-    [string] => hello
-    [3] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 2 ---
--- Inner iteration 0 of Iteration 2 --
-Array
-(
-    [] => string
-)
-
--- Inner iteration 1 of Iteration 2 --
-Array
-(
-    [] => string
-    [0] => string
-)
-
--- Inner iteration 2 of Iteration 2 --
-Array
-(
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 2 --
-Array
-(
-    [] => string
-    [0] => 12
-)
-
--- Inner iteration 4 of Iteration 2 --
-Array
-(
-    [] => string
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 2 --
-Array
-(
-    [] => string
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-)
-
--- Inner iteration 6 of Iteration 2 --
-Array
-(
-    [] => string
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 3 ---
--- Inner iteration 0 of Iteration 3 --
-Array
-(
-    [0] => 12
-)
-
--- Inner iteration 1 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [1] => string
-)
-
--- Inner iteration 2 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [1] => 12
-)
-
--- Inner iteration 4 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [1] => 1
-    [2] => string
-    [3] => 
-    [4] => -2.344
-)
-
--- Inner iteration 6 of Iteration 3 --
-Array
-(
-    [0] => 12
-    [1] => 
-    [2] => Hi
-    [string] => hello
-    [3] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 4 ---
--- Inner iteration 0 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 1 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-    [0] => string
-)
-
--- Inner iteration 2 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-    [0] => 12
-)
-
--- Inner iteration 4 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-)
-
--- Inner iteration 6 of Iteration 4 --
-Array
-(
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 5 ---
--- Inner iteration 0 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-)
-
--- Inner iteration 1 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [4] => string
-)
-
--- Inner iteration 2 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [4] => 12
-)
-
--- Inner iteration 4 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [4] => 1
-    [5] => string
-    [6] => 
-    [7] => -2.344
-)
-
--- Inner iteration 6 of Iteration 5 --
-Array
-(
-    [0] => 1
-    [1] => string
-    [2] => 
-    [3] => -2.344
-    [4] => 
-    [5] => Hi
-    [string] => hello
-    [6] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
-
---- Iteration 6 ---
--- Inner iteration 0 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
--- Inner iteration 1 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [3] => string
-)
-
--- Inner iteration 2 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [] => string
-)
-
--- Inner iteration 3 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [3] => 12
-)
-
--- Inner iteration 4 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [a] => 1
-    [b] => string
-    [c] => 
-    [d] => -2.344
-)
-
--- Inner iteration 5 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [3] => 1
-    [4] => string
-    [5] => 
-    [6] => -2.344
-)
-
--- Inner iteration 6 of Iteration 6 --
-Array
-(
-    [0] => 
-    [1] => Hi
-    [string] => hello
-    [2] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-    [3] => 
-    [4] => Hi
-    [5] => Array
-        (
-            [] => World
-            [-2.34] => a
-            [0] => b
-        )
-
-)
-
 *** Testing array_merge() with three or more arrays ***
 array(12) {
   [0]=>

diff --git a/ext/standard/tests/array/array_merge_basic.phpt b/ext/standard/tests/array/array_merge_basic.phpt
index 2ffe88fa26b9efb6e737210ff6ec752af070321d..25439360adc0b224a588ff99ad5be4aa317e245a 100644 (file)
--- a/ext/standard/tests/array/array_merge_basic.phpt
+++ b/ext/standard/tests/array/array_merge_basic.phpt
@@ -25,38 +25,7 @@ var_dump(array_merge($array2, $array1));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : basic functionality ***
-array(6) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-}
-array(6) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : basic functionality ***
 array(6) {
   [0]=>
@@ -86,4 +55,4 @@ array(6) {
   [2]=>
   unicode(3) "two"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_error.phpt b/ext/standard/tests/array/array_merge_error.phpt
index 97b755b61515066c5cdaff6ae761e59f620d2593..613e5a65d908512f013b42b952a80cf2646c1318 100644 (file)
--- a/ext/standard/tests/array/array_merge_error.phpt
+++ b/ext/standard/tests/array/array_merge_error.phpt
@@ -28,11 +28,3 @@ echo "Done";
 Warning: Wrong parameter count for array_merge() in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_merge() : error conditions ***
-
--- Testing array_merge() function with less than expected no. of arguments --
-
-Warning: Wrong parameter count for array_merge() in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_merge_recursive_basic1.phpt b/ext/standard/tests/array/array_merge_recursive_basic1.phpt
index a654cf163fe7d868ced7ff91c928b5dc0cbc1cf6..49d8237669f7289c5d6069d6ee982ae1b393dc10 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_basic1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_basic1.phpt
@@ -25,77 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : array with default keys ***
--- With default argument --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
--- With more arguments --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  int(3)
-  [3]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  int(3)
-  [3]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  [4]=>
-  array(2) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-  }
-  [5]=>
-  array(2) {
-    [0]=>
-    string(4) "str1"
-    [1]=>
-    string(4) "str2"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge_recursive() : array with default keys ***
 -- With default argument --
 array(2) {

diff --git a/ext/standard/tests/array/array_merge_recursive_basic2.phpt b/ext/standard/tests/array/array_merge_recursive_basic2.phpt
index 8ac8c5a953d5d9fcf768b5902d65ba88dabcc026..bdd05d7ded09bbc2b563d7c8ce0f573be4b16571 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_basic2.phpt
@@ -25,74 +25,7 @@ var_dump( array_merge_recursive($arr1,$arr2,$arr3) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : associative arrays ***
--- With default argument --
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
--- With more arguments --
-array(4) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  string(5) "three"
-  ["four"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-}
-array(5) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  string(5) "three"
-  ["four"]=>
-  array(4) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-    [2]=>
-    string(4) "str1"
-    [3]=>
-    string(4) "str2"
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(6)
-    [1]=>
-    int(7)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 
 *** Testing array_merge_recursive() : associative arrays ***
 -- With default argument --

diff --git a/ext/standard/tests/array/array_merge_recursive_error.phpt b/ext/standard/tests/array/array_merge_recursive_error.phpt
index 9d6797e4912a4e3f7e22e3aa4ecaf60c2f759253..b2fb1fd6d75cf4ae75908a45f45441ad5a1ac81d 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_error.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_error.phpt
@@ -23,12 +23,3 @@ echo "Done";
 Warning: Wrong parameter count for array_merge_recursive() in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_merge_recursive() : error conditions ***
-
--- Testing array_merge_recursive() function with Zero arguments --
-
-Warning: Wrong parameter count for array_merge_recursive() in %s on line %d
-NULL
-Done
-

diff --git a/ext/standard/tests/array/array_merge_recursive_variation1.phpt b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
index 42f153abe435154aae44f70bbb81c6598e0a05ab..ca5c719c216ee7ad355e2172513e8d48b9baebf4 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation1.phpt
@@ -107,201 +107,6 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECTF--
-*** Testing array_merge_recursive() : Passing non array values to $arr1 argument ***
-
--- Iteration 1 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
--- With default argument --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
--- With more arguments --
-Warning: array_merge_recursive(): Argument #1 is not an array in %s on line %d
-NULL
-Done
---UEXPECTF--
 
 *** Testing array_merge_recursive() : Passing non array values to $arr1 argument ***
 

diff --git a/ext/standard/tests/array/array_merge_recursive_variation10.phpt b/ext/standard/tests/array/array_merge_recursive_variation10.phpt
index af3bc4c0e87dfb1b6e5f7d2bbbfe8bd94e7f3f39..71a6d41d822225231f1db64e44d788199c8017e7 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation10.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation10.phpt
@@ -39,140 +39,7 @@ var_dump( array_merge_recursive($arr1["array"], $arr2["array"]) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : two dimensional array for $arr1 argument ***
--- Passing the entire 2-d array --
--- With default argument --
-array(4) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(1)
-  }
-  ["array"]=>
-  array(4) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-    ["str1"]=>
-    string(5) "hello"
-    ["str2"]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    string(3) "one"
-    [4]=>
-    string(3) "two"
-  }
-  [2]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(1)
-  }
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(1)
-  }
-  ["array"]=>
-  array(6) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-    ["str1"]=>
-    string(5) "hello"
-    ["str2"]=>
-    string(5) "world"
-    [2]=>
-    string(5) "hello"
-    [3]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(4) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    string(3) "one"
-    [4]=>
-    string(3) "two"
-  }
-  [2]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(1)
-  }
-  [3]=>
-  int(1)
-  [4]=>
-  string(5) "hello"
-}
--- Passing the sub-array --
--- With default argument --
-array(4) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 
 *** Testing array_merge_recursive() : two dimensional array for $arr1 argument ***
 -- Passing the entire 2-d array --

diff --git a/ext/standard/tests/array/array_merge_recursive_variation2.phpt b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
index 0e59fe7c2a94ef900fe5333b8fd16811ec81a8f0..83f23747413a252805f8764d14766cd291c93c3a 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation2.phpt
@@ -197,102 +197,3 @@ NULL
 Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_merge_recursive() : Passing non array values to $arr2 argument ***
-
--- Iteration 1 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-Warning: array_merge_recursive(): Argument #2 is not an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_merge_recursive_variation3.phpt b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
index 901762dc61fffc1654886f98df3bccf84414b1b0..0b51d63051962bd70c285ca55d507d031d61146d 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation3.phpt
@@ -95,675 +95,7 @@ foreach($arrays as $arr1) {
   
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : Passing different arrays to $arr1 argument ***
--- Iteration 1 --
--- With default argument --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 2 --
--- With default argument --
-array(2) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 3 --
--- With default argument --
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 4 --
--- With default argument --
-array(0) {
-}
--- With more arguments --
-array(4) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 5 --
--- With default argument --
-array(1) {
-  [0]=>
-  NULL
-}
--- With more arguments --
-array(5) {
-  [0]=>
-  NULL
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 6 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(3) "a\v\f"
-  [1]=>
-  string(5) "aaaa
-"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-}
--- With more arguments --
-array(8) {
-  [0]=>
-  string(3) "a\v\f"
-  [1]=>
-  string(5) "aaaa
-"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-  [4]=>
-  string(3) "one"
-  [5]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 7 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(5) "a\v\f"
-  [1]=>
-  string(6) "aaaa\r"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-}
--- With more arguments --
-array(8) {
-  [0]=>
-  string(5) "a\v\f"
-  [1]=>
-  string(6) "aaaa\r"
-  [2]=>
-  string(1) "b"
-  [3]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-  [4]=>
-  string(3) "one"
-  [5]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 8 --
--- With default argument --
-array(3) {
-  ["h1"]=>
-  string(1) "
-"
-  ["h2"]=>
-  string(88) "hello world
-The quick brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
--- With more arguments --
-array(7) {
-  ["h1"]=>
-  string(1) "
-"
-  ["h2"]=>
-  string(88) "hello world
-The quick brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 9 --
--- With default argument --
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 10 --
--- With default argument --
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  int(1)
-}
--- With more arguments --
-array(7) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  int(1)
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 11 --
--- With default argument --
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(20)
-  [2]=>
-  int(40)
-}
--- With more arguments --
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(20)
-  [2]=>
-  int(40)
-  [3]=>
-  string(3) "one"
-  [4]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 12 --
--- With default argument --
-array(2) {
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-}
--- With more arguments --
-array(6) {
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 13 --
--- With default argument --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(4) "four"
-}
--- With more arguments --
-array(7) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(4) "four"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 14 --
--- With default argument --
-array(3) {
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
--- With more arguments --
-array(7) {
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 15 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(4) "true"
-  [1]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- With more arguments --
-array(8) {
-  [0]=>
-  string(4) "true"
-  [1]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 16 --
--- With default argument --
-array(3) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
--- With more arguments --
-array(7) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 17 --
--- With default argument --
-array(6) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-  [4]=>
-  bool(false)
-  [5]=>
-  bool(true)
-}
--- With more arguments --
-array(10) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-  [4]=>
-  bool(false)
-  [5]=>
-  bool(true)
-  [6]=>
-  string(3) "one"
-  [7]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 18 --
--- With default argument --
-array(3) {
-  [""]=>
-  int(4)
-  [0]=>
-  int(5)
-  [1]=>
-  int(6)
-}
--- With more arguments --
-array(7) {
-  [""]=>
-  int(4)
-  [0]=>
-  int(5)
-  [1]=>
-  int(6)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 19 --
--- With default argument --
-array(3) {
-  [0]=>
-  string(4) "str1"
-  ["array"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(4) "str1"
-  ["array"]=>
-  array(5) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-    [2]=>
-    string(1) "a"
-    [3]=>
-    string(1) "b"
-    [4]=>
-    string(1) "c"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-}
-Done
---UEXPECTF--
+--EXPECT--
 
 *** Testing array_merge_recursive() : Passing different arrays to $arr1 argument ***
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/array_merge_recursive_variation4.phpt b/ext/standard/tests/array/array_merge_recursive_variation4.phpt
index b037f2811908a877eb9e4b9904b1b2c7ee845b54..33446285be4715a538f374e03bf49ff1e9bdcc18 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation4.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation4.phpt
@@ -82,352 +82,6 @@ echo "Done";
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
--- With default argument --
-array(2) {
-  [0]=>
-  string(1) "0"
-  [1]=>
-  array(1) {
-    [1]=>
-    string(3) "one"
-  }
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(1) "0"
-  [1]=>
-  array(1) {
-    [1]=>
-    string(3) "one"
-  }
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 2 --
--- With default argument --
-array(2) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  array(4) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    int(1)
-    [4]=>
-    string(1) "4"
-  }
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  array(4) {
-    [1]=>
-    string(3) "one"
-    [2]=>
-    string(3) "two"
-    [3]=>
-    int(1)
-    [4]=>
-    string(1) "4"
-  }
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 3 --
--- With default argument --
-array(2) {
-  [0]=>
-  string(5) "float"
-  [1]=>
-  array(1) {
-    [1]=>
-    string(5) "float"
-  }
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(5) "float"
-  [1]=>
-  array(1) {
-    [1]=>
-    string(5) "float"
-  }
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 4 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(2) "f1"
-  [1]=>
-  string(2) "f2"
-  [2]=>
-  array(1) {
-    [1]=>
-    string(2) "f1"
-  }
-  [3]=>
-  string(2) "f4"
-}
--- With more arguments --
-array(8) {
-  [0]=>
-  string(2) "f1"
-  [1]=>
-  string(2) "f2"
-  [2]=>
-  array(1) {
-    [1]=>
-    string(2) "f1"
-  }
-  [3]=>
-  string(2) "f4"
-  [4]=>
-  string(3) "one"
-  [5]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 5 --
--- With default argument --
-array(3) {
-  ["\tHello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen\n"]=>
-  int(111)
-}
--- With more arguments --
-array(7) {
-  ["\tHello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen\n"]=>
-  int(111)
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 6 --
--- With default argument --
-array(3) {
-  ["   Hello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen
-"]=>
-  int(111)
-}
--- With more arguments --
-array(7) {
-  ["   Hello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen
-"]=>
-  int(111)
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 7 --
--- With default argument --
-array(3) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  array(2) {
-    [0]=>
-    string(7) "heredoc"
-    [1]=>
-    string(6) "string"
-  }
-  [1]=>
-  string(6) "string"
-}
--- With more arguments --
-array(7) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  array(2) {
-    [0]=>
-    string(7) "heredoc"
-    [1]=>
-    string(6) "string"
-  }
-  [1]=>
-  string(6) "string"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 8 --
--- With default argument --
-array(3) {
-  [""]=>
-  array(1) {
-    [0]=>
-    string(5) "unset"
-  }
-  [0]=>
-  int(11)
-  [1]=>
-  string(5) "hello"
-}
--- With more arguments --
-array(7) {
-  [""]=>
-  array(1) {
-    [0]=>
-    string(5) "unset"
-  }
-  [0]=>
-  int(11)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-
-*** Testing array_merge_recursive() : assoc. array with diff. keys to $arr1 argument ***
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 -- With default argument --

diff --git a/ext/standard/tests/array/array_merge_recursive_variation5.phpt b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
index 98c6e8be56b04b874dfa2f0bfed148996982ac9a..30191f4051913f9d8f2d7ea2d5343fb516888cfa 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation5.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation5.phpt
@@ -78,332 +78,6 @@ fclose($fp);
 echo "Done";
 ?>
 --EXPECTF--
-*** Testing array_merge_recursive() : assoc. array with diff. values to $arr1 argument ***
--- Iteration 1 --
--- With default argument --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 2 --
--- With default argument --
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(1)
-  [0]=>
-  int(1)
-}
--- With more arguments --
-array(8) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(1)
-  [0]=>
-  int(1)
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 3 --
--- With default argument --
-array(3) {
-  ["f1"]=>
-  float(2.3333)
-  ["f2"]=>
-  float(2.3333)
-  ["f3"]=>
-  array(2) {
-    [0]=>
-    float(1.1)
-    [1]=>
-    float(2.22)
-  }
-}
--- With more arguments --
-array(7) {
-  ["f1"]=>
-  float(2.3333)
-  ["f2"]=>
-  float(2.3333)
-  ["f3"]=>
-  array(2) {
-    [0]=>
-    float(1.1)
-    [1]=>
-    float(2.22)
-  }
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 4 --
--- With default argument --
-array(4) {
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [0]=>
-  float(4.8999992284)
-  ["f4"]=>
-  array(2) {
-    [0]=>
-    float(1.2)
-    ["f4"]=>
-    float(1.2)
-  }
-}
--- With more arguments --
-array(8) {
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [0]=>
-  float(4.8999992284)
-  ["f4"]=>
-  array(2) {
-    [0]=>
-    float(1.2)
-    ["f4"]=>
-    float(1.2)
-  }
-  [1]=>
-  string(3) "one"
-  [2]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 5 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(6) "  Hello"
-  ["array"]=>
-  string(6) "col       or"
-  [1]=>
-  string(7) "\v\fworld"
-  [2]=>
-  string(6) "  Hello"
-}
--- With more arguments --
-array(7) {
-  [0]=>
-  string(6) "  Hello"
-  ["array"]=>
-  array(4) {
-    [0]=>
-    string(6) "col     or"
-    [1]=>
-    string(1) "a"
-    [2]=>
-    string(1) "b"
-    [3]=>
-    string(1) "c"
-  }
-  [1]=>
-  string(7) "\v\fworld"
-  [2]=>
-  string(6) "  Hello"
-  [3]=>
-  string(3) "one"
-  [4]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-}
--- Iteration 6 --
--- With default argument --
-array(4) {
-  [0]=>
-  string(7) "\tHello"
-  ["array"]=>
-  string(7) "col\tor"
-  [1]=>
-  string(9) "\v\fworld"
-  [2]=>
-  string(7) "\tHello"
-}
--- With more arguments --
-array(7) {
-  [0]=>
-  string(7) "\tHello"
-  ["array"]=>
-  array(4) {
-    [0]=>
-    string(7) "col\tor"
-    [1]=>
-    string(1) "a"
-    [2]=>
-    string(1) "b"
-    [3]=>
-    string(1) "c"
-  }
-  [1]=>
-  string(9) "\v\fworld"
-  [2]=>
-  string(7) "\tHello"
-  [3]=>
-  string(3) "one"
-  [4]=>
-  int(2)
-  ["string"]=>
-  string(5) "hello"
-}
--- Iteration 7 --
--- With default argument --
-array(3) {
-  [0]=>
-  string(5) "hello"
-  ["string"]=>
-  string(11) "Hello world"
-  [1]=>
-  string(11) "Hello world"
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  string(5) "hello"
-  ["string"]=>
-  array(2) {
-    [0]=>
-    string(11) "Hello world"
-    [1]=>
-    string(5) "hello"
-  }
-  [1]=>
-  string(11) "Hello world"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  int(2)
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
--- Iteration 8 --
--- With default argument --
-array(5) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  ["string"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  [2]=>
-  resource(%d) of type (stream)
-}
--- With more arguments --
-array(8) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  ["string"]=>
-  array(2) {
-    [0]=>
-    NULL
-    [1]=>
-    string(5) "hello"
-  }
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  [2]=>
-  resource(%d) of type (stream)
-  [3]=>
-  string(3) "one"
-  [4]=>
-  int(2)
-  ["array"]=>
-  array(3) {
-    [0]=>
-    string(1) "a"
-    [1]=>
-    string(1) "b"
-    [2]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-
 *** Testing array_merge_recursive() : assoc. array with diff. values to $arr1 argument ***
 -- Iteration 1 --
 -- With default argument --

diff --git a/ext/standard/tests/array/array_merge_recursive_variation6.phpt b/ext/standard/tests/array/array_merge_recursive_variation6.phpt
index 1b28c4ca1e8a8e605cd1426ef4027bb64288de18..71ff9e528ad6e73180b8e8cd83498ca14f65e877 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation6.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation6.phpt
@@ -33,86 +33,7 @@ var_dump( array_merge_recursive($arr1_string_key, $arr2) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : array with duplicate keys for $arr1 argument ***
--- With default argument --
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(9) "duplicate"
-    [1]=>
-    string(7) "strings"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  string(5) "three"
-}
-array(2) {
-  ["str1"]=>
-  string(5) "world"
-  ["str2"]=>
-  float(111.111)
-}
--- With more arguments --
-array(6) {
-  [0]=>
-  array(2) {
-    [0]=>
-    string(9) "duplicate"
-    [1]=>
-    string(7) "strings"
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  string(5) "three"
-  [3]=>
-  string(3) "one"
-  ["str1"]=>
-  string(3) "two"
-  [4]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-}
-array(4) {
-  ["str1"]=>
-  array(2) {
-    [0]=>
-    string(5) "world"
-    [1]=>
-    string(3) "two"
-  }
-  ["str2"]=>
-  float(111.111)
-  [0]=>
-  string(3) "one"
-  [1]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-}
-Done
---UEXPECTF--
-
+--EXPECT--
 *** Testing array_merge_recursive() : array with duplicate keys for $arr1 argument ***
 -- With default argument --
 array(3) {

diff --git a/ext/standard/tests/array/array_merge_recursive_variation7.phpt b/ext/standard/tests/array/array_merge_recursive_variation7.phpt
index 41a35bd43e4cad86522a4bfe6cec6ef64b11c207..e916a81a13f7399c5dd8d9b9bcf6aa03a75171a3 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation7.phpt
@@ -40,48 +40,7 @@ var_dump( array_merge_recursive($arr1, $arr2) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : array with reference variables for $arr1 argument ***
--- With default argument --
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  &string(5) "hello"
-  [2]=>
-  &string(5) "hello"
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  &int(0)
-  ["hello"]=>
-  &string(5) "hello"
-}
--- With more arguments --
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  &string(5) "hello"
-  [2]=>
-  &string(5) "hello"
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  &int(0)
-  ["hello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "hello"
-  }
-  [5]=>
-  &string(5) "hello"
-}
-Done
---UEXPECTF--
-
+--EXPECT--
 *** Testing array_merge_recursive() : array with reference variables for $arr1 argument ***
 -- With default argument --
 array(6) {

diff --git a/ext/standard/tests/array/array_merge_recursive_variation8.phpt b/ext/standard/tests/array/array_merge_recursive_variation8.phpt
index 6474a6274eade59614f2e6b4f8b1e3bca00ce112..8025789a8267c21dbb57a28d56cd7ec5575ffae5 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation8.phpt
@@ -27,52 +27,7 @@ var_dump( array_merge_recursive($arr1, $arr2) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : array with binary data for $arr1 argument ***
--- With default argument --
-array(5) {
-  [0]=>
-  string(1) "1"
-  ["hello"]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  string(5) "hello"
-  ["str2"]=>
-  string(5) "world"
-}
--- With more arguments --
-array(5) {
-  [0]=>
-  string(1) "1"
-  ["hello"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(6) "binary"
-  }
-  [1]=>
-  string(5) "world"
-  ["str1"]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(6) "binary"
-  }
-  ["str2"]=>
-  array(2) {
-    [0]=>
-    string(5) "world"
-    [1]=>
-    string(6) "binary"
-  }
-}
-Done
---UEXPECTF--
-
+--EXPECT--
 *** Testing array_merge_recursive() : array with binary data for $arr1 argument ***
 -- With default argument --
 array(5) {

diff --git a/ext/standard/tests/array/array_merge_recursive_variation9.phpt b/ext/standard/tests/array/array_merge_recursive_variation9.phpt
index 966e2cb979404320b37a1b049fa4c2aaa807a0c4..27adff318c6c2b78d883d6980d1052098e5db83f 100644 (file)
--- a/ext/standard/tests/array/array_merge_recursive_variation9.phpt
+++ b/ext/standard/tests/array/array_merge_recursive_variation9.phpt
@@ -48,75 +48,7 @@ var_dump( array_merge_recursive($arr1, $arr2) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge_recursive() : arrays with common key and value ***
--- Integer values --
-array(3) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(2)
-  }
-  ["c"]=>
-  int(4)
-}
--- Float values --
-array(3) {
-  ["a"]=>
-  float(1.1)
-  ["b"]=>
-  array(2) {
-    [0]=>
-    float(2.2)
-    [1]=>
-    float(2.2)
-  }
-  ["c"]=>
-  float(3.3)
-}
--- String values --
-array(3) {
-  ["a"]=>
-  string(5) "hello"
-  ["b"]=>
-  array(2) {
-    [0]=>
-    string(5) "world"
-    [1]=>
-    string(5) "world"
-  }
-  ["c"]=>
-  string(6) "string"
-}
--- Boolean values --
-array(2) {
-  ["a"]=>
-  bool(true)
-  ["b"]=>
-  array(2) {
-    [0]=>
-    bool(false)
-    [1]=>
-    bool(false)
-  }
-}
--- Null values --
-array(1) {
-  ["a"]=>
-  array(2) {
-    [0]=>
-    NULL
-    [1]=>
-    NULL
-  }
-}
-Done
---UEXPECTF--
-
+--EXPECT--
 *** Testing array_merge_recursive() : arrays with common key and value ***
 -- Integer values --
 array(3) {

diff --git a/ext/standard/tests/array/array_merge_variation1.phpt b/ext/standard/tests/array/array_merge_variation1.phpt
index d242fbebbe840ef0952ba8052133839d524f8b8d..1ce71debb0f799cb1deabba046e8f751d57896cb 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation1.phpt
+++ b/ext/standard/tests/array/array_merge_variation1.phpt
@@ -229,135 +229,3 @@ NULL
 Warning: array_merge(): Argument #1 is not an array in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
--- Iteration 19 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_merge(): Argument #1 is not an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_merge_variation10.phpt b/ext/standard/tests/array/array_merge_variation10.phpt
index 055f59eedb2031fffbba74bc2c08758c1f2870b2..695dfc440fc6a0c0e2ccc5defe572a6c0992dd79 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation10.phpt
+++ b/ext/standard/tests/array/array_merge_variation10.phpt
@@ -35,40 +35,7 @@ echo key($arr3) . " => " . current ($arr3) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Call array_merge() --
-array(9) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(4) "zero"
-  [4]=>
-  string(2) "un"
-  [5]=>
-  string(4) "deux"
-  [6]=>
-  string(4) "null"
-  [7]=>
-  string(4) "eins"
-  [8]=>
-  string(4) "zwei"
-}
-
--- Position of Internal Pointer in Result: --
-0 => zero
-
--- Position of Internal Pointer in Original Array: --
-$arr1: 0 => zero
-$arr2: 0 => zero
-$arr3: 0 => null
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 
 -- Call array_merge() --
@@ -100,4 +67,4 @@ array(9) {
 $arr1: 0 => zero
 $arr2: 0 => zero
 $arr3: 0 => null
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation2.phpt b/ext/standard/tests/array/array_merge_variation2.phpt
index 829d9c446d88c7443256387dad9d48b0813739bb..4ebbeb92b9cdd4b9b30175d15356c89a4d493de3 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation2.phpt
+++ b/ext/standard/tests/array/array_merge_variation2.phpt
@@ -228,135 +228,3 @@ NULL
 Warning: array_merge(): Argument #2 is not an array in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 18 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
--- Iteration 19 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_merge(): Argument #2 is not an array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_merge_variation3.phpt b/ext/standard/tests/array/array_merge_variation3.phpt
index 5cfac39909b185e8747f724dad0ff50bcb2e6bcd..372a8131066885c50cda5cb18fdfd7ff89704b6d 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation3.phpt
+++ b/ext/standard/tests/array/array_merge_variation3.phpt
@@ -241,261 +241,6 @@ array(6) {
   bool(false)
 }
 
--- Iteration 5: empty string data --
-array(4) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(0) ""
-  [3]=>
-  string(0) ""
-}
-
--- Iteration 6: empty array data --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
--- Iteration 7: string data --
-array(5) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  string(11) "hello world"
-  [3]=>
-  int(1)
-  [4]=>
-  int(2)
-}
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(6) "string"
-  [3]=>
-  string(6) "string"
-  [4]=>
-  string(11) "hello world"
-}
-
--- Iteration 8: object data --
-array(3) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  object(classA)#%d (0) {
-  }
-}
-
--- Iteration 9: undefined data --
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-}
-
--- Iteration 10: unset data --
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-}
-
--- Iteration 11: resource data --
-array(3) {
-  [0]=>
-  resource(%d) of type (stream)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  resource(%d) of type (stream)
-}
-Done
---UEXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Iteration 1: int data --
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(12345)
-  [3]=>
-  int(-2345)
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(0)
-  [3]=>
-  int(1)
-  [4]=>
-  int(12345)
-  [5]=>
-  int(-2345)
-}
-
--- Iteration 2: float data --
-array(7) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  float(-10.5)
-  [2]=>
-  float(123456789000)
-  [3]=>
-  float(1.23456789E-9)
-  [4]=>
-  float(0.5)
-  [5]=>
-  int(1)
-  [6]=>
-  int(2)
-}
-array(7) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(10.5)
-  [3]=>
-  float(-10.5)
-  [4]=>
-  float(123456789000)
-  [5]=>
-  float(1.23456789E-9)
-  [6]=>
-  float(0.5)
-}
-
--- Iteration 3: null data --
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-
--- Iteration 4: bool data --
-array(6) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(false)
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(false)
-  [4]=>
-  bool(true)
-  [5]=>
-  bool(false)
-}
-
 -- Iteration 5: empty string data --
 array(4) {
   [0]=>
@@ -631,4 +376,4 @@ array(3) {
   [2]=>
   resource(%d) of type (stream)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation4.phpt b/ext/standard/tests/array/array_merge_variation4.phpt
index 960a46a41cd32718967e3bfcbef76f8eca479fd7..da03c8fad45506288d9c5714254c1a12f2eb17dd 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation4.phpt
+++ b/ext/standard/tests/array/array_merge_variation4.phpt
@@ -107,266 +107,7 @@ foreach($inputs as $key => $input) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Iteration 1: int data --
-array(6) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(8) "positive"
-  [3]=>
-  string(8) "negative"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(6) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(8) "positive"
-  [3]=>
-  string(8) "negative"
-}
-
--- Iteration 2: float data --
-array(5) {
-  [0]=>
-  string(8) "positive"
-  [1]=>
-  string(8) "negative"
-  [2]=>
-  string(4) "half"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(5) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  string(8) "positive"
-  [1]=>
-  string(8) "negative"
-  [2]=>
-  string(4) "half"
-}
-
--- Iteration 3: extreme floats data --
-array(4) {
-  [0]=>
-  string(5) "large"
-  [1]=>
-  string(5) "small"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  string(5) "large"
-  [1]=>
-  string(5) "small"
-}
-
--- Iteration 4: null uppercase data --
-array(3) {
-  [""]=>
-  string(6) "null 1"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(6) "null 1"
-}
-
--- Iteration 5: null lowercase data --
-array(3) {
-  [""]=>
-  string(6) "null 2"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(6) "null 2"
-}
-
--- Iteration 6: bool lowercase data --
-array(4) {
-  [0]=>
-  string(6) "lowert"
-  [1]=>
-  string(6) "lowerf"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  string(6) "lowert"
-  [1]=>
-  string(6) "lowerf"
-}
-
--- Iteration 7: bool uppercase data --
-array(4) {
-  [0]=>
-  string(6) "uppert"
-  [1]=>
-  string(6) "upperf"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [0]=>
-  string(6) "uppert"
-  [1]=>
-  string(6) "upperf"
-}
-
--- Iteration 8: empty double quotes data --
-array(3) {
-  [""]=>
-  string(6) "emptyd"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(6) "emptyd"
-}
-
--- Iteration 9: empty single quotes data --
-array(3) {
-  [""]=>
-  string(6) "emptys"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(6) "emptys"
-}
-
--- Iteration 10: string data --
-array(5) {
-  ["stringd"]=>
-  string(7) "stringd"
-  ["strings"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(5) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["stringd"]=>
-  string(7) "stringd"
-  ["strings"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-}
-
--- Iteration 11: undefined data --
-array(3) {
-  [""]=>
-  string(9) "undefined"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(9) "undefined"
-}
-
--- Iteration 12: unset data --
-array(3) {
-  [""]=>
-  string(5) "unset"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-array(3) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(5) "unset"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 
 -- Iteration 1: int data --
@@ -624,4 +365,4 @@ array(3) {
   [u""]=>
   unicode(5) "unset"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation5.phpt b/ext/standard/tests/array/array_merge_variation5.phpt
index 499f6d7d2336c866ac30cc0eba32d14de68bcdf1..f9c41d22af4dc6732e8b9ca52ef366c5a5096a7f 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation5.phpt
+++ b/ext/standard/tests/array/array_merge_variation5.phpt
@@ -24,42 +24,7 @@ var_dump(array_merge($arr2, $arr1));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-array(7) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-  [4]=>
-  string(3) "one"
-  [5]=>
-  string(6) "twenty"
-  [6]=>
-  string(6) "thirty"
-}
-array(7) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(6) "twenty"
-  [2]=>
-  string(6) "thirty"
-  [3]=>
-  string(4) "zero"
-  [4]=>
-  string(3) "one"
-  [5]=>
-  string(3) "two"
-  [6]=>
-  string(5) "three"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 array(7) {
   [0]=>
@@ -93,4 +58,4 @@ array(7) {
   [6]=>
   unicode(5) "three"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation6.phpt b/ext/standard/tests/array/array_merge_variation6.phpt
index 8f623f676bfd725c7d477cf77f7f62fe638ce3d4..d3a4189626e88c32d1a6dff9c3dfb4e4fe6ec07b 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation6.phpt
+++ b/ext/standard/tests/array/array_merge_variation6.phpt
@@ -24,34 +24,7 @@ var_dump(array_merge($arr2, $arr1));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-array(5) {
-  ["zero"]=>
-  string(4) "zero"
-  ["one"]=>
-  string(2) "un"
-  ["two"]=>
-  string(4) "deux"
-  ["un"]=>
-  string(4) "eins"
-  ["deux"]=>
-  string(4) "zwei"
-}
-array(5) {
-  ["zero"]=>
-  string(4) "zero"
-  ["un"]=>
-  string(4) "eins"
-  ["deux"]=>
-  string(4) "zwei"
-  ["one"]=>
-  string(2) "un"
-  ["two"]=>
-  string(4) "deux"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 array(5) {
   [u"zero"]=>
@@ -77,4 +50,4 @@ array(5) {
   [u"two"]=>
   unicode(4) "deux"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation7.phpt b/ext/standard/tests/array/array_merge_variation7.phpt
index 57dd46062246412f43222b9de056fcef32f72bd3..06e3e991614c5db6ef380a84098d35418ce6098c 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation7.phpt
+++ b/ext/standard/tests/array/array_merge_variation7.phpt
@@ -24,46 +24,7 @@ var_dump(array_merge($arr2, $arr1));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-array(8) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(6) "twenty"
-  ["thirty"]=>
-  int(30)
-  [2]=>
-  string(4) "bool"
-  [3]=>
-  string(5) "float"
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-  [""]=>
-  string(4) "null"
-}
-array(8) {
-  [0]=>
-  string(5) "float"
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [""]=>
-  string(4) "null"
-  [3]=>
-  string(4) "zero"
-  [4]=>
-  string(6) "twenty"
-  ["thirty"]=>
-  int(30)
-  [5]=>
-  string(4) "bool"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 array(8) {
   [0]=>
@@ -101,4 +62,4 @@ array(8) {
   [5]=>
   unicode(4) "bool"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation8.phpt b/ext/standard/tests/array/array_merge_variation8.phpt
index 58b8d8a6670792d77da60eb8b00debbb5017b4d4..65c94d3a439cc8bd589713d73c1e60b969c0030d 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation8.phpt
+++ b/ext/standard/tests/array/array_merge_variation8.phpt
@@ -26,53 +26,7 @@ var_dump(array_merge($arr2, $arr1[3]));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_merge() : usage variations ***
-
--- Merge a two-dimensional and a one-dimensional array --
-array(7) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-  [6]=>
-  int(3)
-}
-
--- Merge an array and a sub-array --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(0)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_merge() : usage variations ***
 
 -- Merge a two-dimensional and a one-dimensional array --
@@ -117,4 +71,4 @@ array(4) {
   [3]=>
   int(0)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_merge_variation9.phpt b/ext/standard/tests/array/array_merge_variation9.phpt
index 06f43c6a4d6c36e8e8c594a5a2b888ddd7cecc3c..37669259f9db522f97f61bd85f2561c087ef9187 100644 (file)
--- a/ext/standard/tests/array/array_merge_variation9.phpt
+++ b/ext/standard/tests/array/array_merge_variation9.phpt
@@ -41,80 +41,6 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing array_merge() : usage variations ***
 
--- Merge an array made up of referenced variables to an assoc. array --
-array(6) {
-  [0]=>
-  &string(3) "foo"
-  [1]=>
-  &string(3) "bar"
-  [2]=>
-  &string(3) "baz"
-  ["key1"]=>
-  string(4) "val1"
-  ["key2"]=>
-  string(4) "val2"
-  ["key3"]=>
-  string(4) "val3"
-}
-array(6) {
-  ["key1"]=>
-  string(4) "val1"
-  ["key2"]=>
-  string(4) "val2"
-  ["key3"]=>
-  string(4) "val3"
-  [0]=>
-  &string(3) "foo"
-  [1]=>
-  &string(3) "bar"
-  [2]=>
-  &string(3) "baz"
-}
-
--- Change $val2 --
-array(6) {
-  [0]=>
-  &string(3) "foo"
-  [1]=>
-  &string(11) "hello world"
-  [2]=>
-  &string(3) "baz"
-  ["key1"]=>
-  string(4) "val1"
-  ["key2"]=>
-  string(4) "val2"
-  ["key3"]=>
-  string(4) "val3"
-}
-array(6) {
-  ["key1"]=>
-  string(4) "val1"
-  ["key2"]=>
-  string(4) "val2"
-  ["key3"]=>
-  string(4) "val3"
-  [0]=>
-  &string(3) "foo"
-  [1]=>
-  &string(11) "hello world"
-  [2]=>
-  &string(3) "baz"
-}
-
--- Merge an array and a reference to the first array --
-array(3) {
-  ["key1"]=>
-  string(4) "val1"
-  ["key2"]=>
-  string(4) "val2"
-  ["key3"]=>
-  string(4) "val3"
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_merge() : usage variations ***
-
 -- Merge an array made up of referenced variables to an assoc. array --
 array(6) {
   [0]=>

diff --git a/ext/standard/tests/array/array_pad.phpt b/ext/standard/tests/array/array_pad.phpt
index 40a621fe8fb4c2044e515572bce35fd0cf1bdc73..6139e31307456c448be6322a35acb9167f7ce053 100644 (file)
--- a/ext/standard/tests/array/array_pad.phpt
+++ b/ext/standard/tests/array/array_pad.phpt
@@ -20,86 +20,7 @@ var_dump(array_pad("", 2000000, 0));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
-Warning: array_pad() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-
-Warning: array_pad() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-array(1) {
-  [0]=>
-  int(0)
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(0)
-}
-array(5) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  int(-1)
-  [2]=>
-  float(2)
-  [3]=>
-  int(0)
-  [4]=>
-  int(0)
-}
-array(5) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  int(-1)
-  [2]=>
-  float(2)
-  [3]=>
-  array(0) {
-  }
-  [4]=>
-  array(0) {
-  }
-}
-array(3) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  int(-1)
-  [2]=>
-  float(2)
-}
-array(3) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  int(-1)
-  [2]=>
-  float(2)
-}
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  string(0) ""
-  [2]=>
-  int(-1)
-  [3]=>
-  float(2)
-}
-
-Warning: array_pad(): You may only pad up to 1048576 elements at a time in %s on line %d
-bool(false)
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_pad_basic.phpt b/ext/standard/tests/array/array_pad_basic.phpt
index 85c99e28a93e174428c14ead7c26f93c6844b71d..3c14e0bc616fbfe24e15a24e42aaeffea4183183 100644 (file)
--- a/ext/standard/tests/array/array_pad_basic.phpt
+++ b/ext/standard/tests/array/array_pad_basic.phpt
@@ -31,66 +31,7 @@ var_dump( array_pad($input, 3, $pad_value) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_pad() : basic functionality ***
--- Positive pad_size --
-array(8) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(-3)
-  [4]=>
-  int(-3)
-  [5]=>
-  int(-3)
-  [6]=>
-  int(-3)
-  [7]=>
-  int(-3)
-}
--- Negative pad_size --
-array(8) {
-  [0]=>
-  int(-3)
-  [1]=>
-  int(-3)
-  [2]=>
-  int(-3)
-  [3]=>
-  int(-3)
-  [4]=>
-  int(-3)
-  [5]=>
-  int(1)
-  [6]=>
-  int(2)
-  [7]=>
-  int(3)
-}
--- Pad_size lesser than array_size --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
--- Pad_size equal to array_size --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_pad() : basic functionality ***
 -- Positive pad_size --
 array(8) {

diff --git a/ext/standard/tests/array/array_pad_error.phpt b/ext/standard/tests/array/array_pad_error.phpt
index 56682b07de302233713b0fb6ec226d142bc38348..63b4c83bf00ab3b013f6c2187a922eb087dc61d9 100644 (file)
--- a/ext/standard/tests/array/array_pad_error.phpt
+++ b/ext/standard/tests/array/array_pad_error.phpt
@@ -51,24 +51,3 @@ NULL
 Warning: array_pad() expects exactly 3 parameters, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_pad() : error conditions ***
-
--- Testing array_pad() function with Zero arguments --
-
-Warning: array_pad() expects exactly 3 parameters, 0 given in %s on line %d
-NULL
-
--- Testing array_pad() function with more than expected no. of arguments --
-
-Warning: array_pad() expects exactly 3 parameters, 4 given in %s on line %d
-NULL
-
--- Testing array_pad() function with less than expected no. of arguments --
-
-Warning: array_pad() expects exactly 3 parameters, 2 given in %s on line %d
-NULL
-
-Warning: array_pad() expects exactly 3 parameters, 1 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_pad_variation1.phpt b/ext/standard/tests/array/array_pad_variation1.phpt
index 7beecefe58ed9bdeb98886dfa339676e060ae881..6ffe115a77aa7172943a337e704ebef308600dec 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation1.phpt
+++ b/ext/standard/tests/array/array_pad_variation1.phpt
@@ -205,177 +205,6 @@ NULL
 Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
 NULL
 
--- Iteration 16 --
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-Warning: array_pad() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 23 --
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-Warning: array_pad() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_pad() : passing non array values to $input argument ***
-
--- Iteration 1 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_pad() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
 -- Iteration 16 --
 Warning: array_pad() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL

diff --git a/ext/standard/tests/array/array_pad_variation2.phpt b/ext/standard/tests/array/array_pad_variation2.phpt
index df130e574156bd9fb3273d68aed2b86d67ebb275..340edbc347c2a3b668b3958e06ab653253d13229 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation2.phpt
+++ b/ext/standard/tests/array/array_pad_variation2.phpt
@@ -221,173 +221,6 @@ array(2) {
 }
 -- Iteration 18 --
 
-Warning: array_pad() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_pad() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_pad() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_pad() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_pad() expects parameter 2 to be long, object given in %s on line %d
-NULL
--- Iteration 23 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 24 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing array_pad() : passing non integer values to $pad_size argument ***
--- Iteration 1 --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-  [6]=>
-  int(1)
-  [7]=>
-  int(1)
-  [8]=>
-  int(1)
-  [9]=>
-  int(1)
-}
--- Iteration 2 --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-  [6]=>
-  int(1)
-  [7]=>
-  int(1)
-  [8]=>
-  int(1)
-  [9]=>
-  int(2)
-}
--- Iteration 3 --
-
-Warning: array_pad(): You may only pad up to 1048576 elements at a time in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: array_pad(): You may only pad up to 1048576 elements at a time in %s on line %d
-bool(false)
--- Iteration 5 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 6 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 7 --
-
-Warning: array_pad() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_pad() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_pad() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_pad() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_pad() expects parameter 2 to be long, array given in %s on line %d
-NULL
--- Iteration 12 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 13 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 14 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 15 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 16 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 17 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 18 --
-
 Warning: array_pad() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 -- Iteration 19 --

diff --git a/ext/standard/tests/array/array_pad_variation3.phpt b/ext/standard/tests/array/array_pad_variation3.phpt
index bff495d9b83690d8b245c5a2bd7d1ea79fa09147..90ba52bdce7315ad136c3b5c34b9ff8b82317b34 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation3.phpt
+++ b/ext/standard/tests/array/array_pad_variation3.phpt
@@ -440,761 +440,6 @@ array(4) {
   int(2)
 }
 -- Iteration 14 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [3]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-}
-array(4) {
-  [0]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [1]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 15 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 16 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 17 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 18 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 19 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 20 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 21 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(0) ""
-  [3]=>
-  string(0) ""
-}
-array(4) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 22 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(0) ""
-  [3]=>
-  string(0) ""
-}
-array(4) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 23 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(6) "string"
-  [3]=>
-  string(6) "string"
-}
-array(4) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 24 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(6) "string"
-  [3]=>
-  string(6) "string"
-}
-array(4) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 25 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(11) "hello world"
-  [3]=>
-  string(11) "hello world"
-}
-array(4) {
-  [0]=>
-  string(11) "hello world"
-  [1]=>
-  string(11) "hello world"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 26 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(25) "\v\fHello   world!! 
-string
-"
-  [3]=>
-  string(25) "\v\fHello   world!! 
-string
-"
-}
-array(4) {
-  [0]=>
-  string(25) "\v\fHello   world!! 
-string
-"
-  [1]=>
-  string(25) "\v\fHello   world!! 
-string
-"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 27 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(30) "\v\fHello\t world!! \rstring\n"
-  [3]=>
-  string(30) "\v\fHello\t world!! \rstring\n"
-}
-array(4) {
-  [0]=>
-  string(30) "\v\fHello\t world!! \rstring\n"
-  [1]=>
-  string(30) "\v\fHello\t world!! \rstring\n"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 28 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [3]=>
-  object(classA)#%d (0) {
-  }
-}
-array(4) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 29 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 30 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-}
-array(4) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 31 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  resource(%d) of type (stream)
-  [3]=>
-  resource(%d) of type (stream)
-}
-array(4) {
-  [0]=>
-  resource(%d) of type (stream)
-  [1]=>
-  resource(%d) of type (stream)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 32 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  string(5) "hello"
-}
-array(4) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing array_pad() : possible values for $pad_value argument ***
--- Iteration 1 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(0)
-  [3]=>
-  int(0)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(0)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 2 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-}
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 3 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(12345)
-  [3]=>
-  int(12345)
-}
-array(4) {
-  [0]=>
-  int(12345)
-  [1]=>
-  int(12345)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 4 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(-2345)
-  [3]=>
-  int(-2345)
-}
-array(4) {
-  [0]=>
-  int(-2345)
-  [1]=>
-  int(-2345)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 5 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(10.5)
-  [3]=>
-  float(10.5)
-}
-array(4) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  float(10.5)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 6 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(-10.5)
-  [3]=>
-  float(-10.5)
-}
-array(4) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  float(-10.5)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 7 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(123456789000)
-  [3]=>
-  float(123456789000)
-}
-array(4) {
-  [0]=>
-  float(123456789000)
-  [1]=>
-  float(123456789000)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 8 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(1.23456789E-9)
-  [3]=>
-  float(1.23456789E-9)
-}
-array(4) {
-  [0]=>
-  float(1.23456789E-9)
-  [1]=>
-  float(1.23456789E-9)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 9 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  float(0.5)
-  [3]=>
-  float(0.5)
-}
-array(4) {
-  [0]=>
-  float(0.5)
-  [1]=>
-  float(0.5)
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 10 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  array(0) {
-  }
-  [3]=>
-  array(0) {
-  }
-}
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(0) {
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 11 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 12 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-array(4) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 13 --
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-}
-array(4) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-}
--- Iteration 14 --
 array(4) {
   [0]=>
   int(1)

diff --git a/ext/standard/tests/array/array_pad_variation4.phpt b/ext/standard/tests/array/array_pad_variation4.phpt
index 46d3ea6798262ad7c10509744246e83c16331021..0216245cc2bdd3665b431716fb4b46aa07368af4 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation4.phpt
+++ b/ext/standard/tests/array/array_pad_variation4.phpt
@@ -27,38 +27,7 @@ var_dump( array_pad($input, -$pad_size, $binary) );  // negative 'pad_size'
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_pad() : Passing binary values to $pad_value argument ***
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  string(5) "hello"
-  [5]=>
-  string(5) "hello"
-}
-array(6) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "hello"
-  [3]=>
-  int(1)
-  [4]=>
-  int(2)
-  [5]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_pad() : Passing binary values to $pad_value argument ***
 array(6) {
   [0]=>

diff --git a/ext/standard/tests/array/array_pad_variation5.phpt b/ext/standard/tests/array/array_pad_variation5.phpt
index 975599a7ac73554108edc1c8cbf882570a197857..f7116d82a6428bd9c26bca58e52705705bfbd922 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation5.phpt
+++ b/ext/standard/tests/array/array_pad_variation5.phpt
@@ -31,114 +31,7 @@ var_dump( array_pad($input, -$pad_size, $pad_value) );  // negative 'pad_value'
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_pad() : Passing 2-d array to $pad_value argument ***
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  array(3) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(5) "hello"
-      [1]=>
-      string(5) "world"
-    }
-    [2]=>
-    array(2) {
-      ["one"]=>
-      int(1)
-      ["two"]=>
-      int(2)
-    }
-  }
-  [4]=>
-  array(3) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(5) "hello"
-      [1]=>
-      string(5) "world"
-    }
-    [2]=>
-    array(2) {
-      ["one"]=>
-      int(1)
-      ["two"]=>
-      int(2)
-    }
-  }
-}
-array(5) {
-  [0]=>
-  array(3) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(5) "hello"
-      [1]=>
-      string(5) "world"
-    }
-    [2]=>
-    array(2) {
-      ["one"]=>
-      int(1)
-      ["two"]=>
-      int(2)
-    }
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    array(1) {
-      [0]=>
-      int(1)
-    }
-    [1]=>
-    array(2) {
-      [0]=>
-      string(5) "hello"
-      [1]=>
-      string(5) "world"
-    }
-    [2]=>
-    array(2) {
-      ["one"]=>
-      int(1)
-      ["two"]=>
-      int(2)
-    }
-  }
-  [2]=>
-  int(1)
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_pad() : Passing 2-d array to $pad_value argument ***
 array(5) {
   [0]=>

diff --git a/ext/standard/tests/array/array_pad_variation6.phpt b/ext/standard/tests/array/array_pad_variation6.phpt
index 7db5e1462180be132a09058df80351f7b459f3f9..7a427d465df575a7541c7196f012ef3000f58996 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation6.phpt
+++ b/ext/standard/tests/array/array_pad_variation6.phpt
@@ -90,587 +90,7 @@ foreach($inputs as $input) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_pad() : Passing different arrays to $input argument ***
--- Iteration 1 --
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-}
--- Iteration 2 --
-array(6) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  float(1.1)
-  [5]=>
-  float(2.2)
-}
--- Iteration 3 --
-array(6) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  bool(false)
-  [5]=>
-  bool(true)
-}
--- Iteration 4 --
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
--- Iteration 5 --
-array(6) {
-  [0]=>
-  NULL
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  NULL
-}
--- Iteration 6 --
-array(6) {
-  [0]=>
-  string(3) "a\v\f"
-  [1]=>
-  string(5) "aaaa
-"
-  [2]=>
-  string(5) "b bbb"
-  [3]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(3) "a\v\f"
-  [3]=>
-  string(5) "aaaa
-"
-  [4]=>
-  string(5) "b bbb"
-  [5]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-}
--- Iteration 7 --
-array(6) {
-  [0]=>
-  string(5) "a\v\f"
-  [1]=>
-  string(6) "aaaa\r"
-  [2]=>
-  string(6) "b\tbbb"
-  [3]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "a\v\f"
-  [3]=>
-  string(6) "aaaa\r"
-  [4]=>
-  string(6) "b\tbbb"
-  [5]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-}
--- Iteration 8 --
-array(6) {
-  ["h1"]=>
-  string(1) "
-"
-  ["h2"]=>
-  string(86) "hello world
-The big brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [0]=>
-  string(90) "11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  ["h1"]=>
-  string(1) "
-"
-  ["h2"]=>
-  string(86) "hello world
-The big brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [2]=>
-  string(90) "11 < 12. 123 >22
-'single quoted string'
-"double quoted string"
-2222 != 1111.   0000 = 0000
-"
-}
--- Iteration 9 --
-array(6) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(5) "three"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(3) "one"
-  [4]=>
-  string(3) "two"
-  [5]=>
-  string(5) "three"
-}
--- Iteration 10 --
-array(6) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
--- Iteration 11 --
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(20)
-  [2]=>
-  int(40)
-  [3]=>
-  int(30)
-  [4]=>
-  string(5) "HELLO"
-  [5]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  int(10)
-  [3]=>
-  int(20)
-  [4]=>
-  int(40)
-  [5]=>
-  int(30)
-}
--- Iteration 12 --
-array(6) {
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  ["three"]=>
-  string(6) "thirty"
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  ["three"]=>
-  string(6) "thirty"
-}
--- Iteration 13 --
-array(6) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(4) "four"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  ["one"]=>
-  int(1)
-  [3]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
--- Iteration 14 --
-array(6) {
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
--- Iteration 15 --
-array(6) {
-  [0]=>
-  string(4) "true"
-  [1]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(4) "true"
-  [3]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- Iteration 16 --
-array(6) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
--- Iteration 17 --
-array(6) {
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
-array(6) {
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
--- Iteration 18 --
-array(6) {
-  [""]=>
-  int(4)
-  [0]=>
-  int(5)
-  [1]=>
-  int(6)
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [""]=>
-  int(4)
-  [3]=>
-  int(5)
-  [4]=>
-  int(6)
-}
--- Iteration 19 --
-array(6) {
-  ["One"]=>
-  int(10)
-  ["two"]=>
-  int(20)
-  ["three"]=>
-  int(3)
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-}
-array(6) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  ["One"]=>
-  int(10)
-  ["two"]=>
-  int(20)
-  ["three"]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_pad() : Passing different arrays to $input argument ***
 -- Iteration 1 --
 array(6) {

diff --git a/ext/standard/tests/array/array_pad_variation7.phpt b/ext/standard/tests/array/array_pad_variation7.phpt
index f93575724a04a6779689a7dc4eecf43f45db15da..b76a2b120976e141c95e98c02aa9a4d47bdf8999 100644 (file)
--- a/ext/standard/tests/array/array_pad_variation7.phpt
+++ b/ext/standard/tests/array/array_pad_variation7.phpt
@@ -38,94 +38,7 @@ var_dump( array_pad($input[1], -$pad_size, $pad_value) );  // negative 'pad_size
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_pad() : Passing 2-D array to $input argument ***
--- Entire 2-d array for $input argument --
-array(5) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  [2]=>
-  array(2) {
-    ["one"]=>
-    int(1)
-    ["two"]=>
-    int(2)
-  }
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-}
-array(5) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [3]=>
-  array(2) {
-    [0]=>
-    string(5) "hello"
-    [1]=>
-    string(5) "world"
-  }
-  [4]=>
-  array(2) {
-    ["one"]=>
-    int(1)
-    ["two"]=>
-    int(2)
-  }
-}
--- Sub array for $input argument --
-array(5) {
-  [0]=>
-  string(5) "hello"
-  [1]=>
-  string(5) "world"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "HELLO"
-  [4]=>
-  string(5) "HELLO"
-}
-array(5) {
-  [0]=>
-  string(5) "HELLO"
-  [1]=>
-  string(5) "HELLO"
-  [2]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_pad() : Passing 2-D array to $input argument ***
 -- Entire 2-d array for $input argument --
 array(5) {

diff --git a/ext/standard/tests/array/array_pop.phpt b/ext/standard/tests/array/array_pop.phpt
index 17902cb0b166a44ec34372dca2fd7d92e38caf5d..a134953a2b43997cc58f9ce71d317ceae98f4c53 100644 (file)
--- a/ext/standard/tests/array/array_pop.phpt
+++ b/ext/standard/tests/array/array_pop.phpt
@@ -42,183 +42,7 @@ foreach( $mixed_array as $sub_array )
 
 echo"\nDone";
 ?>
---EXPECTF--
-*** Normal testing with various array inputs ***
-
--- Input Array for Iteration 1 is --
-Array
-(
-)
-
-Output after Pop is :
-NULL
-
--- Input Array for Iteration 2 is --
-Array
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-    [5] => 6
-    [6] => 7
-    [7] => 8
-    [8] => 9
-)
-
-Output after Pop is :
-int(9)
-
--- Input Array for Iteration 3 is --
-Array
-(
-    [0] => One
-    [1] => _Two
-    [2] => Three
-    [3] => Four
-    [4] => Five
-)
-
-Output after Pop is :
-string(4) "Five"
-
--- Input Array for Iteration 4 is --
-Array
-(
-    [0] => 6
-    [1] => six
-    [2] => 7
-    [3] => seven
-    [4] => 8
-    [5] => eight
-    [6] => 9
-    [7] => nine
-)
-
-Output after Pop is :
-string(4) "nine"
-
--- Input Array for Iteration 5 is --
-Array
-(
-    [a] => aaa
-    [A] => AAA
-    [c] => ccc
-    [d] => ddd
-    [e] => eee
-)
-
-Output after Pop is :
-string(3) "eee"
-
--- Input Array for Iteration 6 is --
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => three
-    [4] => four
-    [5] => five
-)
-
-Output after Pop is :
-string(4) "five"
-
--- Input Array for Iteration 7 is --
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => 7
-    [4] => four
-    [5] => five
-)
-
-Output after Pop is :
-string(4) "five"
-
--- Input Array for Iteration 8 is --
-Array
-(
-    [f] => fff
-    [1] => one
-    [4] => 6
-    [] => 3
-    [2] => float
-    [F] => FFF
-    [blank] => 
-    [3] => 3.7
-    [5] => Five
-    [6] => 8.6
-    [4name] => jonny
-    [a] => 
-)
-
-Output after Pop is :
-NULL
-
--- Input Array for Iteration 9 is --
-Array
-(
-    [0] => 12
-    [1] => name
-    [2] => age
-    [3] => 45
-)
-
-Output after Pop is :
-string(2) "45"
-
--- Input Array for Iteration 10 is --
-Array
-(
-    [0] => Array
-        (
-            [0] => oNe
-            [1] => tWo
-            [2] => 4
-        )
-
-    [1] => Array
-        (
-            [0] => 10
-            [1] => 20
-            [2] => 30
-            [3] => 40
-            [4] => 50
-        )
-
-    [2] => Array
-        (
-        )
-
-)
-
-Output after Pop is :
-array(0) {
-}
-
--- Input Array for Iteration 11 is --
-Array
-(
-    [one] => 2
-    [three] => 3
-    [0] => 3
-    [1] => 4
-    [3] => 33
-    [4] => 44
-    [5] => 57
-    [6] => 6
-    [5.4] => 554
-    [5.7] => 557
-)
-
-Output after Pop is :
-int(557)
-
-Done
---UEXPECTF--
+--EXPECT--
 *** Normal testing with various array inputs ***
 
 -- Input Array for Iteration 1 is --

diff --git a/ext/standard/tests/array/array_pop_errors.phpt b/ext/standard/tests/array/array_pop_errors.phpt
index eaa4c1834fbc77dd8671c9083940f4d4a55eba65..68248c634d76fa77679bdc7b2caca78167e261b6 100644 (file)
--- a/ext/standard/tests/array/array_pop_errors.phpt
+++ b/ext/standard/tests/array/array_pop_errors.phpt
@@ -54,23 +54,6 @@ NULL
 Warning: array_pop() expects parameter 1 to be array, integer given in %s on line %d
 NULL
 
-Warning: array_pop() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_pop() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-NULL
-
-Done
---UEXPECTF--
-*** Testing Error Conditions ***
-
-Warning: array_pop() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: array_pop() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
 Warning: array_pop() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_pop_variation.phpt b/ext/standard/tests/array/array_pop_variation.phpt
index 795a8bcf86ac8d5054cc5664f749713ec4aadc87..c2e30cb7a3b1828c67852b5f91f90d12f9930ef4 100644 (file)
--- a/ext/standard/tests/array/array_pop_variation.phpt
+++ b/ext/standard/tests/array/array_pop_variation.phpt
@@ -39,7 +39,7 @@ var_dump( current($mixed_array[1]) );
 
 echo"\nDone";
 ?>
---EXPECTF--
+--EXPECT--
 *** Checking for internal array pointer being reset when pop is called ***
 
 Current Element is : int(1)

diff --git a/ext/standard/tests/array/array_push.phpt b/ext/standard/tests/array/array_push.phpt
index 60a57e0e9ba9608d4d39dae2903f5b0280871f7f..ad9246cbf9f20a8268480cbb6c852f2f7d0358ef 100644 (file)
--- a/ext/standard/tests/array/array_push.phpt
+++ b/ext/standard/tests/array/array_push.phpt
@@ -258,217 +258,6 @@ Array
 Output after push is :
 int(12)
 
-*** Checking for return value and the new array formed from push operation ***
-int(8)
-array(8) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(4) "_Two"
-  [2]=>
-  string(5) "Three"
-  [3]=>
-  string(4) "Four"
-  [4]=>
-  string(4) "Five"
-  [5]=>
-  int(22)
-  [6]=>
-  int(33)
-  [7]=>
-  string(2) "44"
-}
-
-Done
---UEXPECTF--
-*** Testing Error Conditions ***
-
-Warning: Wrong parameter count for array_push() in %s on line %d
-NULL
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-int(11)
-int(1)
-
-*** Testing with various array inputs ***
-
--- Input Array for Iteration 1 is --
-Array
-(
-)
-
-Output after push is :
-int(2)
-
--- Input Array for Iteration 2 is --
-Array
-(
-    [0] => 1
-    [1] => 2
-    [2] => 3
-    [3] => 4
-    [4] => 5
-    [5] => 6
-    [6] => 7
-    [7] => 8
-    [8] => 9
-    [9] => 1
-    [10] => 2
-)
-
-Output after push is :
-int(13)
-
--- Input Array for Iteration 3 is --
-Array
-(
-    [0] => One
-    [1] => _Two
-    [2] => Three
-    [3] => Four
-    [4] => Five
-)
-
-Output after push is :
-int(7)
-
--- Input Array for Iteration 4 is --
-Array
-(
-    [0] => 6
-    [1] => six
-    [2] => 7
-    [3] => seven
-    [4] => 8
-    [5] => eight
-    [6] => 9
-    [7] => nine
-)
-
-Output after push is :
-int(10)
-
--- Input Array for Iteration 5 is --
-Array
-(
-    [a] => aaa
-    [A] => AAA
-    [c] => ccc
-    [d] => ddd
-    [e] => eee
-)
-
-Output after push is :
-int(7)
-
--- Input Array for Iteration 6 is --
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => three
-    [4] => four
-    [5] => five
-)
-
-Output after push is :
-int(7)
-
--- Input Array for Iteration 7 is --
-Array
-(
-    [1] => one
-    [2] => two
-    [3] => 7
-    [4] => four
-    [5] => five
-)
-
-Output after push is :
-int(7)
-
--- Input Array for Iteration 8 is --
-Array
-(
-    [f] => fff
-    [1] => one
-    [4] => 6
-    [] => 3
-    [2] => float
-    [F] => FFF
-    [blank] => 
-    [3] => 3.7
-    [5] => Five
-    [6] => 8.6
-    [4name] => jonny
-    [a] => 
-)
-
-Output after push is :
-int(14)
-
--- Input Array for Iteration 9 is --
-Array
-(
-    [0] => 12
-    [1] => name
-    [2] => age
-    [3] => 45
-)
-
-Output after push is :
-int(6)
-
--- Input Array for Iteration 10 is --
-Array
-(
-    [0] => Array
-        (
-            [0] => oNe
-            [1] => tWo
-            [2] => 4
-        )
-
-    [1] => Array
-        (
-            [0] => 10
-            [1] => 20
-            [2] => 30
-            [3] => 40
-            [4] => 50
-        )
-
-    [2] => Array
-        (
-        )
-
-)
-
-Output after push is :
-int(5)
-
--- Input Array for Iteration 11 is --
-Array
-(
-    [one] => 2
-    [three] => 3
-    [0] => 3
-    [1] => 4
-    [3] => 33
-    [4] => 44
-    [5] => 57
-    [6] => 6
-    [5.4] => 554
-    [5.7] => 557
-)
-
-Output after push is :
-int(12)
-
 *** Checking for return value and the new array formed from push operation ***
 int(8)
 array(8) {

diff --git a/ext/standard/tests/array/array_push_basic.phpt b/ext/standard/tests/array/array_push_basic.phpt
index 862a70c96a71ff136cacffdbd99523701ed1adc5..8a04dfc6aed4185501c573435eb44bc7b1d1b50c 100644 (file)
--- a/ext/standard/tests/array/array_push_basic.phpt
+++ b/ext/standard/tests/array/array_push_basic.phpt
@@ -30,38 +30,7 @@ var_dump($array_assoc);
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_push() : basic functionality ***
-
--- Push values onto an indexed array --
-int(5)
-array(5) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-  [4]=>
-  string(4) "four"
-}
-
--- Push values onto an associative array --
-int(4)
-array(4) {
-  ["one"]=>
-  string(2) "un"
-  ["two"]=>
-  string(4) "deux"
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(4) "four"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_push() : basic functionality ***
 
 -- Push values onto an indexed array --
@@ -91,4 +60,4 @@ array(4) {
   [1]=>
   unicode(4) "four"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_push_error1.phpt b/ext/standard/tests/array/array_push_error1.phpt
index 87deb48f3dcbc87774fd0af9b9bf92384eee5147..464aafc023b0c74d2b7b53b07aab96be138c241e 100644 (file)
--- a/ext/standard/tests/array/array_push_error1.phpt
+++ b/ext/standard/tests/array/array_push_error1.phpt
@@ -28,11 +28,3 @@ echo "Done";
 Warning: Wrong parameter count for array_push() in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_push() : error conditions ***
-
--- Testing array_push() function with less than expected no. of arguments --
-
-Warning: Wrong parameter count for array_push() in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_push_error2.phpt b/ext/standard/tests/array/array_push_error2.phpt
index acc91b0b6ec56244182d16d6abb64298ea13c3c3..528bedc34bac44acb815b07507cd7247041f4821 100644 (file)
--- a/ext/standard/tests/array/array_push_error2.phpt
+++ b/ext/standard/tests/array/array_push_error2.phpt
@@ -27,29 +27,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_push() : error conditions ***
 int(3)
-array(3) {
-  [-%d]=>
-  string(3) "min"
-  [%d]=>
-  string(3) "max"
-  [-%d]=>
-  string(3) "new"
-}
-
-Warning: array_push(): Cannot add element to the array as the next element is already occupied in %s on line %d
-bool(false)
-array(3) {
-  [-%d]=>
-  string(3) "min"
-  [%d]=>
-  string(3) "max"
-  [-%d]=>
-  string(3) "new"
-}
-Done
---UEXPECTF--
-*** Testing array_push() : error conditions ***
-int(3)
 array(3) {
   [-2147483647]=>
   unicode(3) "min"
@@ -69,4 +46,4 @@ array(3) {
   [-2147483648]=>
   unicode(3) "new"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_push_variation1.phpt b/ext/standard/tests/array/array_push_variation1.phpt
index 6eb40b2ffeeb3e0deebbe5e8154b09f74bfc49e3..bbc68086dd55c390ccf6f00803977ac586d21270 100644 (file)
--- a/ext/standard/tests/array/array_push_variation1.phpt
+++ b/ext/standard/tests/array/array_push_variation1.phpt
@@ -223,129 +223,3 @@ bool(false)
 Warning: array_push(): First argument should be an array in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_push() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 2 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 3 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 4 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 5 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 6 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 7 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 8 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 9 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 10 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 11 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 12 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 13 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 14 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 15 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 16 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 17 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 18 --
-int(1)
-
--- Iteration 19 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 20 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 21 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 22 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 23 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 24 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-
--- Iteration 25 --
-
-Warning: array_push(): First argument should be an array in %s on line %d
-bool(false)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_push_variation2.phpt b/ext/standard/tests/array/array_push_variation2.phpt
index 74c739f50f524c1c3bda5cbb85b1b4eec4ef08bc..1696a04ff668b8c49479d1451156d6ca1cc30a39 100644 (file)
--- a/ext/standard/tests/array/array_push_variation2.phpt
+++ b/ext/standard/tests/array/array_push_variation2.phpt
@@ -98,7 +98,7 @@ fclose($fp);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing array_push() : usage variations ***
 
 -- Iteration 1 --
@@ -176,81 +176,3 @@ int(3)
 -- Iteration 25 --
 int(3)
 Done
---UEXPECTF--
-*** Testing array_push() : usage variations ***
-
--- Iteration 1 --
-int(3)
-
--- Iteration 2 --
-int(3)
-
--- Iteration 3 --
-int(3)
-
--- Iteration 4 --
-int(3)
-
--- Iteration 5 --
-int(3)
-
--- Iteration 6 --
-int(3)
-
--- Iteration 7 --
-int(3)
-
--- Iteration 8 --
-int(3)
-
--- Iteration 9 --
-int(3)
-
--- Iteration 10 --
-int(3)
-
--- Iteration 11 --
-int(3)
-
--- Iteration 12 --
-int(3)
-
--- Iteration 13 --
-int(3)
-
--- Iteration 14 --
-int(3)
-
--- Iteration 15 --
-int(3)
-
--- Iteration 16 --
-int(3)
-
--- Iteration 17 --
-int(3)
-
--- Iteration 18 --
-int(3)
-
--- Iteration 19 --
-int(3)
-
--- Iteration 20 --
-int(3)
-
--- Iteration 21 --
-int(3)
-
--- Iteration 22 --
-int(3)
-
--- Iteration 23 --
-int(3)
-
--- Iteration 24 --
-int(3)
-
--- Iteration 25 --
-int(3)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_push_variation3.phpt b/ext/standard/tests/array/array_push_variation3.phpt
index 904254ecac4068f23db90eb9d70c24f43b754c06..412bd43eea6bf0e5ed40600937953b0353ce5a33 100644 (file)
--- a/ext/standard/tests/array/array_push_variation3.phpt
+++ b/ext/standard/tests/array/array_push_variation3.phpt
@@ -27,48 +27,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_push() : usage variations ***
-
--- Pass array as $var argument --
-int(4)
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  array(2) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-  }
-}
-
--- Pass sub-array as $stack argument --
-int(3)
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  array(3) {
-    [0]=>
-    string(3) "one"
-    [1]=>
-    string(3) "two"
-    [2]=>
-    string(1) "a"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_push() : usage variations ***
 
 -- Pass array as $var argument --
@@ -108,4 +67,4 @@ array(4) {
     unicode(1) "a"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_push_variation4.phpt b/ext/standard/tests/array/array_push_variation4.phpt
index b1c54315e111e01edbd2958b2c410437c2a94baf..680d6f213ad0377f74a52b2a2ad0facf07694a20 100644 (file)
--- a/ext/standard/tests/array/array_push_variation4.phpt
+++ b/ext/standard/tests/array/array_push_variation4.phpt
@@ -51,112 +51,6 @@ Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing array_push() : usage variations ***
 
--- Pass array_push referenced varialbes as $var arguments --
-int(9)
-array(9) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  &string(1) "a"
-  [4]=>
-  &string(1) "b"
-  [5]=>
-  &string(1) "c"
-  [6]=>
-  &string(1) "x"
-  [7]=>
-  &string(1) "y"
-  [8]=>
-  &string(1) "z"
-}
-
--- Pass $var argument which is a reference to $stack argument --
-int(10)
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  &string(1) "a"
-  [4]=>
-  &string(1) "b"
-  [5]=>
-  &string(1) "c"
-  [6]=>
-  &string(1) "x"
-  [7]=>
-  &string(1) "y"
-  [8]=>
-  &string(1) "z"
-  [9]=>
-  &array(10) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    &string(1) "a"
-    [4]=>
-    &string(1) "b"
-    [5]=>
-    &string(1) "c"
-    [6]=>
-    &string(1) "x"
-    [7]=>
-    &string(1) "y"
-    [8]=>
-    &string(1) "z"
-    [9]=>
-    &array(10) {
-      [0]=>
-      int(1)
-      [1]=>
-      int(2)
-      [2]=>
-      int(3)
-      [3]=>
-      &string(1) "a"
-      [4]=>
-      &string(1) "b"
-      [5]=>
-      &string(1) "c"
-      [6]=>
-      &string(1) "x"
-      [7]=>
-      &string(1) "y"
-      [8]=>
-      &string(1) "z"
-      [9]=>
-      *RECURSION*
-    }
-  }
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_push() : usage variations ***
-
 -- Pass array_push referenced varialbes as $var arguments --
 int(9)
 array(9) {

diff --git a/ext/standard/tests/array/array_push_variation5.phpt b/ext/standard/tests/array/array_push_variation5.phpt
index 906a61a8af3a57b7b74ba1d3ff49c894e6ed7317..e5024daccff7b9137b598ddc7a91f4c09c839930 100644 (file)
--- a/ext/standard/tests/array/array_push_variation5.phpt
+++ b/ext/standard/tests/array/array_push_variation5.phpt
@@ -24,18 +24,7 @@ echo key($stack) . " => " . current ($stack) . "\n";
 
 echo "Done";
 ?>
---EXPECTF--
-
-*** Testing array_push() : usage variations ***
-
--- Call array_push() --
-int(3)
-
--- Position of Internal Pointer in Original Array: --
-one => un
-Done
-
---UEXPECTF--
+--EXPECT--
 
 *** Testing array_push() : usage variations ***
 

diff --git a/ext/standard/tests/array/array_push_variation6.phpt b/ext/standard/tests/array/array_push_variation6.phpt
index f40607bb2d32983a75ff41783667a76b37d4845c..903a7a5ef439c115fc24ad30f025a679040cee80 100644 (file)
--- a/ext/standard/tests/array/array_push_variation6.phpt
+++ b/ext/standard/tests/array/array_push_variation6.phpt
@@ -106,59 +106,7 @@ foreach($inputs as $key => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_push() : usage variations ***
-
--- Iteration 1 : int data --
-Before : int(4)
-After  : int(5)
-
--- Iteration 2 : float data --
-Before : int(3)
-After  : int(4)
-
--- Iteration 3 : extreme floats data --
-Before : int(2)
-After  : int(3)
-
--- Iteration 4 : null uppercase data --
-Before : int(1)
-After  : int(2)
-
--- Iteration 5 : null lowercase data --
-Before : int(1)
-After  : int(2)
-
--- Iteration 6 : bool lowercase data --
-Before : int(2)
-After  : int(3)
-
--- Iteration 7 : bool uppercase data --
-Before : int(2)
-After  : int(3)
-
--- Iteration 8 : empty double quotes data --
-Before : int(1)
-After  : int(2)
-
--- Iteration 9 : empty single quotes data --
-Before : int(1)
-After  : int(2)
-
--- Iteration 10 : string data --
-Before : int(3)
-After  : int(4)
-
--- Iteration 11 : undefined data --
-Before : int(1)
-After  : int(2)
-
--- Iteration 12 : unset data --
-Before : int(1)
-After  : int(2)
-Done
-
---UEXPECTF--
+--EXPECT--
 *** Testing array_push() : usage variations ***
 
 -- Iteration 1 : int data --

diff --git a/ext/standard/tests/array/array_rand.phpt b/ext/standard/tests/array/array_rand.phpt
index 1f495f4b129c04f730ba55006155748059535359..e500fc21e105db814498fa260f9ee97f9b346617 100644 (file)
--- a/ext/standard/tests/array/array_rand.phpt
+++ b/ext/standard/tests/array/array_rand.phpt
@@ -15,7 +15,7 @@ var_dump(array_rand(array(1,2,3), 2));
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d
 NULL
 NULL

diff --git a/ext/standard/tests/array/array_rand_basic1.phpt b/ext/standard/tests/array/array_rand_basic1.phpt
index 1f234822330cf3032ab651965268fd381beaeb32..0a8c2d88feda9d3bad1fa40181d4e861eaa25e6a 100644 (file)
--- a/ext/standard/tests/array/array_rand_basic1.phpt
+++ b/ext/standard/tests/array/array_rand_basic1.phpt
@@ -50,26 +50,3 @@ array(%d) {
 -- with default argument --
 int(%d)
 Done
-
---UEXPECTF--
-*** Testing array_rand() : array with default keys ***
-
--- with all default and optional arguments --
-array(%d) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-  [4]=>
-  int(%d)
-  [5]=>
-  int(%d)
-}
-
--- with default argument --
-int(%d)
-Done

diff --git a/ext/standard/tests/array/array_rand_basic2.phpt b/ext/standard/tests/array/array_rand_basic2.phpt
index b822ca60a76b4c37f3b4eac4cd7063dc6d205b20..65f199b281706262062fb3b2d85acabf625fff2d 100644 (file)
--- a/ext/standard/tests/array/array_rand_basic2.phpt
+++ b/ext/standard/tests/array/array_rand_basic2.phpt
@@ -36,29 +36,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_rand() : with associative array ***
 
--- with all default and optional arguments --
-array(6) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-  [2]=>
-  string(%d) "%s"
-  [3]=>
-  string(%d) "%s"
-  [4]=>
-  string(%d) "%s"
-  [5]=>
-  string(%d) "%s"
-}
-
--- with default argument --
-string(%d) "%s"
-Done
-
---UEXPECTF--
-*** Testing array_rand() : with associative array ***
-
 -- with all default and optional arguments --
 array(6) {
   [0]=>

diff --git a/ext/standard/tests/array/array_rand_error.phpt b/ext/standard/tests/array/array_rand_error.phpt
index 70237446185f0d373e8088350e3e82ef48d86b9c..34b9195df931ecbeb1189f999b7d0141c0cffe7c 100644 (file)
--- a/ext/standard/tests/array/array_rand_error.phpt
+++ b/ext/standard/tests/array/array_rand_error.phpt
@@ -35,17 +35,3 @@ NULL
 Warning: array_rand() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing array_rand() : error conditions ***
-
--- Testing array_rand() function with Zero arguments --
-
-Warning: array_rand() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing array_rand() function with more than expected no. of arguments --
-
-Warning: array_rand() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_rand_variation1.phpt b/ext/standard/tests/array/array_rand_variation1.phpt
index 4f3c4732c0d6b0413d0d652f740d44a45596bd63..b7ef108538f2afca19df789598450731e4525a66 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation1.phpt
+++ b/ext/standard/tests/array/array_rand_variation1.phpt
@@ -176,125 +176,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_rand() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_rand() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_rand() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_rand() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_rand() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_rand() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_rand() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_rand() expects parameter 1 to be array, null given in %s on line %d
-NULL
-Done
-
---UEXPECTF--
-*** Testing array_rand() : unexpected values for 'input' parameter ***
-
--- Iteration 1 --
-
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_rand() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_rand() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_rand() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_rand() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_rand() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_rand() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_rand() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_rand() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_rand() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_rand() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_rand_variation2.phpt b/ext/standard/tests/array/array_rand_variation2.phpt
index 140c30afda71e48991cfbdfb162b2576e820482a..3a11216771b9fc8f7d2a3f2eebe1c7afaff87058 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation2.phpt
+++ b/ext/standard/tests/array/array_rand_variation2.phpt
@@ -179,133 +179,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_rand() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_rand() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_rand() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_rand() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_rand() expects parameter 2 to be long, object given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-Done
-
---UEXPECTF--
-*** Testing array_rand() : unexpected values for 'num_req' parameter ***
-
--- Iteration 1 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 2 --
-int(%d)
-
--- Iteration 3 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 5 --
-array(10) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-  [4]=>
-  int(%d)
-  [5]=>
-  int(%d)
-  [6]=>
-  int(%d)
-  [7]=>
-  int(%d)
-  [8]=>
-  int(%d)
-  [9]=>
-  int(%d)
-}
-
--- Iteration 6 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 12 --
-int(%d)
-
--- Iteration 13 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 14 --
-int(%d)
-
--- Iteration 15 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_rand() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_rand_variation3.phpt b/ext/standard/tests/array/array_rand_variation3.phpt
index 49f1ca856f67af9d4e955b61c14af4adf3148633..62ab6b8dbdaacafbfe1218cb6bbb010562a15f22 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation3.phpt
+++ b/ext/standard/tests/array/array_rand_variation3.phpt
@@ -147,94 +147,3 @@ array(3) {
   int(%d)
 }
 Done
-
---UEXPECTF--
-*** Testing array_rand() : with multi-dimensional array ***
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
-*** Testing array_rand() with arrays having different types of values ***
-
--- Iteration 1 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 2 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 3 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 4 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 5 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 6 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 7 --
-int(%d)
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-Done

diff --git a/ext/standard/tests/array/array_rand_variation4.phpt b/ext/standard/tests/array/array_rand_variation4.phpt
index 5d66506ee948e6efdff5ed560a1da4f3ea2674ed..e0eddbb5aca0ba16942a4b3480903f8fcb67c7e4 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation4.phpt
+++ b/ext/standard/tests/array/array_rand_variation4.phpt
@@ -87,106 +87,6 @@ array\(2\) {
 
 -- Iteration 2 --
 
-With default argument
-string\([0-9]*\) "[ot1 ]*[hnw2]*[eort]*[ew]*[e]*[l]*[v]*[e]*"
-
-With num_req = 1
-string\([0-9]*\) "[ot1 ]*[hnw2]*[eort]*[ew]*[e]*[l]*[v]*[e]*"
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  string\([0-9]*\) "[ot1 ]*[hnw2]*[eort]*[ew]*[e]*[l]*[v]*[e]*"
-  \[1\]=>
-  string\([0-9]*\) "[ot1 ]*[hnw2]*[eort]*[ew]*[e]*[l]*[v]*[e]*"
-}
-
--- Iteration 3 --
-
-With default argument
-int\([23-]*[2570]*[345]*[58]*\)
-
-With num_req = 1
-int\([23-]*[2570]*[345]*[58]*\)
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  int\([23-]*[2570]*[345]*[58]*\)
-  \[1\]=>
-  int\([23-]*[2570]*[345]*[58]*\)
-}
-
--- Iteration 4 --
-
-With default argument
-int\([18-]*[023]*[8]*\)
-
-With num_req = 1
-int\([18-]*[023]*[8]*\)
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  int\([18-]*[023]*[8]*\)
-  \[1\]=>
-  int\([18-]*[023]*[8]*\)
-}
-
--- Iteration 5 --
-
-With default argument
-int\([01]\)
-
-With num_req = 1
-int\([01]\)
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  int\([01]\)
-  \[1\]=>
-  int\([01]\)
-}
-
--- Iteration 6 --
-
-With default argument
-string\([0-9]*\) "[#&!N  <\n\t'"\0]*[U#$>]*[rL]*[L]*"
-
-With num_req = 1
-string\([0-9]*\) "[#&!N  <\n\t'"\0]*[U#$>]*[rL]*[L]*"
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  string\([0-9]*\) "[#&!N  <\n\t'"\0]*[U#$>]*[rL]*[L]*"
-  \[1\]=>
-  string\([0-9]*\) "[#&!N  <\n\t'"\0]*[U#$>]*[rL]*[L]*"
-}
-Done
-
---UEXPECTREGEX--
-\*\*\* Testing array_rand\(\) : with associative arrays \*\*\*
-
--- Iteration 1 --
-
-With default argument
-int\([012-][12.e]*[23e]*[34]*[5]*[6]*[7]*[8]*[9]*[0]*\)
-
-With num_req = 1
-int\([012-][12.e]*[23e]*[34]*[5]*[6]*[7]*[8]*[9]*[0]*\)
-
-With num_req = 2
-array\(2\) {
-  \[0\]=>
-  int\([012-][12.e]*[23e]*[34]*[5]*[6]*[7]*[8]*[9]*[0]*\)
-  \[1\]=>
-  int\([012-][12.e]*[23e]*[34]*[5]*[6]*[7]*[8]*[9]*[0]*\)
-}
-
--- Iteration 2 --
-
 With default argument
 unicode\([0-9]*\) "[ot1 ]*[hnw2]*[eort]*[ew]*[e]*[l]*[v]*[e]*"
 

diff --git a/ext/standard/tests/array/array_rand_variation5.phpt b/ext/standard/tests/array/array_rand_variation5.phpt
index 0ec34900e7bc7ec1ecea83e541b72f45cc81335c..e578d812525c9dadfa054c58f4b84bccf8c1bc6d 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation5.phpt
+++ b/ext/standard/tests/array/array_rand_variation5.phpt
@@ -72,33 +72,3 @@ NULL
 Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing array_rand() : with invalid values for 'req_num' ***
-
--- With default num_req value --
-int(%d)
-
--- With num_req = 1 --
-int(%d)
-
--- With num_req = 0 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- With num_req = -1 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- With num_req = -2 --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-
--- With num_req more than number of members in 'input' array --
-
-Warning: array_rand(): Second argument has to be between 1 and the number of elements in the array in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_rand_variation6.phpt b/ext/standard/tests/array/array_rand_variation6.phpt
index 67915c24fa90403ad9b81228b74dc31af0b37d13..a19301b20f837fc9ae731353d4c03c6fc5d2479b 100644 (file)
--- a/ext/standard/tests/array/array_rand_variation6.phpt
+++ b/ext/standard/tests/array/array_rand_variation6.phpt
@@ -69,42 +69,6 @@ echo "Done";
 --EXPECTREGEX--
 \*\*\* Testing array_rand\(\) : with keys of input array as heredoc strings \*\*\*
 
--- with default parameters --
-string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-
--- with num_req = 1 --
-string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-
--- with num_req = 3 --
-array\(3\) {
-  \[0\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[1\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[2\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-}
-
--- with num_req = 6 --
-array\(6\) {
-  \[0\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[1\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[2\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[3\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[4\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-  \[5\]=>
-  string\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
-}
-Done
-
---UEXPECTREGEX--
-\*\*\* Testing array_rand\(\) : with keys of input array as heredoc strings \*\*\*
-
 -- with default parameters --
 unicode\([0-9]*\) "[a-z \n \t \0 0-9  ]*"
 

diff --git a/ext/standard/tests/array/array_reverse_basic1.phpt b/ext/standard/tests/array/array_reverse_basic1.phpt
index 4ad6594d0c304c347197feabb223567ac3ec0a47..eb36b32a184402f55367916c34d289189c8b64f2 100644 (file)
--- a/ext/standard/tests/array/array_reverse_basic1.phpt
+++ b/ext/standard/tests/array/array_reverse_basic1.phpt
@@ -27,51 +27,6 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing array_reverse() : basic functionality ***
-array(6) {
-  [0]=>
-  float(13.33)
-  [1]=>
-  int(10)
-  [2]=>
-  string(4) "blue"
-  [3]=>
-  string(3) "red"
-  [4]=>
-  string(5) "green"
-  [5]=>
-  string(1) "a"
-}
-array(6) {
-  [5]=>
-  float(13.33)
-  [4]=>
-  int(10)
-  [3]=>
-  string(4) "blue"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(5) "green"
-  [0]=>
-  string(1) "a"
-}
-array(6) {
-  [0]=>
-  float(13.33)
-  [1]=>
-  int(10)
-  [2]=>
-  string(4) "blue"
-  [3]=>
-  string(3) "red"
-  [4]=>
-  string(5) "green"
-  [5]=>
-  string(1) "a"
-}
-Done
---UEXPECTF--
-*** Testing array_reverse() : basic functionality ***
 array(6) {
   [0]=>
   float(13.33)

diff --git a/ext/standard/tests/array/array_reverse_basic2.phpt b/ext/standard/tests/array/array_reverse_basic2.phpt
index 657b01bce6a3f3c0e7ff730c185db0bec858f039..8e9a7abc05116b5eed72fde573de975e4f73d357 100644 (file)
--- a/ext/standard/tests/array/array_reverse_basic2.phpt
+++ b/ext/standard/tests/array/array_reverse_basic2.phpt
@@ -27,39 +27,6 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing array_reverse() : basic functionality ***
-array(4) {
-  [0]=>
-  float(13.33)
-  ["string"]=>
-  string(4) "blue"
-  [1]=>
-  string(6) "number"
-  ["a"]=>
-  string(5) "hello"
-}
-array(4) {
-  [10]=>
-  float(13.33)
-  ["string"]=>
-  string(4) "blue"
-  [123]=>
-  string(6) "number"
-  ["a"]=>
-  string(5) "hello"
-}
-array(4) {
-  [0]=>
-  float(13.33)
-  ["string"]=>
-  string(4) "blue"
-  [1]=>
-  string(6) "number"
-  ["a"]=>
-  string(5) "hello"
-}
-Done
---UEXPECTF--
-*** Testing array_reverse() : basic functionality ***
 array(4) {
   [0]=>
   float(13.33)

diff --git a/ext/standard/tests/array/array_reverse_error.phpt b/ext/standard/tests/array/array_reverse_error.phpt
index 964314456c8ee26bee6cc2f22453f52938355da2..faf7e8243f3d36ce55ab80472e266ed945b0cd47 100644 (file)
--- a/ext/standard/tests/array/array_reverse_error.phpt
+++ b/ext/standard/tests/array/array_reverse_error.phpt
@@ -38,19 +38,3 @@ NULL
 Warning: array_reverse() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_reverse() : error conditions ***
-
--- Testing array_reverse() function with Zero arguments --
-
-Warning: array_reverse() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing array_diff() function with more than expected no. of arguments --
-
-Warning: array_reverse() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-
-Warning: array_reverse() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_reverse_variation1.phpt b/ext/standard/tests/array/array_reverse_variation1.phpt
index 4c70df4d46f61a203007b947736f50b2e239d085..d49c4539ddddccdeac7bf14563e979bebbae647e 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation1.phpt
+++ b/ext/standard/tests/array/array_reverse_variation1.phpt
@@ -248,249 +248,6 @@ NULL
 Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
 NULL
 
--- Iteration 16 --
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-Warning: array_reverse() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 23 --
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-Warning: array_reverse() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_reverse() : usage variations - unexpected values for 'array' argument ***
-
--- Iteration 1 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
-Warning: array_reverse() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
 -- Iteration 16 --
 Warning: array_reverse() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL

diff --git a/ext/standard/tests/array/array_reverse_variation2.phpt b/ext/standard/tests/array/array_reverse_variation2.phpt
index 0fd75d0e1bdc60426b330d9ec7186af2229855be..6a7ff75d6b8e4dbe5a683159f6eb8549a190e487 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation2.phpt
+++ b/ext/standard/tests/array/array_reverse_variation2.phpt
@@ -99,322 +99,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_reverse() : usage variations ***
 -- Iteration 1 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 2 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 3 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 4 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 5 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 6 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 7 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 8 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 9 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 10 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, array given in %s on line %d
-NULL
--- Iteration 15 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 16 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 17 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 18 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 19 --
-array(6) {
-  [4]=>
-  string(4) "pink"
-  [3]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [1]=>
-  string(4) "blue"
-  [0]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 20 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 21 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 22 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 23 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, object given in %s on line %d
-NULL
--- Iteration 24 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 25 --
-array(6) {
-  [0]=>
-  string(4) "pink"
-  [1]=>
-  string(6) "orange"
-  [2]=>
-  string(3) "red"
-  [3]=>
-  string(4) "blue"
-  [4]=>
-  string(3) "red"
-  ["a"]=>
-  string(5) "green"
-}
--- Iteration 26 --
-
-Warning: array_reverse() expects parameter 2 to be boolean, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_reverse() : usage variations ***
--- Iteration 1 --
 array(6) {
   [0]=>
   unicode(4) "pink"

diff --git a/ext/standard/tests/array/array_reverse_variation3.phpt b/ext/standard/tests/array/array_reverse_variation3.phpt
index 51723d303915cb7747bc98f3838b5eec354ccbd4..22de1176fd131010d6a4bbd412a08dc2333ac820 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation3.phpt
+++ b/ext/standard/tests/array/array_reverse_variation3.phpt
@@ -81,526 +81,7 @@ fclose($fp);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_reverse() : usage variations ***
--- Iteration 1 --
-- with default argument -
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(1)
-}
-- with $preserve keys = true -
-array(2) {
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-- with $preserve_keys = false -
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(1)
-}
--- Iteration 2 --
-- with default argument -
-array(2) {
-  [0]=>
-  float(2.2)
-  [1]=>
-  float(1.1)
-}
-- with $preserve keys = true -
-array(2) {
-  [1]=>
-  float(2.2)
-  [0]=>
-  float(1.1)
-}
-- with $preserve_keys = false -
-array(2) {
-  [0]=>
-  float(2.2)
-  [1]=>
-  float(1.1)
-}
--- Iteration 3 --
-- with default argument -
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-- with $preserve keys = true -
-array(2) {
-  [1]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [0]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
-- with $preserve_keys = false -
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-}
--- Iteration 4 --
-- with default argument -
-array(2) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-}
-- with $preserve keys = true -
-array(2) {
-  [1]=>
-  bool(true)
-  [0]=>
-  bool(false)
-}
-- with $preserve_keys = false -
-array(2) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-}
--- Iteration 5 --
-- with default argument -
-array(0) {
-}
-- with $preserve keys = true -
-array(0) {
-}
-- with $preserve_keys = false -
-array(0) {
-}
--- Iteration 6 --
-- with default argument -
-array(1) {
-  [0]=>
-  NULL
-}
-- with $preserve keys = true -
-array(1) {
-  [0]=>
-  NULL
-}
-- with $preserve_keys = false -
-array(1) {
-  [0]=>
-  NULL
-}
--- Iteration 7 --
-- with default argument -
-array(6) {
-  [0]=>
-  string(5) "ccccc"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(4) "bbbb"
-  [3]=>
-  string(1) "b"
-  [4]=>
-  string(4) "aaaa"
-  [5]=>
-  string(1) "a"
-}
-- with $preserve keys = true -
-array(6) {
-  [5]=>
-  string(5) "ccccc"
-  [4]=>
-  string(1) "c"
-  [3]=>
-  string(4) "bbbb"
-  [2]=>
-  string(1) "b"
-  [1]=>
-  string(4) "aaaa"
-  [0]=>
-  string(1) "a"
-}
-- with $preserve_keys = false -
-array(6) {
-  [0]=>
-  string(5) "ccccc"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(4) "bbbb"
-  [3]=>
-  string(1) "b"
-  [4]=>
-  string(4) "aaaa"
-  [5]=>
-  string(1) "a"
-}
--- Iteration 8 --
-- with default argument -
-array(3) {
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(3) "one"
-}
-- with $preserve keys = true -
-array(3) {
-  [3]=>
-  string(5) "three"
-  [2]=>
-  string(3) "two"
-  [1]=>
-  string(3) "one"
-}
-- with $preserve_keys = false -
-array(3) {
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(3) "one"
-}
--- Iteration 9 --
-- with default argument -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
-- with $preserve keys = true -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
-- with $preserve_keys = false -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
--- Iteration 10 --
-- with default argument -
-array(4) {
-  [0]=>
-  int(30)
-  [1]=>
-  int(40)
-  [2]=>
-  int(20)
-  [3]=>
-  int(10)
-}
-- with $preserve keys = true -
-array(4) {
-  [3]=>
-  int(30)
-  [4]=>
-  int(40)
-  [2]=>
-  int(20)
-  [1]=>
-  int(10)
-}
-- with $preserve_keys = false -
-array(4) {
-  [0]=>
-  int(30)
-  [1]=>
-  int(40)
-  [2]=>
-  int(20)
-  [3]=>
-  int(10)
-}
--- Iteration 11 --
-- with default argument -
-array(3) {
-  ["three"]=>
-  string(6) "thirty"
-  ["two"]=>
-  string(6) "twenty"
-  ["one"]=>
-  string(3) "ten"
-}
-- with $preserve keys = true -
-array(3) {
-  ["three"]=>
-  string(6) "thirty"
-  ["two"]=>
-  string(6) "twenty"
-  ["one"]=>
-  string(3) "ten"
-}
-- with $preserve_keys = false -
-array(3) {
-  ["three"]=>
-  string(6) "thirty"
-  ["two"]=>
-  string(6) "twenty"
-  ["one"]=>
-  string(3) "ten"
-}
--- Iteration 12 --
-- with default argument -
-array(3) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(3) "two"
-  ["one"]=>
-  int(1)
-}
-- with $preserve keys = true -
-array(3) {
-  [4]=>
-  string(4) "four"
-  [2]=>
-  string(3) "two"
-  ["one"]=>
-  int(1)
-}
-- with $preserve_keys = false -
-array(3) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(3) "two"
-  ["one"]=>
-  int(1)
-}
--- Iteration 13 --
-- with default argument -
-array(3) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  [""]=>
-  string(4) "null"
-}
-- with $preserve keys = true -
-array(3) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  [""]=>
-  string(4) "null"
-}
-- with $preserve_keys = false -
-array(3) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  [""]=>
-  string(4) "null"
-}
--- Iteration 14 --
-- with default argument -
-array(4) {
-  ["true"]=>
-  bool(true)
-  ["false"]=>
-  bool(false)
-  [0]=>
-  string(5) "false"
-  [1]=>
-  string(4) "true"
-}
-- with $preserve keys = true -
-array(4) {
-  ["true"]=>
-  bool(true)
-  ["false"]=>
-  bool(false)
-  [0]=>
-  string(5) "false"
-  [1]=>
-  string(4) "true"
-}
-- with $preserve_keys = false -
-array(4) {
-  ["true"]=>
-  bool(true)
-  ["false"]=>
-  bool(false)
-  [0]=>
-  string(5) "false"
-  [1]=>
-  string(4) "true"
-}
--- Iteration 15 --
-- with default argument -
-array(3) {
-  ["emptys"]=>
-  string(0) ""
-  ["emptyd"]=>
-  string(0) ""
-  [""]=>
-  string(6) "emptys"
-}
-- with $preserve keys = true -
-array(3) {
-  ["emptys"]=>
-  string(0) ""
-  ["emptyd"]=>
-  string(0) ""
-  [""]=>
-  string(6) "emptys"
-}
-- with $preserve_keys = false -
-array(3) {
-  ["emptys"]=>
-  string(0) ""
-  ["emptyd"]=>
-  string(0) ""
-  [""]=>
-  string(6) "emptys"
-}
--- Iteration 16 --
-- with default argument -
-array(6) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-  [4]=>
-  string(0) ""
-  [5]=>
-  string(0) ""
-}
-- with $preserve keys = true -
-array(6) {
-  [6]=>
-  bool(true)
-  [5]=>
-  bool(false)
-  [4]=>
-  NULL
-  [3]=>
-  NULL
-  [2]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
-- with $preserve_keys = false -
-array(6) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-  [2]=>
-  NULL
-  [3]=>
-  NULL
-  [4]=>
-  string(0) ""
-  [5]=>
-  string(0) ""
-}
--- Iteration 17 --
-- with default argument -
-array(3) {
-  [0]=>
-  int(6)
-  [1]=>
-  int(5)
-  [""]=>
-  int(4)
-}
-- with $preserve keys = true -
-array(3) {
-  [1]=>
-  int(6)
-  [0]=>
-  int(5)
-  [""]=>
-  int(4)
-}
-- with $preserve_keys = false -
-array(3) {
-  [0]=>
-  int(6)
-  [1]=>
-  int(5)
-  [""]=>
-  int(4)
-}
--- Iteration 18 --
-- with default argument -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(20)
-  ["One"]=>
-  int(10)
-}
-- with $preserve keys = true -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(20)
-  ["One"]=>
-  int(10)
-}
-- with $preserve_keys = false -
-array(3) {
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(20)
-  ["One"]=>
-  int(10)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_reverse() : usage variations ***
 -- Iteration 1 --
 - with default argument -

diff --git a/ext/standard/tests/array/array_reverse_variation4.phpt b/ext/standard/tests/array/array_reverse_variation4.phpt
index 9dcf5f8fe0ab5ee851a97211b3e3a7089edadc7f..49b319f24a4d7764192df6d44f51b04975c242ac 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation4.phpt
+++ b/ext/standard/tests/array/array_reverse_variation4.phpt
@@ -89,301 +89,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
-- default argument -
-array(0) {
-}
-- $preserve keys = true -
-array(0) {
-}
-- $preserve_keys = false -
-array(0) {
-}
--- Iteration 2 --
-- default argument -
-array(1) {
-  [0]=>
-  string(1) "0"
-}
-- $preserve keys = true -
-array(1) {
-  [0]=>
-  string(1) "0"
-}
-- $preserve_keys = false -
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 3 --
-- default argument -
-array(1) {
-  [0]=>
-  string(1) "1"
-}
-- $preserve keys = true -
-array(1) {
-  [1]=>
-  string(1) "1"
-}
-- $preserve_keys = false -
-array(1) {
-  [0]=>
-  string(1) "1"
-}
--- Iteration 4 --
-- default argument -
-array(4) {
-  [0]=>
-  string(1) "4"
-  [1]=>
-  string(1) "3"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "1"
-}
-- $preserve keys = true -
-array(4) {
-  [4]=>
-  string(1) "4"
-  [3]=>
-  string(1) "3"
-  [2]=>
-  string(1) "2"
-  [1]=>
-  string(1) "1"
-}
-- $preserve_keys = false -
-array(4) {
-  [0]=>
-  string(1) "4"
-  [1]=>
-  string(1) "3"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "1"
-}
--- Iteration 5 --
-- default argument -
-array(1) {
-  [0]=>
-  string(5) "float"
-}
-- $preserve keys = true -
-array(1) {
-  [2]=>
-  string(5) "float"
-}
-- $preserve_keys = false -
-array(1) {
-  [0]=>
-  string(5) "float"
-}
--- Iteration 6 --
-- default argument -
-array(4) {
-  [0]=>
-  string(2) "f4"
-  [1]=>
-  string(2) "f3"
-  [2]=>
-  string(2) "f2"
-  [3]=>
-  string(2) "f1"
-}
-- $preserve keys = true -
-array(4) {
-  [33333333]=>
-  string(2) "f4"
-  [4]=>
-  string(2) "f3"
-  [3]=>
-  string(2) "f2"
-  [1]=>
-  string(2) "f1"
-}
-- $preserve_keys = false -
-array(4) {
-  [0]=>
-  string(2) "f4"
-  [1]=>
-  string(2) "f3"
-  [2]=>
-  string(2) "f2"
-  [3]=>
-  string(2) "f1"
-}
--- Iteration 7 --
-- default argument -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
-- $preserve keys = true -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
-- $preserve_keys = false -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
--- Iteration 8 --
-- default argument -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
-- $preserve keys = true -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
-- $preserve_keys = false -
-array(4) {
-  ["pen
-"]=>
-  int(33)
-  ["\v\fworld"]=>
-  float(2.2)
-  ["re d"]=>
-  string(5) "color"
-  ["   Hello"]=>
-  int(111)
-}
--- Iteration 9 --
-- default argument -
-array(2) {
-  ["Hello world"]=>
-  string(6) "string"
-  [0]=>
-  string(5) "hello"
-}
-- $preserve keys = true -
-array(2) {
-  ["Hello world"]=>
-  string(6) "string"
-  [0]=>
-  string(5) "hello"
-}
-- $preserve_keys = false -
-array(2) {
-  ["Hello world"]=>
-  string(6) "string"
-  [0]=>
-  string(5) "hello"
-}
--- Iteration 10 --
-- default argument -
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
-- $preserve keys = true -
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
-- $preserve_keys = false -
-array(1) {
-  [""]=>
-  string(5) "hello"
-}
--- Iteration 11 --
-- default argument -
-array(6) {
-  ["Hello world"]=>
-  string(7) "heredoc"
-  [""]=>
-  string(5) "unset"
-  [0]=>
-  string(5) "float"
-  [1]=>
-  string(3) "int"
-  ["fruit"]=>
-  float(2.2)
-  ["hello"]=>
-  int(1)
-}
-- $preserve keys = true -
-array(6) {
-  ["Hello world"]=>
-  string(7) "heredoc"
-  [""]=>
-  string(5) "unset"
-  [444]=>
-  string(5) "float"
-  [133]=>
-  string(3) "int"
-  ["fruit"]=>
-  float(2.2)
-  ["hello"]=>
-  int(1)
-}
-- $preserve_keys = false -
-array(6) {
-  ["Hello world"]=>
-  string(7) "heredoc"
-  [""]=>
-  string(5) "unset"
-  [0]=>
-  string(5) "float"
-  [1]=>
-  string(3) "int"
-  ["fruit"]=>
-  float(2.2)
-  ["hello"]=>
-  int(1)
-}
-Done
---UEXPECTF--
-*** Testing array_reverse() : usage variations ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 - default argument -

diff --git a/ext/standard/tests/array/array_reverse_variation5.phpt b/ext/standard/tests/array/array_reverse_variation5.phpt
index c5e55682e7cbd76e087a270240fcd0fdbc6fc293..1ceb396d0c7757aaef4eeb9b2860790df86ee427 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation5.phpt
+++ b/ext/standard/tests/array/array_reverse_variation5.phpt
@@ -129,320 +129,6 @@ array(1) {
 }
 -- Iteration 4 --
 - default argument -
-array(4) {
-  [0]=>
-  int(4)
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
-- $preserve keys = true -
-array(4) {
-  [4]=>
-  int(4)
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
-- $preserve_keys = false -
-array(4) {
-  [0]=>
-  int(4)
-  ["three"]=>
-  int(3)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(1)
-}
--- Iteration 5 --
-- default argument -
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
-- $preserve keys = true -
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
-- $preserve_keys = false -
-array(1) {
-  ["float"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-- default argument -
-array(4) {
-  ["f4"]=>
-  float(33333333.3333)
-  [0]=>
-  float(4.8999992284)
-  ["f2"]=>
-  float(3.33)
-  ["f1"]=>
-  float(1.2)
-}
-- $preserve keys = true -
-array(4) {
-  ["f4"]=>
-  float(33333333.3333)
-  [3]=>
-  float(4.8999992284)
-  ["f2"]=>
-  float(3.33)
-  ["f1"]=>
-  float(1.2)
-}
-- $preserve_keys = false -
-array(4) {
-  ["f4"]=>
-  float(33333333.3333)
-  [0]=>
-  float(4.8999992284)
-  ["f2"]=>
-  float(3.33)
-  ["f1"]=>
-  float(1.2)
-}
--- Iteration 7 --
-- default argument -
-array(4) {
-  [0]=>
-  string(4) "pen
-"
-  [1]=>
-  string(7) "\v\fworld"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(6) "  Hello"
-}
-- $preserve keys = true -
-array(4) {
-  [3]=>
-  string(4) "pen
-"
-  [2]=>
-  string(7) "\v\fworld"
-  ["red"]=>
-  string(6) "col       or"
-  [111]=>
-  string(6) "  Hello"
-}
-- $preserve_keys = false -
-array(4) {
-  [0]=>
-  string(4) "pen
-"
-  [1]=>
-  string(7) "\v\fworld"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(6) "  Hello"
-}
--- Iteration 8 --
-- default argument -
-array(4) {
-  [0]=>
-  string(5) "pen\n"
-  [1]=>
-  string(9) "\v\fworld"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(7) "\tHello"
-}
-- $preserve keys = true -
-array(4) {
-  [3]=>
-  string(5) "pen\n"
-  [2]=>
-  string(9) "\v\fworld"
-  ["red"]=>
-  string(7) "col\tor"
-  [111]=>
-  string(7) "\tHello"
-}
-- $preserve_keys = false -
-array(4) {
-  [0]=>
-  string(5) "pen\n"
-  [1]=>
-  string(9) "\v\fworld"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(7) "\tHello"
-}
--- Iteration 9 --
-- default argument -
-array(2) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  [0]=>
-  string(5) "hello"
-}
-- $preserve keys = true -
-array(2) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  [1]=>
-  string(5) "hello"
-}
-- $preserve_keys = false -
-array(2) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  [0]=>
-  string(5) "hello"
-}
--- Iteration 10 --
-- default argument -
-array(3) {
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["unset"]=>
-  NULL
-  [0]=>
-  object(classA)#%d (0) {
-  }
-}
-- $preserve keys = true -
-array(3) {
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["unset"]=>
-  NULL
-  [11]=>
-  object(classA)#%d (0) {
-  }
-}
-- $preserve_keys = false -
-array(3) {
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["unset"]=>
-  NULL
-  [0]=>
-  object(classA)#%d (0) {
-  }
-}
--- Iteration 11 --
-- default argument -
-array(8) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  ["unset"]=>
-  NULL
-  ["float"]=>
-  float(444.432)
-  ["int"]=>
-  int(133)
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [0]=>
-  string(5) "fruit"
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  [2]=>
-  string(5) "hello"
-}
-- $preserve keys = true -
-array(8) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  ["unset"]=>
-  NULL
-  ["float"]=>
-  float(444.432)
-  ["int"]=>
-  int(133)
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [222]=>
-  string(5) "fruit"
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [1]=>
-  string(5) "hello"
-}
-- $preserve_keys = false -
-array(8) {
-  ["heredoc"]=>
-  string(11) "Hello world"
-  ["unset"]=>
-  NULL
-  ["float"]=>
-  float(444.432)
-  ["int"]=>
-  int(133)
-  ["resource"]=>
-  resource(%d) of type (stream)
-  [0]=>
-  string(5) "fruit"
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  [2]=>
-  string(5) "hello"
-}
-Done
---UEXPECTF--
-*** Testing array_reverse() : usage variations ***
--- Iteration 1 --
-- default argument -
-array(0) {
-}
-- $preserve keys = true -
-array(0) {
-}
-- $preserve_keys = false -
-array(0) {
-}
--- Iteration 2 --
-- default argument -
-array(1) {
-  [0]=>
-  int(0)
-}
-- $preserve keys = true -
-array(1) {
-  [0]=>
-  int(0)
-}
-- $preserve_keys = false -
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 3 --
-- default argument -
-array(1) {
-  [0]=>
-  int(1)
-}
-- $preserve keys = true -
-array(1) {
-  [1]=>
-  int(1)
-}
-- $preserve_keys = false -
-array(1) {
-  [0]=>
-  int(1)
-}
--- Iteration 4 --
-- default argument -
 array(4) {
   [0]=>
   int(4)

diff --git a/ext/standard/tests/array/array_reverse_variation6.phpt b/ext/standard/tests/array/array_reverse_variation6.phpt
index 4ea0c33b2c2368d6f84bc05779bc5d9ffdd3a3a8..5e3d757e56dce522673bf5be7b11207516615161 100644 (file)
--- a/ext/standard/tests/array/array_reverse_variation6.phpt
+++ b/ext/standard/tests/array/array_reverse_variation6.phpt
@@ -43,171 +43,7 @@ var_dump( array_reverse($two_dimensional_array[1], false) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_reverse() : usage variations ***
--- with default argument --
-array(3) {
-  [0]=>
-  array(7) {
-    ["a"]=>
-    string(5) "green"
-    [0]=>
-    string(3) "red"
-    [1]=>
-    string(5) "brown"
-    [2]=>
-    int(33)
-    [3]=>
-    int(88)
-    [4]=>
-    string(6) "orange"
-    ["item"]=>
-    string(4) "ball"
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [2]=>
-  array(3) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-    ["place"]=>
-    string(2) "LA"
-  }
-}
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(4)
-  [2]=>
-  int(3)
-  [3]=>
-  int(2)
-  [4]=>
-  int(1)
-}
--- with all possible arguments --
-array(3) {
-  [2]=>
-  array(7) {
-    ["a"]=>
-    string(5) "green"
-    [0]=>
-    string(3) "red"
-    [1]=>
-    string(5) "brown"
-    [2]=>
-    int(33)
-    [3]=>
-    int(88)
-    [4]=>
-    string(6) "orange"
-    ["item"]=>
-    string(4) "ball"
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [0]=>
-  array(3) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-    ["place"]=>
-    string(2) "LA"
-  }
-}
-array(3) {
-  [0]=>
-  array(7) {
-    ["a"]=>
-    string(5) "green"
-    [0]=>
-    string(3) "red"
-    [1]=>
-    string(5) "brown"
-    [2]=>
-    int(33)
-    [3]=>
-    int(88)
-    [4]=>
-    string(6) "orange"
-    ["item"]=>
-    string(4) "ball"
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [2]=>
-  array(3) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-    ["place"]=>
-    string(2) "LA"
-  }
-}
-array(5) {
-  [4]=>
-  int(5)
-  [3]=>
-  int(4)
-  [2]=>
-  int(3)
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(4)
-  [2]=>
-  int(3)
-  [3]=>
-  int(2)
-  [4]=>
-  int(1)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_reverse() : usage variations ***
 -- with default argument --
 array(3) {

diff --git a/ext/standard/tests/array/array_search.phpt b/ext/standard/tests/array/array_search.phpt
index bce7c76c2a6b57a7f814e5b6aa12e063723e42c4..3ed53eb7c2086ef67c35eac30661bc77a1dbab04 100644 (file)
Binary files a/ext/standard/tests/array/array_search.phpt and b/ext/standard/tests/array/array_search.phpt differ

diff --git a/ext/standard/tests/array/array_search1.phpt b/ext/standard/tests/array/array_search1.phpt
index 6973f75350ccd30f858b75a56c0cd8d61ffcb3e7..a9fc1dc47efc7dc2510a1f1d675676702c86dec1 100644 (file)
--- a/ext/standard/tests/array/array_search1.phpt
+++ b/ext/standard/tests/array/array_search1.phpt
@@ -18,22 +18,7 @@ var_dump(array_search(-1,$a, true));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
-NULL
-int(1)
-bool(false)
-int(1)
-int(1)
-int(2)
-string(1) "c"
-int(1)
-bool(false)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_search_errors.phpt b/ext/standard/tests/array/array_search_errors.phpt
index 37b0f2fc40c9e789f7ecdb8f43fe2e030783587c..b27dbb53e63e0cedc7cff917c78d52c8f113e8fc 100644 (file)
--- a/ext/standard/tests/array/array_search_errors.phpt
+++ b/ext/standard/tests/array/array_search_errors.phpt
@@ -36,24 +36,6 @@ NULL
 Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: array_search() expects parameter 2 to be array, string given in %s on line %d
-NULL
-
-Warning: array_search() expects parameter 2 to be array, integer given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing error conditions of array_search() ***
-
-Warning: array_search() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: array_search() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
-Warning: array_search() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
 Warning: array_search() expects parameter 2 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_search_variation1.phpt b/ext/standard/tests/array/array_search_variation1.phpt
index 4e1310a94eb9e7ac4dc8454b9a625e9696c72623..0f3c9f79816769f736dec787ffefc02f1dbf7e99 100644 (file)
--- a/ext/standard/tests/array/array_search_variation1.phpt
+++ b/ext/standard/tests/array/array_search_variation1.phpt
@@ -60,586 +60,7 @@ foreach($arrays as $array) {
                
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_search() with different needle values ***
--- Iteration 1 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 2 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 3 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 4 --
-int(0)
-bool(false)
-int(0)
--- Iteration 5 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 6 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 7 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 8 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 9 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 10 --
-int(0)
-bool(false)
-int(0)
--- Iteration 11 --
-int(0)
-bool(false)
-int(0)
--- Iteration 12 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 13 --
-int(0)
-bool(false)
-int(0)
--- Iteration 14 --
-int(0)
-bool(false)
-int(0)
--- Iteration 15 --
-int(0)
-bool(false)
-int(0)
--- Iteration 16 --
-int(0)
-bool(false)
-int(0)
--- Iteration 17 --
-int(0)
-int(0)
-int(0)
--- Iteration 18 --
-int(0)
-bool(false)
-int(0)
--- Iteration 19 --
-int(4)
-int(4)
-int(4)
--- Iteration 20 --
-int(4)
-bool(false)
-int(4)
--- Iteration 21 --
-int(4)
-bool(false)
-int(4)
--- Iteration 22 --
-int(5)
-int(5)
-int(5)
--- Iteration 23 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 24 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 25 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 26 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 27 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 28 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 29 --
-string(0) ""
-bool(false)
-string(0) ""
--- Iteration 30 --
-string(0) ""
-bool(false)
-string(0) ""
--- Iteration 31 --
-string(0) ""
-string(0) ""
-string(0) ""
--- Iteration 32 --
-int(6)
-int(6)
-int(6)
--- Iteration 33 --
-int(7)
-int(7)
-int(7)
--- Iteration 34 --
-string(1) "a"
-bool(false)
-string(1) "a"
--- Iteration 35 --
-string(1) "a"
-bool(false)
-string(1) "a"
--- Iteration 36 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 37 --
-int(0)
-int(0)
-int(0)
--- Iteration 38 --
-int(0)
-bool(false)
-int(0)
--- Iteration 39 --
-int(0)
-bool(false)
-int(0)
--- Iteration 40 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 41 --
-int(5)
-bool(false)
-int(5)
--- Iteration 42 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 43 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 44 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 45 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 46 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 47 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 48 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 49 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 50 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 51 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 52 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 53 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 54 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 55 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 56 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 57 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 58 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 59 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 60 --
-int(1)
-int(1)
-int(1)
--- Iteration 61 --
-int(1)
-bool(false)
-int(1)
--- Iteration 62 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 63 --
-string(3) "-.9"
-bool(false)
-string(3) "-.9"
--- Iteration 64 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 65 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 66 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 67 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 68 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 69 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 70 --
-int(2)
-bool(false)
-int(2)
--- Iteration 71 --
-int(2)
-bool(false)
-int(2)
--- Iteration 72 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 73 --
-int(0)
-bool(false)
-int(0)
--- Iteration 74 --
-int(0)
-bool(false)
-int(0)
--- Iteration 75 --
-int(0)
-bool(false)
-int(0)
--- Iteration 76 --
-int(0)
-bool(false)
-int(0)
--- Iteration 77 --
-int(0)
-bool(false)
-int(0)
--- Iteration 78 --
-int(0)
-bool(false)
-int(0)
--- Iteration 79 --
-int(0)
-bool(false)
-int(0)
--- Iteration 80 --
-int(0)
-bool(false)
-int(0)
--- Iteration 81 --
-int(0)
-bool(false)
-int(0)
--- Iteration 82 --
-int(0)
-bool(false)
-int(0)
--- Iteration 83 --
-int(1)
-bool(false)
-int(1)
--- Iteration 84 --
-int(1)
-bool(false)
-int(1)
--- Iteration 85 --
-int(1)
-bool(false)
-int(1)
--- Iteration 86 --
-int(0)
-bool(false)
-int(0)
--- Iteration 87 --
-int(0)
-bool(false)
-int(0)
--- Iteration 88 --
-int(1)
-bool(false)
-int(1)
--- Iteration 89 --
-int(1)
-bool(false)
-int(1)
--- Iteration 90 --
-int(0)
-bool(false)
-int(0)
--- Iteration 91 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 92 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 93 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 94 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 95 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 96 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 97 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 98 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 99 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 100 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 101 --
-int(0)
-int(0)
-int(0)
--- Iteration 102 --
-int(1)
-int(1)
-int(1)
--- Iteration 103 --
-int(0)
-bool(false)
-int(0)
--- Iteration 104 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 105 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 106 --
-int(0)
-bool(false)
-int(0)
--- Iteration 107 --
-int(0)
-bool(false)
-int(0)
--- Iteration 108 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 109 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 110 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 111 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 112 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 113 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 114 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 115 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 116 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 117 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 118 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 119 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 120 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 121 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 122 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 123 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 124 --
-int(0)
-bool(false)
-int(0)
--- Iteration 125 --
-int(0)
-bool(false)
-int(0)
--- Iteration 126 --
-int(0)
-int(0)
-int(0)
--- Iteration 127 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 128 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 129 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 130 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 131 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 132 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 133 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 134 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 135 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 136 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 137 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 138 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 139 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 140 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 141 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 142 --
-int(0)
-bool(false)
-int(0)
--- Iteration 143 --
-int(0)
-bool(false)
-int(0)
--- Iteration 144 --
-bool(false)
-bool(false)
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_search() with different needle values ***
 -- Iteration 1 --
 bool(false)

diff --git a/ext/standard/tests/array/array_search_variation2.phpt b/ext/standard/tests/array/array_search_variation2.phpt
index 308a4145faef393cd2d8f4853bbcf3ae23787dd4..b5a1e743a0051bccd3427edcdaa65ba262259667 100644 (file)
--- a/ext/standard/tests/array/array_search_variation2.phpt
+++ b/ext/standard/tests/array/array_search_variation2.phpt
@@ -49,58 +49,7 @@ foreach($array_type as $type) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing array_search() with different haystack values ***
--- Iteration 1 --
-int(0)
-int(3)
-int(0)
--- Iteration 2 --
-string(1) "y"
-int(4)
-string(1) "y"
--- Iteration 3 --
-int(3)
-bool(false)
-int(3)
--- Iteration 4 --
-string(3) "key"
-int(2)
-string(3) "key"
--- Iteration 5 --
-int(3)
-bool(false)
-int(3)
--- Iteration 6 --
-int(3)
-bool(false)
-int(3)
--- Iteration 7 --
-int(2)
-bool(false)
-int(2)
--- Iteration 8 --
-int(3)
-bool(false)
-int(3)
--- Iteration 9 --
-string(1) "y"
-string(1) "y"
-string(1) "y"
--- Iteration 10 --
-string(1) "y"
-bool(false)
-string(1) "y"
--- Iteration 11 --
-int(2)
-bool(false)
-int(2)
--- Iteration 12 --
-string(1) "y"
-string(0) ""
-string(1) "y"
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_search() with different haystack values ***
 -- Iteration 1 --
 int(0)

diff --git a/ext/standard/tests/array/array_search_variation3.phpt b/ext/standard/tests/array/array_search_variation3.phpt
index 11f0eed1632d6bd341aaaf492d83e0e5affee59e..3106cdb37249a5b642faa4ebcfcf53ab991534f5 100644 (file)
--- a/ext/standard/tests/array/array_search_variation3.phpt
+++ b/ext/standard/tests/array/array_search_variation3.phpt
@@ -44,21 +44,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing sub-arrays with array_search() ***
 int(4)
-string(5) "three"
-int(5)
-
-*** Testing objects with array_search() ***
-
-Warning: array_search() expects parameter 2 to be array, object given in %s on line %d
-NULL
-
-Warning: array_search() expects parameter 2 to be array, object given in %s on line %d
-NULL
-int(1)
-Done
---UEXPECTF--
-*** Testing sub-arrays with array_search() ***
-int(4)
 unicode(5) "three"
 int(5)
 

diff --git a/ext/standard/tests/array/array_search_variation4.phpt b/ext/standard/tests/array/array_search_variation4.phpt
index 92ea4e2905d4365ddb73fca18c38a5f989efab40..ead06954abc56a0d55948015a34f5dd3ad976511 100644 (file)
--- a/ext/standard/tests/array/array_search_variation4.phpt
+++ b/ext/standard/tests/array/array_search_variation4.phpt
@@ -55,24 +55,7 @@ var_dump( array_search('123abc', array(123), TRUE) ); // false in strict mode
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing resource type with array_search() ***
-int(0)
-bool(false)
-
-*** Testing miscelleneos inputs with array_search() ***
-int(0)
-bool(false)
-int(0)
-int(0)
-bool(true)
-int(0)
-bool(false)
-bool(false)
-int(0)
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing resource type with array_search() ***
 int(0)
 bool(false)

diff --git a/ext/standard/tests/array/array_shift_basic.phpt b/ext/standard/tests/array/array_shift_basic.phpt
index 74aea48bf3088ced1d7c25bfaa5c179812ef7690..6860b308aef8a71cdc1c6ad668845c8d146a8907 100644 (file)
--- a/ext/standard/tests/array/array_shift_basic.phpt
+++ b/ext/standard/tests/array/array_shift_basic.phpt
@@ -25,34 +25,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_shift() : basic functionality ***
-
--- Before shift: --
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [3]=>
-  string(5) "three"
-  ["four"]=>
-  int(4)
-}
-
--- After shift: --
-Returned value:        string(4) "zero"
-New array:
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(5) "three"
-  ["four"]=>
-  int(4)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_shift() : basic functionality ***
 
 -- Before shift: --
@@ -78,4 +51,4 @@ array(3) {
   [u"four"]=>
   int(4)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_error.phpt b/ext/standard/tests/array/array_shift_error.phpt
index 0c0d4d3b43c998c1226e4aeed025b83661bfcf88..dcb485fa3be4d32b84954a35a4a972558507789e 100644 (file)
--- a/ext/standard/tests/array/array_shift_error.phpt
+++ b/ext/standard/tests/array/array_shift_error.phpt
@@ -38,16 +38,3 @@ NULL
 Warning: array_shift() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_shift() : error conditions ***
-
--- Testing array_shift() function with Zero arguments --
-
-Warning: array_shift() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing array_shift() function with more than expected no. of arguments --
-
-Warning: array_shift() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_shift_variation1.phpt b/ext/standard/tests/array/array_shift_variation1.phpt
index ad02590c44fbb1063585ba17d3143dc205c95831..4e29cb5036767aade3d9c5cbde30034d02195047 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation1.phpt
+++ b/ext/standard/tests/array/array_shift_variation1.phpt
@@ -173,129 +173,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_shift() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_shift() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_shift() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_shift() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_shift() expects parameter 1 to be array, resource given in %s on line 85
-NULL
-Done
---UEXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_shift() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_shift() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_shift() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_shift() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_shift() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_shift() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_shift() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_shift() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_shift() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_shift() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 
@@ -338,4 +215,4 @@ NULL
 
 Warning: array_shift() expects parameter 1 to be array, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation2.phpt b/ext/standard/tests/array/array_shift_variation2.phpt
index e4e83851b8c2fd97a75e607fefc7a4bf031f970b..13ef464082d181e316149747fb3fad6243d19052 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation2.phpt
+++ b/ext/standard/tests/array/array_shift_variation2.phpt
@@ -164,93 +164,6 @@ array(3) {
   bool(false)
 }
 
--- Iteration 5: empty string data --
-string(0) ""
-array(1) {
-  [0]=>
-  string(0) ""
-}
-
--- Iteration 6: empty array data --
-NULL
-array(0) {
-}
-
--- Iteration 7: string data --
-string(6) "string"
-array(2) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(11) "hello world"
-}
-
--- Iteration 8: object data --
-object(classA)#%d (0) {
-}
-array(0) {
-}
-
--- Iteration 9: undefined data --
-NULL
-array(0) {
-}
-
--- Iteration 10: unset data --
-NULL
-array(0) {
-}
-
--- Iteration 11: resource data --
-resource(%d) of type (stream)
-array(0) {
-}
-Done
---UEXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Iteration 1: int data --
-int(0)
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(12345)
-  [2]=>
-  int(-2345)
-}
-
--- Iteration 2: float data --
-float(10.5)
-array(4) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  float(123456789000)
-  [2]=>
-  float(1.23456789E-9)
-  [3]=>
-  float(0.5)
-}
-
--- Iteration 3: null data --
-NULL
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 4: bool data --
-bool(true)
-array(3) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(false)
-}
-
 -- Iteration 5: empty string data --
 unicode(0) ""
 array(1) {
@@ -292,4 +205,4 @@ array(0) {
 resource(%d) of type (stream)
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation3.phpt b/ext/standard/tests/array/array_shift_variation3.phpt
index 6d0264ad15d61fc375c6ec30d256722c450e131a..6b3d4c8585d2f3120c40379476cdd208636f74d6 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation3.phpt
+++ b/ext/standard/tests/array/array_shift_variation3.phpt
@@ -103,90 +103,7 @@ foreach($inputs as $key => $input) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Iteration 1 : int data --
-string(4) "zero"
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(8) "positive"
-  [2]=>
-  string(8) "negative"
-}
-
--- Iteration 2 : float data --
-string(8) "positive"
-array(2) {
-  [0]=>
-  string(8) "negative"
-  [1]=>
-  string(4) "half"
-}
-
--- Iteration 3 : extreme floats data --
-string(5) "large"
-array(1) {
-  [0]=>
-  string(5) "small"
-}
-
--- Iteration 4 : null uppercase data --
-string(6) "null 1"
-array(0) {
-}
-
--- Iteration 5 : null lowercase data --
-string(6) "null 2"
-array(0) {
-}
-
--- Iteration 6 : bool lowercase data --
-string(6) "lowert"
-array(1) {
-  [0]=>
-  string(6) "lowerf"
-}
-
--- Iteration 7 : bool uppercase data --
-string(6) "uppert"
-array(1) {
-  [0]=>
-  string(6) "upperf"
-}
-
--- Iteration 8 : empty double quotes data --
-string(6) "emptyd"
-array(0) {
-}
-
--- Iteration 9 : empty single quotes data --
-string(6) "emptys"
-array(0) {
-}
-
--- Iteration 10 : string data --
-string(7) "stringd"
-array(2) {
-  ["strings"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-}
-
--- Iteration 11 : undefined data --
-string(9) "undefined"
-array(0) {
-}
-
--- Iteration 12 : unset data --
-string(5) "unset"
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_shift() : usage variations ***
 
 -- Iteration 1 : int data --
@@ -268,4 +185,4 @@ array(0) {
 unicode(5) "unset"
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation4.phpt b/ext/standard/tests/array/array_shift_variation4.phpt
index 29d5510058344241db4d3bc3c1710aab94f2e65d..320fef365064d87a9aabe34ab58bec62884f3325 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation4.phpt
+++ b/ext/standard/tests/array/array_shift_variation4.phpt
@@ -36,78 +36,7 @@ var_dump($stack_last);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Before shift: --
----- $stack_first:
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
----- $stack_last:
-array(3) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
--- After shift: --
----- Pop array from array:
-Returned value:        array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-New array:
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
----- Pop element from array within array:
-Returned value:        int(1)
-New array:
-array(3) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  array(2) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(3)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_shift() : usage variations ***
 
 -- Before shift: --
@@ -177,4 +106,4 @@ array(3) {
     int(3)
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation5.phpt b/ext/standard/tests/array/array_shift_variation5.phpt
index 548d7a758ba34e408f961d56f33056f86cac2f85..0523d5b95a754236e42d4ce1ff8b34c18908c6c2 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation5.phpt
+++ b/ext/standard/tests/array/array_shift_variation5.phpt
@@ -37,22 +37,9 @@ echo "Done";
 
 Strict Standards: Only variables should be passed by reference in %s on line %d
 
-Strict Standards: Only variables should be passed by reference in %s on line %d
-string(4) "zero"
-
--- Correct Method: --
-string(4) "zero"
-Done
---UEXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Incorrect Method: --
-
-Strict Standards: Only variables should be passed by reference in %s on line %d
-
 Strict Standards: Only variables should be passed by reference in %s on line %d
 unicode(4) "zero"
 
 -- Correct Method: --
 unicode(4) "zero"
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation6.phpt b/ext/standard/tests/array/array_shift_variation6.phpt
index 3794adc921c22bddcd132afd8b856b5762beaa5c..3cd60c489831541a9e866b640632e829c9a8e56d 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation6.phpt
+++ b/ext/standard/tests/array/array_shift_variation6.phpt
@@ -37,51 +37,7 @@ var_dump($copied_array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Variable is referenced array --
-Result: string(4) "zero"
-
-$original_array:
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
-
-$copied_array:
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
-
--- Element is referenced array --
-Result: string(3) "one"
-
-$new_array:
-array(3) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    string(3) "two"
-  }
-  [1]=>
-  int(1)
-  [2]=>
-  string(3) "two"
-}
-
-$copied_array
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_shift() : usage variations ***
 
 -- Variable is referenced array --
@@ -124,4 +80,4 @@ array(1) {
   [0]=>
   unicode(3) "two"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation7.phpt b/ext/standard/tests/array/array_shift_variation7.phpt
index 8e00473a74f3918d2e872ae90ec8416a1ce0363f..1255ebccd50d9980d6613328a6a82674635daca6 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation7.phpt
+++ b/ext/standard/tests/array/array_shift_variation7.phpt
@@ -23,16 +23,7 @@ echo key($stack) . " => " . current ($stack) . "\n";
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Call array_shift() --
-string(2) "un"
-
--- Position of Internal Pointer in Passed Array: --
-two => deux
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_shift() : usage variations ***
 
 -- Call array_shift() --
@@ -40,4 +31,4 @@ unicode(2) "un"
 
 -- Position of Internal Pointer in Passed Array: --
 two => deux
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_shift_variation8.phpt b/ext/standard/tests/array/array_shift_variation8.phpt
index 3f49a459d082ff1b8085235bf5782f62bfbb320d..093605c1a30eb8c072fa99abaa624f6527bc71fb 100644 (file)
--- a/ext/standard/tests/array/array_shift_variation8.phpt
+++ b/ext/standard/tests/array/array_shift_variation8.phpt
@@ -48,14 +48,3 @@ a = 1, b = 2
 -- Reference first element before array_shift: --
 a = 2, b = 2
 Done
---UEXPECTF--
-*** Testing array_shift() : usage variations ***
-
--- Reference result of array_shift: --
-
-Strict Standards: Only variables should be assigned by reference in %s on line %d
-a = 1, b = 2
-
--- Reference first element before array_shift: --
-a = 2, b = 2
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_shuffle_basic.phpt b/ext/standard/tests/array/array_shuffle_basic.phpt
index fdf932605be3bf2ee2d8bd6f7113956025a506b0..84868a8b7db76bbb770e5541a9b48f0cf3d07bcc 100644 (file)
--- a/ext/standard/tests/array/array_shuffle_basic.phpt
+++ b/ext/standard/tests/array/array_shuffle_basic.phpt
@@ -34,7 +34,7 @@ echo "this should be 4->...." . count(array_intersect($arr1, $arr2)) . "\n";
 $bigarray = range(1, 400);
 shuffle($bigarray);
 echo "this should be 400->...." . count($bigarray) . "\n";
-echo "*** testing pass by reference  \n";
+echo "*** testing pass by reference...\n";
 $original = $bigarray;
 shuffle($bigarray);
 $diffarray = array_diff_assoc($original, $bigarray);
@@ -46,7 +46,7 @@ if (count($diffarray) < 350) {
     var_dump($original);
     var_dump($bigarray);
 } else {
-    echo "test passed \n";
+    echo "test passed\n";
 }
 ?>
 --EXPECT--
@@ -95,5 +95,5 @@ array(4) {
 this should be 0->....0
 this should be 4->....4
 this should be 400->....400
-*** testing pass by reference  
-test passed 
\ No newline at end of file
+*** testing pass by reference...
+test passed

diff --git a/ext/standard/tests/array/array_slice.phpt b/ext/standard/tests/array/array_slice.phpt
index 9c244fda13a8753324ccfc906cba0d8e646c4018..ba7b4f3cc529de107565f4115ce182bd34b316d6 100644 (file)
--- a/ext/standard/tests/array/array_slice.phpt
+++ b/ext/standard/tests/array/array_slice.phpt
@@ -107,1375 +107,6 @@ Warning: array_slice() expects parameter 1 to be array, integer given in %s on l
 
 *** Output for string Argument ***
 
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-
-*** Iteration 1 ***
-
-*** Variation with first two Arguments ***
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first three Arguments ***
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 2 ***
-
-*** Variation with first two Arguments ***
-array(8) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-  [4]=>
-  int(6)
-  [5]=>
-  int(7)
-  [6]=>
-  int(8)
-  [7]=>
-  int(9)
-}
-array(9) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-}
-array(2) {
-  [0]=>
-  int(8)
-  [1]=>
-  int(9)
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-}
-array(0) {
-}
-array(5) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-  [4]=>
-  int(6)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-array(2) {
-  [0]=>
-  int(8)
-  [1]=>
-  int(9)
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-}
-array(0) {
-}
-array(5) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-array(2) {
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 3 ***
-
-*** Variation with first two Arguments ***
-array(4) {
-  [0]=>
-  string(3) "Two"
-  [1]=>
-  string(5) "Three"
-  [2]=>
-  string(4) "Four"
-  [3]=>
-  string(4) "Five"
-}
-array(5) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(3) "Two"
-  [2]=>
-  string(5) "Three"
-  [3]=>
-  string(4) "Four"
-  [4]=>
-  string(4) "Five"
-}
-array(2) {
-  [0]=>
-  string(4) "Four"
-  [1]=>
-  string(4) "Five"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(3) "Two"
-  [1]=>
-  string(5) "Three"
-  [2]=>
-  string(4) "Four"
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(3) "Two"
-}
-array(3) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(3) "Two"
-  [2]=>
-  string(5) "Three"
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(3) "Two"
-}
-array(2) {
-  [0]=>
-  string(4) "Four"
-  [1]=>
-  string(4) "Five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [1]=>
-  string(3) "Two"
-  [2]=>
-  string(5) "Three"
-  [3]=>
-  string(4) "Four"
-}
-array(0) {
-}
-array(1) {
-  [1]=>
-  string(3) "Two"
-}
-array(3) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(3) "Two"
-  [2]=>
-  string(5) "Three"
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  string(3) "One"
-  [1]=>
-  string(3) "Two"
-}
-array(2) {
-  [3]=>
-  string(4) "Four"
-  [4]=>
-  string(4) "Five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 4 ***
-
-*** Variation with first two Arguments ***
-array(7) {
-  [0]=>
-  string(3) "six"
-  [1]=>
-  int(7)
-  [2]=>
-  string(5) "seven"
-  [3]=>
-  int(8)
-  [4]=>
-  string(5) "eight"
-  [5]=>
-  int(9)
-  [6]=>
-  string(4) "nine"
-}
-array(8) {
-  [0]=>
-  int(6)
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-  [3]=>
-  string(5) "seven"
-  [4]=>
-  int(8)
-  [5]=>
-  string(5) "eight"
-  [6]=>
-  int(9)
-  [7]=>
-  string(4) "nine"
-}
-array(2) {
-  [0]=>
-  int(9)
-  [1]=>
-  string(4) "nine"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(3) "six"
-  [1]=>
-  int(7)
-  [2]=>
-  string(5) "seven"
-}
-array(0) {
-}
-array(4) {
-  [0]=>
-  string(3) "six"
-  [1]=>
-  int(7)
-  [2]=>
-  string(5) "seven"
-  [3]=>
-  int(8)
-}
-array(3) {
-  [0]=>
-  int(6)
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-}
-array(0) {
-}
-array(5) {
-  [0]=>
-  int(6)
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-  [3]=>
-  string(5) "seven"
-  [4]=>
-  int(8)
-}
-array(2) {
-  [0]=>
-  int(9)
-  [1]=>
-  string(4) "nine"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-  [3]=>
-  string(5) "seven"
-}
-array(0) {
-}
-array(4) {
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-  [3]=>
-  string(5) "seven"
-  [4]=>
-  int(8)
-}
-array(3) {
-  [0]=>
-  int(6)
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-}
-array(0) {
-}
-array(5) {
-  [0]=>
-  int(6)
-  [1]=>
-  string(3) "six"
-  [2]=>
-  int(7)
-  [3]=>
-  string(5) "seven"
-  [4]=>
-  int(8)
-}
-array(2) {
-  [6]=>
-  int(9)
-  [7]=>
-  string(4) "nine"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 5 ***
-
-*** Variation with first two Arguments ***
-array(4) {
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-  ["d"]=>
-  string(3) "ddd"
-  ["e"]=>
-  string(3) "eee"
-}
-array(5) {
-  ["a"]=>
-  string(3) "aaa"
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-  ["d"]=>
-  string(3) "ddd"
-  ["e"]=>
-  string(3) "eee"
-}
-array(2) {
-  ["d"]=>
-  string(3) "ddd"
-  ["e"]=>
-  string(3) "eee"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-  ["d"]=>
-  string(3) "ddd"
-}
-array(0) {
-}
-array(1) {
-  ["A"]=>
-  string(3) "AAA"
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-}
-array(0) {
-}
-array(2) {
-  ["a"]=>
-  string(3) "aaa"
-  ["A"]=>
-  string(3) "AAA"
-}
-array(2) {
-  ["d"]=>
-  string(3) "ddd"
-  ["e"]=>
-  string(3) "eee"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-  ["d"]=>
-  string(3) "ddd"
-}
-array(0) {
-}
-array(1) {
-  ["A"]=>
-  string(3) "AAA"
-}
-array(3) {
-  ["a"]=>
-  string(3) "aaa"
-  ["A"]=>
-  string(3) "AAA"
-  ["c"]=>
-  string(3) "ccc"
-}
-array(0) {
-}
-array(2) {
-  ["a"]=>
-  string(3) "aaa"
-  ["A"]=>
-  string(3) "AAA"
-}
-array(2) {
-  ["d"]=>
-  string(3) "ddd"
-  ["e"]=>
-  string(3) "eee"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 6 ***
-
-*** Variation with first two Arguments ***
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "four"
-  [3]=>
-  string(4) "five"
-}
-array(5) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(5) "three"
-  [3]=>
-  string(4) "four"
-  [4]=>
-  string(4) "five"
-}
-array(2) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(4) "five"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "four"
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(5) "three"
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
-array(2) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(4) "five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-  [4]=>
-  string(4) "four"
-}
-array(0) {
-}
-array(1) {
-  [2]=>
-  string(3) "two"
-}
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-}
-array(0) {
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-array(2) {
-  [4]=>
-  string(4) "four"
-  [5]=>
-  string(4) "five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 7 ***
-
-*** Variation with first two Arguments ***
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  int(7)
-  [2]=>
-  string(4) "four"
-  [3]=>
-  string(4) "five"
-}
-array(5) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  int(7)
-  [3]=>
-  string(4) "four"
-  [4]=>
-  string(4) "five"
-}
-array(2) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(4) "five"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  int(7)
-  [2]=>
-  string(4) "four"
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  int(7)
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-}
-array(2) {
-  [0]=>
-  string(4) "four"
-  [1]=>
-  string(4) "five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [2]=>
-  string(3) "two"
-  [3]=>
-  int(7)
-  [4]=>
-  string(4) "four"
-}
-array(0) {
-}
-array(1) {
-  [2]=>
-  string(3) "two"
-}
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  int(7)
-}
-array(0) {
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-array(2) {
-  [4]=>
-  string(4) "four"
-  [5]=>
-  string(4) "five"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 8 ***
-
-*** Variation with first two Arguments ***
-array(9) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-  [3]=>
-  float(3.7)
-  [4]=>
-  string(4) "Five"
-  [5]=>
-  float(8.6)
-}
-array(10) {
-  ["f"]=>
-  string(3) "fff"
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-  [3]=>
-  float(3.7)
-  [4]=>
-  string(4) "Five"
-  [5]=>
-  float(8.6)
-}
-array(2) {
-  [0]=>
-  string(4) "Five"
-  [1]=>
-  float(8.6)
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-}
-array(0) {
-}
-array(6) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-}
-array(3) {
-  ["f"]=>
-  string(3) "fff"
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-}
-array(0) {
-}
-array(7) {
-  ["f"]=>
-  string(3) "fff"
-  [0]=>
-  string(3) "one"
-  [1]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-}
-array(2) {
-  [0]=>
-  string(4) "Five"
-  [1]=>
-  float(8.6)
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [1]=>
-  string(3) "one"
-  [4]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-}
-array(0) {
-}
-array(6) {
-  [1]=>
-  string(3) "one"
-  [4]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-}
-array(3) {
-  ["f"]=>
-  string(3) "fff"
-  [1]=>
-  string(3) "one"
-  [4]=>
-  int(6)
-}
-array(0) {
-}
-array(7) {
-  ["f"]=>
-  string(3) "fff"
-  [1]=>
-  string(3) "one"
-  [4]=>
-  int(6)
-  [""]=>
-  string(5) "blank"
-  [2]=>
-  string(5) "float"
-  ["F"]=>
-  string(3) "FFF"
-  ["blank"]=>
-  string(0) ""
-}
-array(2) {
-  [5]=>
-  string(4) "Five"
-  [6]=>
-  float(8.6)
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 9 ***
-
-*** Variation with first two Arguments ***
-array(3) {
-  [0]=>
-  string(4) "name"
-  [1]=>
-  string(3) "age"
-  [2]=>
-  string(2) "45"
-}
-array(4) {
-  [0]=>
-  int(12)
-  [1]=>
-  string(4) "name"
-  [2]=>
-  string(3) "age"
-  [3]=>
-  string(2) "45"
-}
-array(2) {
-  [0]=>
-  string(3) "age"
-  [1]=>
-  string(2) "45"
-}
-
-*** Variation with first three Arguments ***
-array(3) {
-  [0]=>
-  string(4) "name"
-  [1]=>
-  string(3) "age"
-  [2]=>
-  string(2) "45"
-}
-array(0) {
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(12)
-  [1]=>
-  string(4) "name"
-  [2]=>
-  string(3) "age"
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(12)
-}
-array(2) {
-  [0]=>
-  string(3) "age"
-  [1]=>
-  string(2) "45"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(3) {
-  [1]=>
-  string(4) "name"
-  [2]=>
-  string(3) "age"
-  [3]=>
-  string(2) "45"
-}
-array(0) {
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(12)
-  [1]=>
-  string(4) "name"
-  [2]=>
-  string(3) "age"
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(12)
-}
-array(2) {
-  [2]=>
-  string(3) "age"
-  [3]=>
-  string(2) "45"
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Iteration 10 ***
-
-*** Variation with first two Arguments ***
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [1]=>
-  array(0) {
-  }
-}
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(3) "oNe"
-    [1]=>
-    string(3) "tWo"
-    [2]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [2]=>
-  array(0) {
-  }
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [1]=>
-  array(0) {
-  }
-}
-
-*** Variation with first three Arguments ***
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [1]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(3) "oNe"
-    [1]=>
-    string(3) "tWo"
-    [2]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [2]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-array(2) {
-  [0]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [1]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Variation with first two arguments with preserve_key value TRUE ***
-array(2) {
-  [1]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [2]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(3) "oNe"
-    [1]=>
-    string(3) "tWo"
-    [2]=>
-    int(4)
-  }
-  [1]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [2]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-array(2) {
-  [1]=>
-  array(5) {
-    [0]=>
-    int(10)
-    [1]=>
-    int(20)
-    [2]=>
-    int(30)
-    [3]=>
-    int(40)
-    [4]=>
-    int(50)
-  }
-  [2]=>
-  array(0) {
-  }
-}
-array(0) {
-}
-array(0) {
-}
-
-*** Typical Variation of offset and length  Arguments ***
-array(1) {
-  [1]=>
-  string(3) "Two"
-}
-array(1) {
-  [0]=>
-  string(3) "Two"
-}
-array(1) {
-  [2]=>
-  string(5) "Three"
-}
-array(1) {
-  [0]=>
-  string(5) "Three"
-}
---UEXPECTF--
-*** Output for Zero Argument ***
-
-Warning: array_slice() expects at least 2 parameters, 0 given in %s on line %d
-
-*** Output for Single array Argument ***
-
-Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d
-
-*** Output for invalid number of Arguments ***
-
-Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
-
-*** Output for scalar Argument ***
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-
-*** Output for string Argument ***
-
 Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
 
 *** Iteration 1 ***

diff --git a/ext/standard/tests/array/array_slice_basic.phpt b/ext/standard/tests/array/array_slice_basic.phpt
index 74add79dcc472e959f5fe60c872c29555e00006e..9fcde40d0c0bc518d432f5ca6e354c92acd4c9b9 100644 (file)
--- a/ext/standard/tests/array/array_slice_basic.phpt
+++ b/ext/standard/tests/array/array_slice_basic.phpt
@@ -30,7 +30,7 @@ var_dump( array_slice($input, $offset) );
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing array_slice() : basic functionality ***
 
 -- All arguments --
@@ -49,22 +49,3 @@ array(2) {
   int(4)
 }
 Done
---UEXPECTF--
-*** Testing array_slice() : basic functionality ***
-
--- All arguments --
-array(2) {
-  [0]=>
-  int(3)
-  [23]=>
-  int(4)
-}
-
--- Mandatory arguments --
-array(2) {
-  [0]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_slice_error.phpt b/ext/standard/tests/array/array_slice_error.phpt
index 4ac1217503721aaceda987a72359f207301ba182..b57465155140ae08fa1d0df6ff2863422ecf0a90 100644 (file)
--- a/ext/standard/tests/array/array_slice_error.phpt
+++ b/ext/standard/tests/array/array_slice_error.phpt
@@ -41,16 +41,3 @@ NULL
 Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_slice() : error conditions ***
-
--- Testing array_slice() function with more than expected no. of arguments --
-
-Warning: array_slice() expects at most 4 parameters, 5 given in %s on line %d
-NULL
-
--- Testing array_slice() function with less than expected no. of arguments --
-
-Warning: array_slice() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_slice_variation1.phpt b/ext/standard/tests/array/array_slice_variation1.phpt
index 933e815f590d73ac164df77604de4b533a600296..01fcc0bc077584f506ce6f5614a1b322cacbd1d0 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation1.phpt
+++ b/ext/standard/tests/array/array_slice_variation1.phpt
@@ -21,45 +21,7 @@ var_dump($a);
 
 ?>
 
---EXPECTF--
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-array(1) {
-  [0]=>
-  int(3)
-}
-array(1) {
-  [2]=>
-  int(3)
-}
-array(0) {
-}
-array(0) {
-}
-string(3) "foo"
---UEXPECTF--
+--EXPECT--
 array(3) {
   [0]=>
   int(1)

diff --git a/ext/standard/tests/array/array_slice_variation10.phpt b/ext/standard/tests/array/array_slice_variation10.phpt
index a136d4534967aef56a3b44e4b559d1ce587ae098..6b52a687d4e73dd1b27be3a0a3eb8e080581f492 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation10.phpt
+++ b/ext/standard/tests/array/array_slice_variation10.phpt
@@ -26,23 +26,7 @@ echo key($input) . " => " . current ($input) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- Call array_slice() --
-array(2) {
-  [0]=>
-  string(12) "twenty-three"
-  [1]=>
-  string(4) "zero"
-}
--- Position of Internal Pointer in Result: --
-0 => twenty-three
-
--- Position of Internal Pointer in Original Array: --
-one => un
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_slice() : usage variations ***
 
 -- Call array_slice() --
@@ -57,4 +41,4 @@ array(2) {
 
 -- Position of Internal Pointer in Original Array: --
 one => un
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation11.phpt b/ext/standard/tests/array/array_slice_variation11.phpt
index 354b6e73c0c7265036cb7d5ec778a3d8fea0fb9e..aff404d31f0fc063765ef25912f8ca678399027a 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation11.phpt
+++ b/ext/standard/tests/array/array_slice_variation11.phpt
@@ -178,133 +178,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-array(0) {
-}
-
--- Iteration 19 --
-
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_slice() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_slice() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_slice() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_slice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_slice() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_slice() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_slice() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_slice() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 
@@ -351,4 +224,4 @@ NULL
 
 Warning: array_slice() expects parameter 1 to be array, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation2.phpt b/ext/standard/tests/array/array_slice_variation2.phpt
index 62461f31e586e8dd5a7a31199ac1ef3d5757a3e5..d944c5b4c05fe95b0a5c2bfe70464ce34e5a5ed7 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation2.phpt
+++ b/ext/standard/tests/array/array_slice_variation2.phpt
@@ -95,213 +95,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_slice() : usage variations ***
 
--- Iteration 1 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 2 --
-array(3) {
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 3 --
-array(0) {
-}
-
--- Iteration 4 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 5 --
-array(0) {
-}
-
--- Iteration 6 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 7 --
-array(0) {
-}
-
--- Iteration 8 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 9 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 10 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 11 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 12 --
-array(3) {
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 13 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 14 --
-array(3) {
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 15 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 16 --
-
-Warning: array_slice() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_slice() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: array_slice() expects parameter 2 to be long, array given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: array_slice() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_slice() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_slice() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-
--- Iteration 23 --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-Done
---UEXPECTF--
-*** Testing array_slice() : usage variations ***
-
 -- Iteration 1 --
 array(4) {
   [u"one"]=>
@@ -505,4 +298,4 @@ array(4) {
   [1]=>
   int(4)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation3.phpt b/ext/standard/tests/array/array_slice_variation3.phpt
index a7e41ff939f60b510ffbbb743c821e2fdc3808d4..c2296c7de99502e49399e7daff6768cbbc1d0f94 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation3.phpt
+++ b/ext/standard/tests/array/array_slice_variation3.phpt
@@ -80,136 +80,7 @@ foreach($inputs as $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- Iteration 1 --
-array(0) {
-}
-
--- Iteration 2 --
-array(1) {
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 3 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 4 --
-array(0) {
-}
-
--- Iteration 5 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 6 --
-array(0) {
-}
-
--- Iteration 7 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 8 --
-array(0) {
-}
-
--- Iteration 9 --
-array(0) {
-}
-
--- Iteration 10 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 11 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 12 --
-array(1) {
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 13 --
-array(0) {
-}
-
--- Iteration 14 --
-array(1) {
-  ["three"]=>
-  int(3)
-}
-
--- Iteration 15 --
-array(0) {
-}
-
--- Iteration 16 --
-array(0) {
-}
-
--- Iteration 17 --
-array(0) {
-}
-
--- Iteration 18 --
-array(0) {
-}
-
--- Iteration 19 --
-array(0) {
-}
-
--- Iteration 20 --
-array(0) {
-}
-
--- Iteration 21 --
-array(0) {
-}
-
--- Iteration 22 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-
--- Iteration 23 --
-array(2) {
-  ["three"]=>
-  int(3)
-  [0]=>
-  int(4)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_slice() : usage variations ***
 
 -- Iteration 1 --
@@ -337,4 +208,4 @@ array(2) {
   [0]=>
   int(4)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation4.phpt b/ext/standard/tests/array/array_slice_variation4.phpt
index e45b1d1a51e66f557f2b76d0963ce6409b36ed88..7c05d60cc398e775fb64542a321dc6cebc97ae5c 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation4.phpt
+++ b/ext/standard/tests/array/array_slice_variation4.phpt
@@ -95,239 +95,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_slice() : usage variations ***
 
--- Iteration 1 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 2 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 3 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 4 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 5 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 6 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 7 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 8 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 9 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 10 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 11 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 12 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 13 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 14 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 15 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 16 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 17 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 18 --
-
-Warning: array_slice() expects parameter 4 to be boolean, array given in %s on line %d
-NULL
-
--- Iteration 19 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 20 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 21 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [99]=>
-  int(3)
-}
-
--- Iteration 22 --
-
-Warning: array_slice() expects parameter 4 to be boolean, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
--- Iteration 24 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing array_slice() : usage variations ***
-
 -- Iteration 1 --
 array(3) {
   [u"one"]=>
@@ -557,4 +324,4 @@ array(3) {
   [1]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation5.phpt b/ext/standard/tests/array/array_slice_variation5.phpt
index 7320c5d83eec21ff3663683d8ee990c3d8b57568..fa2dd30c011cfe05507b2c38b60225310f6375f1 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation5.phpt
+++ b/ext/standard/tests/array/array_slice_variation5.phpt
@@ -28,168 +28,7 @@ var_dump(array_slice($input, -PHP_INT_MAX));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- $offset is -7 --
-array(5) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -6 --
-array(5) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -5 --
-array(5) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -4 --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -3 --
-array(3) {
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -2 --
-array(2) {
-  [0]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is -1 --
-array(1) {
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 0 --
-array(5) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 1 --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 2 --
-array(3) {
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 3 --
-array(2) {
-  [0]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 4 --
-array(1) {
-  ["ten"]=>
-  int(10)
-}
-
--- $offset is 5 --
-array(0) {
-}
-
--- $offset is 6 --
-array(0) {
-}
-
--- $offset is 7 --
-array(0) {
-}
-
--- $offset is maximum integer value --
-array(0) {
-}
-
--- $offset is minimum integer value --
-array(5) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_slice() : usage variations ***
 
 -- $offset is -7 --
@@ -349,4 +188,4 @@ array(5) {
   [u"ten"]=>
   int(10)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation6.phpt b/ext/standard/tests/array/array_slice_variation6.phpt
index 4a865b2bbe0f6664877745a069feb5d7364b1e11..a1dd06b8c45f8b57938e7d64371d7e2d406c3357 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation6.phpt
+++ b/ext/standard/tests/array/array_slice_variation6.phpt
@@ -29,126 +29,7 @@ var_dump(array_slice($input, $offset, -PHP_INT_MAX));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- $length is -6 --
-array(0) {
-}
-
--- $length is -5 --
-array(0) {
-}
-
--- $length is -4 --
-array(0) {
-}
-
--- $length is -3 --
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-
--- $length is -2 --
-array(2) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-}
-
--- $length is -1 --
-array(3) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-}
-
--- $length is 0 --
-array(0) {
-}
-
--- $length is 1 --
-array(1) {
-  [0]=>
-  string(3) "two"
-}
-
--- $length is 2 --
-array(2) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-}
-
--- $length is 3 --
-array(3) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-}
-
--- $length is 4 --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $length is 5 --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $length is 6 --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $length is maximum integer value --
-array(4) {
-  [0]=>
-  string(3) "two"
-  [1]=>
-  string(5) "three"
-  [2]=>
-  string(4) "nine"
-  ["ten"]=>
-  int(10)
-}
-
--- $length is minimum integer value --
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_slice() : usage variations ***
 
 -- $length is -6 --
@@ -266,4 +147,4 @@ array(4) {
 -- $length is minimum integer value --
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation7.phpt b/ext/standard/tests/array/array_slice_variation7.phpt
index afbc8e6501015fcbe69b2fc43b04fbf9d13cb6a0..90d53c069be840472dc3e78b11b577c00afcb43b 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation7.phpt
+++ b/ext/standard/tests/array/array_slice_variation7.phpt
@@ -111,194 +111,7 @@ foreach($inputs as $type => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_slice() : usage variations ***
-
--- Iteration 1 : key type is int --
-$preserve_keys = TRUE
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [12345]=>
-  string(8) "positive"
-  [-2345]=>
-  string(8) "negative"
-}
-$preserve_keys = FALSE
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(8) "positive"
-  [3]=>
-  string(8) "negative"
-}
-
--- Iteration 2 : key type is float --
-$preserve_keys = TRUE
-array(3) {
-  [10]=>
-  string(8) "positive"
-  [-10]=>
-  string(8) "negative"
-  [0]=>
-  string(4) "half"
-}
-$preserve_keys = FALSE
-array(3) {
-  [0]=>
-  string(8) "positive"
-  [1]=>
-  string(8) "negative"
-  [2]=>
-  string(4) "half"
-}
-
--- Iteration 3 : key type is extreme floats --
-$preserve_keys = TRUE
-array(2) {
-  [12345678]=>
-  string(5) "large"
-  [0]=>
-  string(5) "small"
-}
-$preserve_keys = FALSE
-array(2) {
-  [0]=>
-  string(5) "large"
-  [1]=>
-  string(5) "small"
-}
-
--- Iteration 4 : key type is null uppercase --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(6) "null 1"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(6) "null 1"
-}
-
--- Iteration 5 : key type is null lowercase --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(6) "null 2"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(6) "null 2"
-}
-
--- Iteration 6 : key type is bool lowercase --
-$preserve_keys = TRUE
-array(2) {
-  [1]=>
-  string(6) "lowert"
-  [0]=>
-  string(6) "lowerf"
-}
-$preserve_keys = FALSE
-array(2) {
-  [0]=>
-  string(6) "lowert"
-  [1]=>
-  string(6) "lowerf"
-}
-
--- Iteration 7 : key type is bool uppercase --
-$preserve_keys = TRUE
-array(2) {
-  [1]=>
-  string(6) "uppert"
-  [0]=>
-  string(6) "upperf"
-}
-$preserve_keys = FALSE
-array(2) {
-  [0]=>
-  string(6) "uppert"
-  [1]=>
-  string(6) "upperf"
-}
-
--- Iteration 8 : key type is empty double quotes --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(6) "emptyd"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(6) "emptyd"
-}
-
--- Iteration 9 : key type is empty single quotes --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-
--- Iteration 10 : key type is string --
-$preserve_keys = TRUE
-array(3) {
-  ["stringd"]=>
-  string(7) "stringd"
-  ["strings"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-}
-$preserve_keys = FALSE
-array(3) {
-  ["stringd"]=>
-  string(7) "stringd"
-  ["strings"]=>
-  string(7) "strings"
-  ["hello world"]=>
-  string(7) "stringh"
-}
-
--- Iteration 11 : key type is undefined --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(9) "undefined"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(9) "undefined"
-}
-
--- Iteration 12 : key type is unset --
-$preserve_keys = TRUE
-array(1) {
-  [""]=>
-  string(5) "unset"
-}
-$preserve_keys = FALSE
-array(1) {
-  [""]=>
-  string(5) "unset"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_slice() : usage variations ***
 
 -- Iteration 1 : key type is int --
@@ -484,4 +297,4 @@ array(1) {
   [u""]=>
   unicode(5) "unset"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation8.phpt b/ext/standard/tests/array/array_slice_variation8.phpt
index 3ab32f2abd2da37308bb120b41ad566b532795d2..a51687e6d41c8c9e8ffe08409e1754a14f5f0c14 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation8.phpt
+++ b/ext/standard/tests/array/array_slice_variation8.phpt
@@ -29,34 +29,6 @@ echo "Done";
 --EXPECTF--
 *** Testing array_slice() : usage variations ***
 
--- Slice a two-dimensional array --
-array(3) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  array(3) {
-    [0]=>
-    string(4) "zero"
-    [1]=>
-    string(2) "un"
-    [2]=>
-    string(4) "deux"
-  }
-  [2]=>
-  string(4) "nine"
-}
-
--- $input is a sub-array --
-array(2) {
-  [0]=>
-  string(2) "un"
-  [1]=>
-  string(4) "deux"
-}
-Done
---UEXPECTF--
-*** Testing array_slice() : usage variations ***
-
 -- Slice a two-dimensional array --
 array(3) {
   [0]=>
@@ -81,4 +53,4 @@ array(2) {
   [1]=>
   unicode(4) "deux"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_slice_variation9.phpt b/ext/standard/tests/array/array_slice_variation9.phpt
index 1a6705a6236e7850dec756808751de47a94fa061..3d8ea34196842c005a28f3427ccbde94e6f8f798 100644 (file)
--- a/ext/standard/tests/array/array_slice_variation9.phpt
+++ b/ext/standard/tests/array/array_slice_variation9.phpt
@@ -40,42 +40,6 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing array_slice() : usage variations ***
 
--- Array of referenced variables ($preserve_keys = default) --
-array(2) {
-  [0]=>
-  &string(3) "two"
-  [1]=>
-  &string(5) "three"
-}
--- Change $val2 ($preserve_keys = TRUE) --
-array(2) {
-  [2]=>
-  &string(12) "hello, world"
-  [1]=>
-  &string(5) "three"
-}
-
--- Pass array by reference --
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
--- Check passed array: --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_slice() : usage variations ***
-
 -- Array of referenced variables ($preserve_keys = default) --
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_splice_basic.phpt b/ext/standard/tests/array/array_splice_basic.phpt
index 310f87115abf28837166d9625ff6f3c413bcf412..e96af1bba7faf3e62c6333aa2da501b21733726c 100644 (file)
--- a/ext/standard/tests/array/array_splice_basic.phpt
+++ b/ext/standard/tests/array/array_splice_basic.phpt
@@ -44,80 +44,6 @@ var_dump ($input);
 --EXPECT--
 *** Testing array_splice() basic operations ***
 test truncation 
-array(2) {
-  [0]=>
-  string(4) "blue"
-  [1]=>
-  string(6) "yellow"
-}
-array(2) {
-  [0]=>
-  string(3) "red"
-  [1]=>
-  string(5) "green"
-}
-test removing entries from the middle 
-array(2) {
-  [0]=>
-  string(5) "green"
-  [1]=>
-  string(4) "blue"
-}
-array(2) {
-  [0]=>
-  string(3) "red"
-  [1]=>
-  string(6) "yellow"
-}
-test substitution at end 
-array(3) {
-  [0]=>
-  string(5) "green"
-  [1]=>
-  string(4) "blue"
-  [2]=>
-  string(6) "yellow"
-}
-array(2) {
-  [0]=>
-  string(3) "red"
-  [1]=>
-  string(6) "orange"
-}
-array(1) {
-  [0]=>
-  string(6) "yellow"
-}
-array(5) {
-  [0]=>
-  string(3) "red"
-  [1]=>
-  string(5) "green"
-  [2]=>
-  string(4) "blue"
-  [3]=>
-  string(5) "black"
-  [4]=>
-  string(6) "maroon"
-}
-test insertion 
-array(0) {
-}
-array(5) {
-  [0]=>
-  string(3) "red"
-  [1]=>
-  string(5) "green"
-  [2]=>
-  string(4) "blue"
-  [3]=>
-  string(6) "purple"
-  [4]=>
-  string(6) "yellow"
-}
---UEXPECT--
-*** Testing array_splice() basic operations ***
-test truncation 
 array(2) {
   [0]=>
   unicode(4) "blue"

diff --git a/ext/standard/tests/array/array_splice_errors.phpt b/ext/standard/tests/array/array_splice_errors.phpt
index 644d861adace5962307173175b55c078e9d3e405..0b92e4bc239c17faafda126e8d95610423b75870 100644 (file)
--- a/ext/standard/tests/array/array_splice_errors.phpt
+++ b/ext/standard/tests/array/array_splice_errors.phpt
@@ -39,22 +39,3 @@ NULL
 Warning: array_splice() expects parameter 1 to be array, object given in %s on line %d
 NULL
 Done
---UEXPECTF--
-
-*** Testing error conditions of array_splice() ***
-
-Warning: array_splice() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: array_splice() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
-Warning: array_splice() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_splice() expects parameter 1 to be array, object given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_splice_variation1.phpt b/ext/standard/tests/array/array_splice_variation1.phpt
index 11549d6635c42d7ad5c7e2785edf9108ba8a2fda..4ff75dc5d1a8ac43e44b7f1f4d3c759ca7cfe8b8 100644 (file)
--- a/ext/standard/tests/array/array_splice_variation1.phpt
+++ b/ext/standard/tests/array/array_splice_variation1.phpt
@@ -64,68 +64,6 @@ array(2) {
   }
 }
 Test behaviour of input arrays containing references 
-array(3) {
-  [0]=>
-  int(4)
-  [1]=>
-  &int(5)
-  ["six"]=>
-  &int(6)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  &int(2)
-  ["three"]=>
-  &int(3)
-  [3]=>
-  int(7)
-  [4]=>
-  &int(8)
-  ["nine"]=>
-  &int(9)
-}
-Test behaviour of replacement array containing references 
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  &int(3)
-  [3]=>
-  &int(4)
-}
-Test behaviour of replacement which is part of reference set 
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(3)
-}
-Done
---UEXPECT--
-test behaviour when input array is in a reference set
-array(1) {
-  [0]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  &array(1) {
-    [0]=>
-    int(1)
-  }
-}
-Test behaviour of input arrays containing references 
 array(3) {
   [0]=>
   int(4)
@@ -168,4 +106,4 @@ array(2) {
   [1]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_splice_variation2.phpt b/ext/standard/tests/array/array_splice_variation2.phpt
index 4f76fbac96c1315d341e49706a64587701b23db4..516339c7e86c552d62cc573c9d64f623e35896d0 100644 (file)
--- a/ext/standard/tests/array/array_splice_variation2.phpt
+++ b/ext/standard/tests/array/array_splice_variation2.phpt
@@ -25,16 +25,3 @@ array(3) {
   int(2)
 }
 Done
---UEXPECTF--
-
-Warning: array_splice() expects at most 4 parameters, 10 given in %s on line %d
-NULL
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_splice_variation3.phpt b/ext/standard/tests/array/array_splice_variation3.phpt
index 0204b8934977f39b975104ddbb7f56b4a6842e38..7d00cc7e625d86a6bda1521dabe4beee34133a11 100644 (file)
--- a/ext/standard/tests/array/array_splice_variation3.phpt
+++ b/ext/standard/tests/array/array_splice_variation3.phpt
@@ -99,788 +99,6 @@ array(2) {
   [1]=>
   int(1)
 }
-array(7) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-absolute offset - absolute length - cut from middle
-  - No replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-absolute offset - absolute length - cut from end
-  - No replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  string(1) "A"
-  [5]=>
-  string(1) "B"
-  [6]=>
-  string(1) "C"
-}
-absolute offset - absolute length - attempt to cut past end
-  - No replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  string(1) "A"
-  [5]=>
-  string(1) "B"
-  [6]=>
-  string(1) "C"
-}
-absolute offset - absolute length - cut everything
-  - No replacement
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-array(0) {
-}
-  - With replacement
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-}
-absolute offset - absolute length - cut nothing
-  - No replacement
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-  - With replacement
-array(0) {
-}
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  string(1) "A"
-  [4]=>
-  string(1) "B"
-  [5]=>
-  string(1) "C"
-  [6]=>
-  int(3)
-  [7]=>
-  int(4)
-  [8]=>
-  int(5)
-}
-absolute offset - relative length - cut from beginning
-  - No replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(4) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(7) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-absolute offset - relative length - cut from middle
-  - No replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-absolute offset - relative length - attempt to cut form before beginning 
-  - No replacement
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-  - With replacement
-array(0) {
-}
-array(9) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(0)
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-  [6]=>
-  int(3)
-  [7]=>
-  int(4)
-  [8]=>
-  int(5)
-}
-absolute offset - relative length - cut nothing
-  - No replacement
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-  - With replacement
-array(0) {
-}
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(2)
-  [6]=>
-  int(3)
-  [7]=>
-  int(4)
-  [8]=>
-  int(5)
-}
-relative offset - absolute length - cut from beginning
-  - No replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(4) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(7) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-relative offset - absolute length - cut from middle
-  - No replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-relative offset - absolute length - cut from end
-  - No replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  string(1) "A"
-  [5]=>
-  string(1) "B"
-  [6]=>
-  string(1) "C"
-}
-relative offset - absolute length - attempt to cut past end
-  - No replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(4)
-  [1]=>
-  int(5)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  string(1) "A"
-  [5]=>
-  string(1) "B"
-  [6]=>
-  string(1) "C"
-}
-relative offset - absolute length - cut everything
-  - No replacement
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-array(0) {
-}
-  - With replacement
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-array(3) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-}
-relative offset - absolute length - cut nothing
-  - No replacement
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-  - With replacement
-array(0) {
-}
-array(9) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(0)
-  [4]=>
-  int(1)
-  [5]=>
-  int(2)
-  [6]=>
-  int(3)
-  [7]=>
-  int(4)
-  [8]=>
-  int(5)
-}
-relative offset - relative length - cut from beginning
-  - No replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(4) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(7) {
-  [0]=>
-  string(1) "A"
-  [1]=>
-  string(1) "B"
-  [2]=>
-  string(1) "C"
-  [3]=>
-  int(2)
-  [4]=>
-  int(3)
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-relative offset - relative length - cut from middle
-  - No replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(4)
-  [6]=>
-  int(5)
-}
-relative offset - relative length - cut nothing
-  - No replacement
-array(0) {
-}
-array(6) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(4)
-  [5]=>
-  int(5)
-}
-  - With replacement
-array(0) {
-}
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  string(1) "A"
-  [3]=>
-  string(1) "B"
-  [4]=>
-  string(1) "C"
-  [5]=>
-  int(2)
-  [6]=>
-  int(3)
-  [7]=>
-  int(4)
-  [8]=>
-  int(5)
-}
-Done
---UEXPECT--
-*** array_splice() function : usage variations - lengths and offsets
-absolute offset - absolute length - cut from beginning
-  - No replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-array(4) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-  [2]=>
-  int(4)
-  [3]=>
-  int(5)
-}
-  - With replacement
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
 array(7) {
   [0]=>
   unicode(1) "A"
@@ -1635,4 +853,4 @@ array(9) {
   [8]=>
   int(5)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_splice_variation4.phpt b/ext/standard/tests/array/array_splice_variation4.phpt
index bc9c7c2a2ffecd508c732b4e4f17096f1aeb98f9..d1cc501c6b7a77cc52a47f9e04a5d5ea4fd0b48e 100644 (file)
--- a/ext/standard/tests/array/array_splice_variation4.phpt
+++ b/ext/standard/tests/array/array_splice_variation4.phpt
@@ -67,45 +67,3 @@ array(3) {
   resource(%d) of type (stream)
 }
 Done
---UEXPECTF--
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.1)
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  bool(true)
-}
-array(0) {
-}
-array(3) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  resource(%d) of type (stream)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/array_sum_basic.phpt b/ext/standard/tests/array/array_sum_basic.phpt
index c41d0ad0e238de2efce1bc6db6e8a12f0c0bc998..ecbc15fae62bd11644d9d03fb4b2f92fb1eb99b5 100644 (file)
--- a/ext/standard/tests/array/array_sum_basic.phpt
+++ b/ext/standard/tests/array/array_sum_basic.phpt
@@ -26,16 +26,7 @@ var_dump( array_sum($input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : basic functionality ***
--- array_sum() with integer array entries --
-int(15)
--- array_sum() with float array entries --
-float(11.2)
--- array_sum() with integer/float array entries --
-float(17.9)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : basic functionality ***
 -- array_sum() with integer array entries --
 int(15)

diff --git a/ext/standard/tests/array/array_sum_error.phpt b/ext/standard/tests/array/array_sum_error.phpt
index d15ca71d44546bc82cfb55045b4b1169f28595cc..209405d3d30ab5318897fd74e9ee6eba4fa29252 100644 (file)
--- a/ext/standard/tests/array/array_sum_error.phpt
+++ b/ext/standard/tests/array/array_sum_error.phpt
@@ -32,14 +32,3 @@ NULL
 Warning: array_sum() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_sum() : error conditions ***
--- Testing array_sum() function with zero arguments --
-
-Warning: array_sum() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
--- Testing array_sum() function with more than expected no. of arguments --
-
-Warning: array_sum() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_sum_variation1.phpt b/ext/standard/tests/array/array_sum_variation1.phpt
index c0470673b54ff9e96b7be596eb65eaf2eac48d66..1278e970275603a50ddaa12f862a6601e4b65e4c 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation1.phpt
+++ b/ext/standard/tests/array/array_sum_variation1.phpt
@@ -146,101 +146,6 @@ Warning: array_sum() expects parameter 1 to be array, boolean given in %s on lin
 NULL
 -- Iteration 16 --
 
-Warning: array_sum() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_sum() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_sum() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_sum() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_sum() expects parameter 1 to be array, object given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_sum() expects parameter 1 to be array, resource given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_sum() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_sum() expects parameter 1 to be array, null given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_sum() : unexpected values for 'input' ***
--- Iteration 1 --
-
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_sum() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_sum() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_sum() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_sum() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_sum() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_sum() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_sum() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_sum() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_sum() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: array_sum() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/array_sum_variation2.phpt b/ext/standard/tests/array/array_sum_variation2.phpt
index 1ff90e8a3bcb9e91546251cf30c91c29a6421e43..c581eb6ad23cf94437ef4e07faf72556bf328fc1 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation2.phpt
+++ b/ext/standard/tests/array/array_sum_variation2.phpt
@@ -36,18 +36,7 @@ var_dump( array_sum($mixed_int_value) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : with different integer array ***
--- Sum of Integer array --
-int(-573)
--- Sum of Octal array --
-int(35)
--- Sum of Hex array --
-int(-198)
--- Sum of mixed integer values --
-int(58)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : with different integer array ***
 -- Sum of Integer array --
 int(-573)

diff --git a/ext/standard/tests/array/array_sum_variation3.phpt b/ext/standard/tests/array/array_sum_variation3.phpt
index 8e5b0e308eab9740a5f48da06bb8cf449082f262..50b9a262b6516c05a3d70f760381e34220e31754 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation3.phpt
+++ b/ext/standard/tests/array/array_sum_variation3.phpt
@@ -42,17 +42,7 @@ var_dump( array_sum($float_input) );
                      
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : array with different float values ***
--- simple float array --
-float(1.3)
--- float array with scientific notations e and E --
-float(23630.021)
-float(23180.021)
--- Mixed float array --
-float(6531.5458)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : array with different float values ***
 -- simple float array --
 float(1.3)

diff --git a/ext/standard/tests/array/array_sum_variation4.phpt b/ext/standard/tests/array/array_sum_variation4.phpt
index 3dc685aa0a8c5ea9a85c7a0bca77bbe90617e296..af03d7fb7b6336e62b4abd287349723cf64ef1f2 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation4.phpt
+++ b/ext/standard/tests/array/array_sum_variation4.phpt
@@ -25,14 +25,7 @@ var_dump( array_sum($float_input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : array with duplicate values ***
--- With integer array --
-int(117)
--- With float array --
-float(2.5)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : array with duplicate values ***
 -- With integer array --
 int(117)

diff --git a/ext/standard/tests/array/array_sum_variation5.phpt b/ext/standard/tests/array/array_sum_variation5.phpt
index 231f692c7f7339d4606a5eb454900bf97825b7a2..1829bcbc695d06df4cf940d9198f57a0a9fa084c 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation5.phpt
+++ b/ext/standard/tests/array/array_sum_variation5.phpt
@@ -32,11 +32,7 @@ var_dump( array_sum($input) );
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : array with elements as reference ***
-int(305)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : array with elements as reference ***
 int(305)
 Done

diff --git a/ext/standard/tests/array/array_sum_variation6.phpt b/ext/standard/tests/array/array_sum_variation6.phpt
index 404b0af669b98a1c386589dbcea9da2200a8893c..950f2e2a200d93e1f3aabca9f34f8b9a457601ac 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation6.phpt
+++ b/ext/standard/tests/array/array_sum_variation6.phpt
@@ -24,14 +24,7 @@ echo "-- with string keys --\n";
 var_dump( array_sum($input) );
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : with associative array ***
--- with numeric keys --
-float(32.56)
--- with string keys --
-int(140)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : with associative array ***
 -- with numeric keys --
 float(32.56)

diff --git a/ext/standard/tests/array/array_sum_variation7.phpt b/ext/standard/tests/array/array_sum_variation7.phpt
index 03915e6e342ba50db1ac7aca15446a57e5fea3aa..69428038fc5af3dd1b5d60854de19cc28419d44c 100644 (file)
--- a/ext/standard/tests/array/array_sum_variation7.phpt
+++ b/ext/standard/tests/array/array_sum_variation7.phpt
@@ -67,24 +67,7 @@ echo "-- array with mixed values --\n";
 var_dump( array_sum($input) );
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_sum() : array with unexpected entries ***
--- empty array --
-int(0)
--- array with string values --
-int(0)
--- array with bool values --
-int(3)
--- array with null values --
-int(0)
--- array with subarrays --
-int(0)
--- array with object values --
-int(0)
--- array with mixed values --
-float(14)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_sum() : array with unexpected entries ***
 -- empty array --
 int(0)

diff --git a/ext/standard/tests/array/array_udiff_assoc_basic.phpt b/ext/standard/tests/array/array_udiff_assoc_basic.phpt
index f2da7982d2dc85e7d1238861c50d2a678cfc86c7..3cbd4e3d9a6b3c524bb8e3ea0abecbb111937ae8 100644 (file)
--- a/ext/standard/tests/array/array_udiff_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_assoc_basic.phpt
@@ -22,24 +22,6 @@ $result = array_udiff_assoc($a, $b, array("cr", "comp_func_cr"));
 var_dump($result);
 ?>
 --EXPECTF--
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(9)
-  }
-  ["0.5"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(23)
-  }
-}
---UEXPECTF--
 array(3) {
   [u"0.1"]=>
   object(cr)#%d (1) {
@@ -56,4 +38,4 @@ array(3) {
     [u"priv_member":u"cr":private]=>
     int(23)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_udiff_basic.phpt b/ext/standard/tests/array/array_udiff_basic.phpt
index 32dca57460519cdeb10a8fbe60fce0f5862b4b8c..1c55714b31e2dcb24fe22324ae1cda07e908a426 100644 (file)
--- a/ext/standard/tests/array/array_udiff_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_basic.phpt
@@ -22,19 +22,6 @@ $result = array_udiff($a, $b, array("cr", "comp_func_cr"));
 var_dump($result);
 ?>
 --EXPECTF--
-array(2) {
-  ["0.5"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(23)
-  }
-}
---UEXPECTF--
 array(2) {
   [u"0.5"]=>
   object(cr)#%d (1) {
@@ -46,4 +33,4 @@ array(2) {
     [u"priv_member":u"cr":private]=>
     int(23)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
index 2a7d142a52524e536dd7fec87bcae647b67d66d7..4275af016e9d46b1d092832991edb70ce47ab7e4 100644 (file)
--- a/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_udiff_uassoc_basic.phpt
@@ -26,24 +26,6 @@ $result = array_udiff_uassoc($a, $b, array("cr", "comp_func_cr"), array("cr", "c
 var_dump($result);
 ?>
 --EXPECTF--
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(9)
-  }
-  ["0.5"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(12)
-  }
-  [0]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(23)
-  }
-}
---UEXPECTF--
 array(3) {
   [u"0.1"]=>
   object(cr)#%d (1) {
@@ -60,4 +42,4 @@ array(3) {
     [u"priv_member":u"cr":private]=>
     int(23)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
index 8dcfc7906f71267bb9950336b0eb17fafe3631d7..1946c817b20f07152e0241f33ace69136c87f3b3 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_assoc_basic.phpt
@@ -22,19 +22,6 @@ $result = array_uintersect_assoc($a, $b, array("cr", "comp_func_cr"));
 var_dump($result);
 ?>
 --EXPECTF--
-array(2) {
-  [1]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-  }
-}
---UEXPECTF--
 array(2) {
   [1]=>
   object(cr)#%d (1) {
@@ -46,4 +33,4 @@ array(2) {
     [u"priv_member":u"cr":private]=>
     int(-15)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_uintersect_basic.phpt b/ext/standard/tests/array/array_uintersect_basic.phpt
index 02a47881ae65c6c9247c51f886105108494e9c14..f4b7818e216fb03654e0a3bb2601697543d87a3d 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_basic.phpt
@@ -22,24 +22,6 @@ $result = array_uintersect($a, $b, array("cr", "comp_func_cr"));
 var_dump($result);
 ?>
 --EXPECTF--
-array(3) {
-  ["0.1"]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(9)
-  }
-  [1]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-  }
-}
---UEXPECTF--
 array(3) {
   [u"0.1"]=>
   object(cr)#%d (1) {
@@ -56,4 +38,4 @@ array(3) {
     [u"priv_member":u"cr":private]=>
     int(-15)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
index 8cf823399bb69d94668cc1692fbb2714b0fbd420..2992374198b690dc707185eb2bd0292634cd8017 100644 (file)
--- a/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
+++ b/ext/standard/tests/array/array_uintersect_uassoc_basic.phpt
@@ -26,19 +26,6 @@ $result = array_uintersect_uassoc($a, $b, array("cr", "comp_func_cr"), array("cr
 var_dump($result);
 ?>
 --EXPECTF--
-array(2) {
-  [1]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(4)
-  }
-  [2]=>
-  object(cr)#%d (1) {
-    ["priv_member":"cr":private]=>
-    int(-15)
-  }
-}
---UEXPECTF--
 array(2) {
   [1]=>
   object(cr)#%d (1) {
@@ -50,4 +37,4 @@ array(2) {
     [u"priv_member":u"cr":private]=>
     int(-15)
   }
-}
\ No newline at end of file
+}

diff --git a/ext/standard/tests/array/array_unique_basic.phpt b/ext/standard/tests/array/array_unique_basic.phpt
index 824806e305944b5179f23e02005062e0277d7094..8d480577478e3562738c5d24234535250a8d2b4a 100644 (file)
--- a/ext/standard/tests/array/array_unique_basic.phpt
+++ b/ext/standard/tests/array/array_unique_basic.phpt
@@ -23,30 +23,7 @@ var_dump( array_unique($input) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : basic functionality ***
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-array(3) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [4]=>
-  string(5) "three"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unique() : basic functionality ***
 array(2) {
   [0]=>
@@ -68,4 +45,4 @@ array(3) {
   [4]=>
   unicode(5) "three"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unique_error.phpt b/ext/standard/tests/array/array_unique_error.phpt
index 1d3af7dcc6ab2dc49b47e36c331d99dd64e4b81d..05c10ac7650ff77e89b1f73e4cd220d86518895a 100644 (file)
--- a/ext/standard/tests/array/array_unique_error.phpt
+++ b/ext/standard/tests/array/array_unique_error.phpt
@@ -34,16 +34,3 @@ NULL
 Warning: array_unique() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_unique() : error conditions ***
-
--- Testing array_unique() function with zero arguments --
-
-Warning: array_unique() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing array_unique() function with more than expected no. of arguments --
-
-Warning: array_unique() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_unique_variation1.phpt b/ext/standard/tests/array/array_unique_variation1.phpt
index 6758c29ccf769dce28a0d2086fd81fb120882d89..8029807bb6dedd5e8a605d714a6b520cb8d2da55 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation1.phpt
+++ b/ext/standard/tests/array/array_unique_variation1.phpt
@@ -192,101 +192,3 @@ bool(false)
 Warning: array_unique(): The argument should be an array in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_unique() : Passing non array values to $input argument ***
--- Iteration 1 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 21 --
-array(0) {
-}
--- Iteration 22 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 24 --
-
-Warning: array_unique(): The argument should be an array in %s on line %d
-bool(false)
-Done

diff --git a/ext/standard/tests/array/array_unique_variation2.phpt b/ext/standard/tests/array/array_unique_variation2.phpt
index a88675e0bb154be5743d72c172b8b828f22f4ead..e5fc798291ddf0530e6e3613ec7258cfee0cd996 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation2.phpt
+++ b/ext/standard/tests/array/array_unique_variation2.phpt
@@ -80,159 +80,7 @@ foreach($inputs as $input) {
   
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : Passing different arrays to $input argument ***
--- Iteration 1 --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
--- Iteration 2 --
-array(2) {
-  [0]=>
-  float(1.1)
-  [1]=>
-  float(2.2)
-}
--- Iteration 3 --
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
--- Iteration 4 --
-array(0) {
-}
--- Iteration 5 --
-array(1) {
-  [0]=>
-  NULL
-}
--- Iteration 6 --
-array(4) {
-  [0]=>
-  string(3) "a\v\f"
-  [1]=>
-  string(5) "aaaa
-"
-  [2]=>
-  string(1) "b"
-  [4]=>
-  string(27) "\[\]\!\@\#$\%\^\&\*\(\)\{\}"
-}
--- Iteration 7 --
-array(4) {
-  [0]=>
-  string(5) "a\v\f"
-  [1]=>
-  string(6) "aaaa\r"
-  [2]=>
-  string(1) "b"
-  [4]=>
-  string(28) "\[\]\!\@\#\$\%\^\&\*\(\)\{\}"
-}
--- Iteration 8 --
-array(3) {
-  ["h1"]=>
-  string(1) "
-"
-  ["h2"]=>
-  string(88) "hello world
-The quick brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["h3"]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-}
--- Iteration 9 --
-array(2) {
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
--- Iteration 10 --
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
--- Iteration 11 --
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(20)
-  [4]=>
-  int(40)
-}
--- Iteration 12 --
-array(2) {
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-}
--- Iteration 13 --
-array(3) {
-  ["one"]=>
-  int(1)
-  [2]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
--- Iteration 14 --
-array(2) {
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-}
--- Iteration 15 --
-array(4) {
-  [1]=>
-  string(4) "true"
-  [0]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- Iteration 16 --
-array(2) {
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-}
--- Iteration 17 --
-array(2) {
-  [1]=>
-  string(0) ""
-  [6]=>
-  bool(true)
-}
--- Iteration 18 --
-array(3) {
-  [""]=>
-  int(4)
-  [0]=>
-  int(5)
-  [1]=>
-  int(6)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unique() : Passing different arrays to $input argument ***
 -- Iteration 1 --
 array(2) {

diff --git a/ext/standard/tests/array/array_unique_variation3.phpt b/ext/standard/tests/array/array_unique_variation3.phpt
index a31f274d83e29d6040d86aace9cf1e69ddcaf6d7..c044c7de49689165111f870b13e7211d17e68c54 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation3.phpt
+++ b/ext/standard/tests/array/array_unique_variation3.phpt
@@ -70,73 +70,6 @@ echo "Done";
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
-array(1) {
-  [0]=>
-  string(1) "0"
-}
--- Iteration 2 --
-array(3) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-  [4]=>
-  string(1) "4"
-}
--- Iteration 3 --
-array(1) {
-  [2]=>
-  string(5) "float"
-}
--- Iteration 4 --
-array(3) {
-  [1]=>
-  string(2) "f1"
-  [3]=>
-  string(2) "f2"
-  [3333333]=>
-  string(2) "f4"
-}
--- Iteration 5 --
-array(3) {
-  ["\tHello"]=>
-  int(111)
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
--- Iteration 6 --
-array(3) {
-  ["   Hello"]=>
-  int(111)
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-}
--- Iteration 7 --
-array(2) {
-  [0]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iteration 8 --
-array(2) {
-  [""]=>
-  string(5) "hello"
-  [0]=>
-  int(11)
-}
-Done
---UEXPECTF--
-*** Testing array_unique() : assoc. array with diff. keys passed to $input argument ***
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 array(1) {

diff --git a/ext/standard/tests/array/array_unique_variation4.phpt b/ext/standard/tests/array/array_unique_variation4.phpt
index 62c79d4ec4243c842dc81ad1a5662c795bdb162d..7102fc3ce595d41a167a0ab9c34859e8effab03f 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation4.phpt
+++ b/ext/standard/tests/array/array_unique_variation4.phpt
@@ -65,71 +65,7 @@ fclose($fp);
   
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : assoc. array with diff. values to $input argument ***
--- Iteration 1 --
-array(1) {
-  [0]=>
-  int(0)
-}
--- Iteration 2 --
-array(2) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
--- Iteration 3 --
-array(1) {
-  ["float1"]=>
-  float(2.3333)
-}
--- Iteration 4 --
-array(3) {
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [3]=>
-  float(4.8999992284)
-}
--- Iteration 5 --
-array(3) {
-  [111]=>
-  string(6) "  Hello"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(7) "\v\fworld"
-}
--- Iteration 6 --
-array(3) {
-  [111]=>
-  string(7) "\tHello"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(9) "\v\fworld"
-}
--- Iteration 7 --
-array(2) {
-  [1]=>
-  string(5) "hello"
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iteration 8 --
-array(3) {
-  [11]=>
-  object(classA)#%d (0) {
-  }
-  ["unset"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unique() : assoc. array with diff. values to $input argument ***
 -- Iteration 1 --
 array(1) {
@@ -192,4 +128,4 @@ array(3) {
   [u"resource"]=>
   resource(5) of type (stream)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unique_variation5.phpt b/ext/standard/tests/array/array_unique_variation5.phpt
index cc890886f7d76d2a3e2fac50dbb6878935fc2a25..d868ff85a58c474084c223ed31e2de2f62f5f529 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation5.phpt
+++ b/ext/standard/tests/array/array_unique_variation5.phpt
@@ -20,18 +20,7 @@ var_dump( array_unique($input) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : array with duplicate keys for $input argument ***
-array(3) {
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(5) "three"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unique() : array with duplicate keys for $input argument ***
 array(3) {
   [1]=>
@@ -41,4 +30,4 @@ array(3) {
   [3]=>
   unicode(5) "three"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unique_variation6.phpt b/ext/standard/tests/array/array_unique_variation6.phpt
index f878575b97e99edd145c09afd3c473e9ce06bd1c..1bd1ad159a4395288b481016eec269090ec453e9 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation6.phpt
+++ b/ext/standard/tests/array/array_unique_variation6.phpt
@@ -33,16 +33,7 @@ var_dump( array_unique($input) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : array with reference variables for $input argument ***
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  &string(5) "hello"
-}
-Done
---UEXPECT--
+--EXPECT--
 *** Testing array_unique() : array with reference variables for $input argument ***
 array(2) {
   [0]=>
@@ -50,4 +41,4 @@ array(2) {
   [1]=>
   &unicode(5) "hello"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unique_variation7.phpt b/ext/standard/tests/array/array_unique_variation7.phpt
index 375482d9655084666ca84355c93412d5f5fed0b7..3b3d50c80f88cf462c3ac7e7809316caddce4792 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation7.phpt
+++ b/ext/standard/tests/array/array_unique_variation7.phpt
@@ -20,18 +20,7 @@ var_dump( array_unique($input) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unique() : array with binary data for $input argument ***
-array(3) {
-  [0]=>
-  string(1) "1"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-}
-Done
---UEXPECT--
+--EXPECT--
 *** Testing array_unique() : array with binary data for $input argument ***
 array(3) {
   [0]=>
@@ -41,4 +30,4 @@ array(3) {
   [2]=>
   unicode(5) "world"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unique_variation8.phpt b/ext/standard/tests/array/array_unique_variation8.phpt
index 2df84bbc5763d9353a0903c4eed2fef92f1f814f..3e907231a2a8fa01e49f54f3ca6fbda2024633a6 100644 (file)
--- a/ext/standard/tests/array/array_unique_variation8.phpt
+++ b/ext/standard/tests/array/array_unique_variation8.phpt
@@ -70,47 +70,3 @@ array(1) {
   }
 }
 Done
---UEXPECTF--
-*** Testing array_unique() : two dimensional array for $input argument ***
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-array(1) {
-  [0]=>
-  array(4) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(1)
-  }
-}
-Done

diff --git a/ext/standard/tests/array/array_unshift.phpt b/ext/standard/tests/array/array_unshift.phpt
index 90e9039e41d7b82e324c14009d42bcda4a2a7d00..847071533779bdc22214767c0e007d4b01751ab4 100644 (file)
--- a/ext/standard/tests/array/array_unshift.phpt
+++ b/ext/standard/tests/array/array_unshift.phpt
@@ -14,31 +14,7 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--    
-int(1)
-array(1) {
-  [0]=>
-  string(0) ""
-}
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-array(1) {
-  [0]=>
-  string(0) ""
-}
-int(2)
-array(2) {
-  [0]=>
-  array(1) {
-    [0]=>
-    string(0) ""
-  }
-  [1]=>
-  string(0) ""
-}
-Done
---UEXPECTF--
+--EXPECTF--
 int(1)
 array(1) {
   [0]=>

diff --git a/ext/standard/tests/array/array_unshift_basic1.phpt b/ext/standard/tests/array/array_unshift_basic1.phpt
index 6a46808a3f301a968c96306c02c2c18ac79be67d..504180b8978ce602ac2a924e46fb04449995e5c8 100644 (file)
--- a/ext/standard/tests/array/array_unshift_basic1.phpt
+++ b/ext/standard/tests/array/array_unshift_basic1.phpt
@@ -36,32 +36,7 @@ var_dump($temp_array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : basic functionality with default key array ***
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-int(5)
-array(5) {
-  [0]=>
-  int(222)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  float(12.33)
-  [3]=>
-  int(1)
-  [4]=>
-  int(2)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : basic functionality with default key array ***
 int(3)
 array(3) {
@@ -85,4 +60,4 @@ array(5) {
   [4]=>
   int(2)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_unshift_error.phpt b/ext/standard/tests/array/array_unshift_error.phpt
index 4ee890997902a4330edef16df93e6aca70075940..3a5cd53ffe342bd3cd68cb4d567445149c181eb5 100644 (file)
--- a/ext/standard/tests/array/array_unshift_error.phpt
+++ b/ext/standard/tests/array/array_unshift_error.phpt
@@ -32,17 +32,3 @@ NULL
 Warning: Wrong parameter count for array_unshift() in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_unshift() : error conditions ***
-
--- Testing array_unshift() function with Zero arguments --
-
-Warning: Wrong parameter count for array_unshift() in %s on line %d
-NULL
-
--- Testing array_unshift() function with less than expected no. of arguments --
-
-Warning: Wrong parameter count for array_unshift() in %s on line %d
-NULL
-Done
-

diff --git a/ext/standard/tests/array/array_unshift_object.phpt b/ext/standard/tests/array/array_unshift_object.phpt
index b8723e4a85bec1712aa86f6a52b103fbedeee88e..0de2cc71b57d7c65a1fb8e45235c62939e05d186 100644 (file)
--- a/ext/standard/tests/array/array_unshift_object.phpt
+++ b/ext/standard/tests/array/array_unshift_object.phpt
@@ -105,190 +105,6 @@ echo "Done";
 *** Testing array_unshift() : Passing object to $var argument ***
 -- Iteration 1 --
 int(5)
-array(5) {
-  [0]=>
-  object(SimpleClass)#%d (1) {
-    ["var1"]=>
-    int(1)
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(SimpleClass)#%d (1) {
-    ["var1"]=>
-    int(1)
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 2 --
-int(5)
-array(5) {
-  [0]=>
-  object(EmptyClass)#%d (0) {
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 3 --
-int(5)
-array(5) {
-  [0]=>
-  object(ChildClass)#%d (2) {
-    ["var3":"ChildClass":private]=>
-    NULL
-    ["var2":protected]=>
-    int(5)
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(ChildClass)#%d (2) {
-    ["var3":"ChildClass":private]=>
-    NULL
-    ["var2":protected]=>
-    int(5)
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  object(FinalClass)#%d (1) {
-    ["var4":"FinalClass":private]=>
-    NULL
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(FinalClass)#%d (1) {
-    ["var4":"FinalClass":private]=>
-    NULL
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 5 --
-int(5)
-array(5) {
-  [0]=>
-  object(StaticClass)#%d (0) {
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(StaticClass)#%d (0) {
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
-Done
---UEXPECTF--
-*** Testing array_unshift() : Passing object to $var argument ***
--- Iteration 1 --
-int(5)
 array(5) {
   [0]=>
   object(SimpleClass)#%d (1) {

diff --git a/ext/standard/tests/array/array_unshift_variation1.phpt b/ext/standard/tests/array/array_unshift_variation1.phpt
index cd40ce0a7b35933086fdd5a38f686eb2fb8306c4..08022e86a15b190220e54f443071239b85e7a27e 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation1.phpt
+++ b/ext/standard/tests/array/array_unshift_variation1.phpt
@@ -253,227 +253,6 @@ Warning: array_unshift(): The first argument should be an array in %s on line %d
 bool(false)
 bool(false)
 
--- Iteration 16 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(0) ""
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(0) ""
-
--- Iteration 17 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(0) ""
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(0) ""
-
--- Iteration 18 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(6) "string"
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(6) "string"
-
--- Iteration 19 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(6) "string"
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(6) "string"
-
--- Iteration 20 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(11) "hello world"
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-string(11) "hello world"
-
--- Iteration 21 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-object(classA)#%d (0) {
-}
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-object(classA)#%d (0) {
-}
-
--- Iteration 22 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
--- Iteration 23 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
--- Iteration 24 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-resource(%d) of type (stream)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-resource(%d) of type (stream)
-Done
---UEXPECTF--
-*** Testing array_unshift() : unexpected values for $array argument ***
-
--- Iteration 1 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(0)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(0)
-
--- Iteration 2 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(1)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(1)
-
--- Iteration 3 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(12345)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(12345)
-
--- Iteration 4 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(-2345)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-int(-2345)
-
--- Iteration 5 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(10.5)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(10.5)
-
--- Iteration 6 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(-10.5)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(-10.5)
-
--- Iteration 7 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(123456789000)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(123456789000)
-
--- Iteration 8 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(1.23456789E-9)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(1.23456789E-9)
-
--- Iteration 9 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(0.5)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-float(0.5)
-
--- Iteration 10 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
--- Iteration 11 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-NULL
-
--- Iteration 12 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(true)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(true)
-
--- Iteration 13 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(false)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(false)
-
--- Iteration 14 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(true)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(true)
-
--- Iteration 15 --
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(false)
-
-Warning: array_unshift(): The first argument should be an array in %s on line %d
-bool(false)
-bool(false)
-
 -- Iteration 16 --
 Warning: array_unshift(): The first argument should be an array in %s on line %d
 bool(false)

diff --git a/ext/standard/tests/array/array_unshift_variation2.phpt b/ext/standard/tests/array/array_unshift_variation2.phpt
index d28bc832d6eabd94fb2d77f1e27a7eca7a508170..895a0d91a9c4fc9478ed95382a1fbd46c98a8294 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation2.phpt
+++ b/ext/standard/tests/array/array_unshift_variation2.phpt
@@ -125,944 +125,6 @@ echo "Done";
 *** Testing array_unshift() : all possible values for $var argument ***
 -- Iteration 1 --
 int(5)
-array(5) {
-  [0]=>
-  int(0)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(0)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 2 --
-int(5)
-array(5) {
-  [0]=>
-  int(1)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 3 --
-int(5)
-array(5) {
-  [0]=>
-  int(12345)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(12345)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  int(-2345)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(-2345)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 5 --
-int(5)
-array(5) {
-  [0]=>
-  float(10.5)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 6 --
-int(5)
-array(5) {
-  [0]=>
-  float(-10.5)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 7 --
-int(5)
-array(5) {
-  [0]=>
-  float(123456789000)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  float(123456789000)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 8 --
-int(5)
-array(5) {
-  [0]=>
-  float(1.23456789E-9)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  float(1.23456789E-9)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 9 --
-int(5)
-array(5) {
-  [0]=>
-  float(0.5)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  float(0.5)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 10 --
-int(5)
-array(5) {
-  [0]=>
-  array(0) {
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 11 --
-int(5)
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 12 --
-int(5)
-array(5) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 13 --
-int(5)
-array(5) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 14 --
-int(5)
-array(5) {
-  [0]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  array(2) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 15 --
-int(5)
-array(5) {
-  [0]=>
-  NULL
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  NULL
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 16 --
-int(5)
-array(5) {
-  [0]=>
-  NULL
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  NULL
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 17 --
-int(5)
-array(5) {
-  [0]=>
-  bool(true)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  bool(true)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 18 --
-int(5)
-array(5) {
-  [0]=>
-  bool(false)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  bool(false)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 19 --
-int(5)
-array(5) {
-  [0]=>
-  bool(true)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  bool(true)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 20 --
-int(5)
-array(5) {
-  [0]=>
-  bool(false)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  bool(false)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 21 --
-int(5)
-array(5) {
-  [0]=>
-  string(0) ""
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 22 --
-int(5)
-array(5) {
-  [0]=>
-  string(0) ""
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 23 --
-int(5)
-array(5) {
-  [0]=>
-  string(6) "string"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 24 --
-int(5)
-array(5) {
-  [0]=>
-  string(6) "string"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 25 --
-int(5)
-array(5) {
-  [0]=>
-  string(11) "hello world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(11) "hello world"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 26 --
-int(5)
-array(5) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 27 --
-int(5)
-array(5) {
-  [0]=>
-  NULL
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  NULL
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 28 --
-int(5)
-array(5) {
-  [0]=>
-  NULL
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  NULL
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 29 --
-int(5)
-array(5) {
-  [0]=>
-  resource(%d) of type (stream)
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  resource(%d) of type (stream)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
-Done
---UEXPECTF--
-*** Testing array_unshift() : all possible values for $var argument ***
--- Iteration 1 --
-int(5)
 array(5) {
   [0]=>
   int(0)

diff --git a/ext/standard/tests/array/array_unshift_variation3.phpt b/ext/standard/tests/array/array_unshift_variation3.phpt
index 0ce49ee92038419e0e6412ce1c79401884f8577c..08e07c648d36f9a2b2f38bcb5ff5849933b16e81 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation3.phpt
+++ b/ext/standard/tests/array/array_unshift_variation3.phpt
@@ -72,504 +72,7 @@ foreach($arrays as $array) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : different arrays for $array argument ***
--- Iteration 1 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  int(1)
-  [4]=>
-  int(2)
-}
--- Iteration 2 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(2.2)
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  float(1.1)
-  [4]=>
-  float(2.2)
-}
--- Iteration 3 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  array(1) {
-    [0]=>
-    int(2)
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(1)
-  }
-}
--- Iteration 4 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  bool(false)
-  [4]=>
-  bool(true)
-}
--- Iteration 5 --
-int(1)
-array(1) {
-  [0]=>
-  int(10)
-}
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-}
--- Iteration 6 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  NULL
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  NULL
-}
--- Iteration 7 --
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(1) "a"
-  [2]=>
-  string(4) "aaaa"
-  [3]=>
-  string(1) "b"
-  [4]=>
-  string(4) "bbbb"
-  [5]=>
-  string(1) "c"
-  [6]=>
-  string(5) "ccccc"
-}
-int(9)
-array(9) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(1) "a"
-  [4]=>
-  string(4) "aaaa"
-  [5]=>
-  string(1) "b"
-  [6]=>
-  string(4) "bbbb"
-  [7]=>
-  string(1) "c"
-  [8]=>
-  string(5) "ccccc"
-}
--- Iteration 8 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  string(5) "three"
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(3) "one"
-  [4]=>
-  string(3) "two"
-  [5]=>
-  string(5) "three"
-}
--- Iteration 9 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-}
--- Iteration 10 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(10)
-  [2]=>
-  int(20)
-  [3]=>
-  int(40)
-  [4]=>
-  int(30)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  int(10)
-  [4]=>
-  int(20)
-  [5]=>
-  int(40)
-  [6]=>
-  int(30)
-}
--- Iteration 11 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  ["three"]=>
-  string(6) "thirty"
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["one"]=>
-  string(3) "ten"
-  ["two"]=>
-  string(6) "twenty"
-  ["three"]=>
-  string(6) "thirty"
-}
--- Iteration 12 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  ["one"]=>
-  int(1)
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(4) "four"
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["one"]=>
-  int(1)
-  [3]=>
-  string(3) "two"
-  [4]=>
-  string(4) "four"
-}
--- Iteration 13 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [""]=>
-  string(4) "null"
-  ["NULL"]=>
-  NULL
-  ["null"]=>
-  NULL
-}
--- Iteration 14 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(4) "true"
-  [2]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(4) "true"
-  [4]=>
-  string(5) "false"
-  ["false"]=>
-  bool(false)
-  ["true"]=>
-  bool(true)
-}
--- Iteration 15 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [""]=>
-  string(6) "emptys"
-  ["emptyd"]=>
-  string(0) ""
-  ["emptys"]=>
-  string(0) ""
-}
--- Iteration 16 --
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(0) ""
-  [2]=>
-  string(0) ""
-  [3]=>
-  NULL
-  [4]=>
-  NULL
-  [5]=>
-  bool(false)
-  [6]=>
-  bool(true)
-}
-int(9)
-array(9) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(0) ""
-  [4]=>
-  string(0) ""
-  [5]=>
-  NULL
-  [6]=>
-  NULL
-  [7]=>
-  bool(false)
-  [8]=>
-  bool(true)
-}
--- Iteration 17 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [""]=>
-  int(4)
-  [1]=>
-  int(5)
-  [2]=>
-  int(6)
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [""]=>
-  int(4)
-  [3]=>
-  int(5)
-  [4]=>
-  int(6)
-}
--- Iteration 18 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  ["One"]=>
-  int(10)
-  ["two"]=>
-  int(20)
-  ["three"]=>
-  int(3)
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["One"]=>
-  int(10)
-  ["two"]=>
-  int(20)
-  ["three"]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : different arrays for $array argument ***
 -- Iteration 1 --
 int(3)

diff --git a/ext/standard/tests/array/array_unshift_variation4.phpt b/ext/standard/tests/array/array_unshift_variation4.phpt
index aad52bdf9d8147d79d7117d7e36eae2dac2350ec..de284f4f52775eb33f32bdf133814b82b0cee37a 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation4.phpt
+++ b/ext/standard/tests/array/array_unshift_variation4.phpt
@@ -107,296 +107,6 @@ Warning: Illegal offset type in %s on line %d
 
 Warning: Illegal offset type in %s on line %d
 
-Warning: Illegal offset type in %s on line %d
--- Iteration 1 --
-int(1)
-array(1) {
-  [0]=>
-  int(10)
-}
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-}
--- Iteration 2 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(1) "0"
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(1) "0"
-}
--- Iteration 3 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(1) "1"
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(1) "1"
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(1) "1"
-  [2]=>
-  string(1) "2"
-  [3]=>
-  string(1) "3"
-  [4]=>
-  string(1) "4"
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(1) "1"
-  [4]=>
-  string(1) "2"
-  [5]=>
-  string(1) "3"
-  [6]=>
-  string(1) "4"
-}
--- Iteration 5 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "float"
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(5) "float"
-}
--- Iteration 6 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(2) "f1"
-  [2]=>
-  string(2) "f2"
-  [3]=>
-  string(2) "f3"
-  [4]=>
-  string(2) "f4"
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(2) "f1"
-  [4]=>
-  string(2) "f2"
-  [5]=>
-  string(2) "f3"
-  [6]=>
-  string(2) "f4"
-}
--- Iteration 7 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  ["\tHello"]=>
-  int(111)
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen\n"]=>
-  int(33)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["\tHello"]=>
-  int(111)
-  ["re\td"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen\n"]=>
-  int(33)
-}
--- Iteration 8 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  ["   Hello"]=>
-  int(111)
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen
-"]=>
-  int(33)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["   Hello"]=>
-  int(111)
-  ["re d"]=>
-  string(5) "color"
-  ["\v\fworld"]=>
-  float(2.2)
-  ["pen
-"]=>
-  int(33)
-}
--- Iteration 9 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(5) "hello"
-  ["Hello world"]=>
-  string(6) "string"
-}
--- Iteration 10 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [""]=>
-  string(5) "hello"
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [""]=>
-  string(5) "hello"
-}
--- Iteration 11 --
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  ["hello"]=>
-  int(1)
-  ["fruit"]=>
-  float(2.2)
-  [1]=>
-  string(3) "int"
-  [2]=>
-  string(5) "float"
-  [""]=>
-  string(5) "unset"
-  ["Hello world"]=>
-  string(7) "heredoc"
-}
-int(9)
-array(9) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["hello"]=>
-  int(1)
-  ["fruit"]=>
-  float(2.2)
-  [3]=>
-  string(3) "int"
-  [4]=>
-  string(5) "float"
-  [""]=>
-  string(5) "unset"
-  ["Hello world"]=>
-  string(7) "heredoc"
-}
-Done
---UEXPECTF--
-*** Testing array_unshift() : associative array with different keys ***
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
-Warning: Illegal offset type in %s on line %d
-
 Warning: Illegal offset type in %s on line %d
 -- Iteration 1 --
 int(1)

diff --git a/ext/standard/tests/array/array_unshift_variation5.phpt b/ext/standard/tests/array/array_unshift_variation5.phpt
index acf18e9c7046b68e5c53c82478aa842fba0d7586..22c0bf4b52485594e68c5faa8a5ec53493cd6d4e 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation5.phpt
+++ b/ext/standard/tests/array/array_unshift_variation5.phpt
@@ -103,308 +103,6 @@ array(1) {
   int(10)
 }
 int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-}
--- Iteration 2 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(0)
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  int(0)
-}
--- Iteration 3 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(1)
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  int(1)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [1]=>
-  int(4)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [3]=>
-  int(4)
-}
--- Iteration 5 --
-int(2)
-array(2) {
-  [0]=>
-  int(10)
-  ["float"]=>
-  float(2.3333)
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["float"]=>
-  float(2.3333)
-}
--- Iteration 6 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [1]=>
-  float(4.8999992284)
-  ["f4"]=>
-  float(33333333.3333)
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f1"]=>
-  float(1.2)
-  ["f2"]=>
-  float(3.33)
-  [3]=>
-  float(4.8999992284)
-  ["f4"]=>
-  float(33333333.3333)
-}
--- Iteration 7 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(6) "  Hello"
-  ["red"]=>
-  string(6) "col       or"
-  [2]=>
-  string(7) "\v\fworld"
-  [3]=>
-  string(4) "pen
-"
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(6) "  Hello"
-  ["red"]=>
-  string(6) "col       or"
-  [4]=>
-  string(7) "\v\fworld"
-  [5]=>
-  string(4) "pen
-"
-}
--- Iteration 8 --
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(7) "\tHello"
-  ["red"]=>
-  string(7) "col\tor"
-  [2]=>
-  string(9) "\v\fworld"
-  [3]=>
-  string(5) "pen\n"
-}
-int(7)
-array(7) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(7) "\tHello"
-  ["red"]=>
-  string(7) "col\tor"
-  [4]=>
-  string(9) "\v\fworld"
-  [5]=>
-  string(5) "pen\n"
-}
--- Iteration 9 --
-int(3)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-int(5)
-array(5) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(5) "hello"
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
--- Iteration 10 --
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  ["unset"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  object(classA)#%d (0) {
-  }
-  ["unset"]=>
-  NULL
-  ["resource"]=>
-  resource(%d) of type (stream)
-}
--- Iteration 11 --
-int(9)
-array(9) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  object(classA)#%d (0) {
-  }
-  [3]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  ["float"]=>
-  float(444.432)
-  ["unset"]=>
-  NULL
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-int(11)
-array(11) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  string(5) "hello"
-  [4]=>
-  object(classA)#%d (0) {
-  }
-  [5]=>
-  string(5) "fruit"
-  ["resource"]=>
-  resource(%d) of type (stream)
-  ["int"]=>
-  int(133)
-  ["float"]=>
-  float(444.432)
-  ["unset"]=>
-  NULL
-  ["heredoc"]=>
-  string(11) "Hello world"
-}
-Done
---UEXPECTF--
-*** Testing array_unshift() : associative array with different values ***
--- Iteration 1 --
-int(1)
-array(1) {
-  [0]=>
-  int(10)
-}
-int(3)
 array(3) {
   [0]=>
   int(10)

diff --git a/ext/standard/tests/array/array_unshift_variation6.phpt b/ext/standard/tests/array/array_unshift_variation6.phpt
index f7376cc3b5edec61afb36cf1d2b2a534279e0b1e..1d36433f1da386be692bb109116c5b9ef1d034b1 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation6.phpt
+++ b/ext/standard/tests/array/array_unshift_variation6.phpt
@@ -73,128 +73,7 @@ var_dump($temp_array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : two dimensional arrays for $array argument ***
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  [1]=>
-  array(3) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-    ["place"]=>
-    string(2) "LA"
-  }
-  [2]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [3]=>
-  array(7) {
-    ["a"]=>
-    string(5) "green"
-    [0]=>
-    string(3) "red"
-    [1]=>
-    string(5) "brown"
-    [2]=>
-    int(33)
-    [3]=>
-    int(88)
-    [4]=>
-    string(6) "orange"
-    ["item"]=>
-    string(4) "ball"
-  }
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  [3]=>
-  array(3) {
-    ["color"]=>
-    string(3) "red"
-    ["item"]=>
-    string(3) "pen"
-    ["place"]=>
-    string(2) "LA"
-  }
-  [4]=>
-  array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-  }
-  [5]=>
-  array(7) {
-    ["a"]=>
-    string(5) "green"
-    [0]=>
-    string(3) "red"
-    [1]=>
-    string(5) "brown"
-    [2]=>
-    int(33)
-    [3]=>
-    int(88)
-    [4]=>
-    string(6) "orange"
-    ["item"]=>
-    string(4) "ball"
-  }
-}
-int(4)
-array(4) {
-  [0]=>
-  int(10)
-  ["color"]=>
-  string(3) "red"
-  ["item"]=>
-  string(3) "pen"
-  ["place"]=>
-  string(2) "LA"
-}
-int(6)
-array(6) {
-  [0]=>
-  int(10)
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["color"]=>
-  string(3) "red"
-  ["item"]=>
-  string(3) "pen"
-  ["place"]=>
-  string(2) "LA"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : two dimensional arrays for $array argument ***
 int(4)
 array(4) {

diff --git a/ext/standard/tests/array/array_unshift_variation7.phpt b/ext/standard/tests/array/array_unshift_variation7.phpt
index b75ad0dc0837029770b2cb20454401f4fe809246..f8674460b8a79d2a9888c8b39e03bb3840752ee9 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation7.phpt
+++ b/ext/standard/tests/array/array_unshift_variation7.phpt
@@ -54,171 +54,7 @@ foreach($vars as $var) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : double quoted strings for $var argument ***
--- Iteration 1 --
-int(5)
-array(5) {
-  [0]=>
-  string(53) "$ -> This represents the dollar sign. hello dollar!!!"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(53) "$ -> This represents the dollar sign. hello dollar!!!"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 2 --
-int(5)
-array(5) {
-  [0]=>
-  string(49) " 
-\v The quick brown fo\fx jumped over the lazy dog"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(49) " 
-\v The quick brown fo\fx jumped over the lazy dog"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 3 --
-int(5)
-array(5) {
-  [0]=>
-  string(55) "This is a text with special chars: \!\@\#$\%\^\&\*\(\)\"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(55) "This is a text with special chars: \!\@\#$\%\^\&\*\(\)\"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  string(13) "hello world\t"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(13) "hello world\t"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 5 --
-int(5)
-array(5) {
-  [0]=>
-  string(70) "This is  a text in bold letters
-\s\malong with slashes
- : HELLO WORLD "
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(70) "This is  a text in bold letters
-\s\malong with slashes
- : HELLO WORLD "
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : double quoted strings for $var argument ***
 -- Iteration 1 --
 int(5)

diff --git a/ext/standard/tests/array/array_unshift_variation8.phpt b/ext/standard/tests/array/array_unshift_variation8.phpt
index 08f03386e96ee36007babd9859b2ce6d83f38e9c..3e9662ff75ee1049ae1b4533654428bc2b5159a9 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation8.phpt
+++ b/ext/standard/tests/array/array_unshift_variation8.phpt
@@ -54,165 +54,7 @@ foreach($vars as $var) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : single quoted strings for $var argument ***
--- Iteration 1 --
-int(5)
-array(5) {
-  [0]=>
-  string(54) "\$ -> This represents the dollar sign. hello dollar!!!"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(54) "\$ -> This represents the dollar sign. hello dollar!!!"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 2 --
-int(5)
-array(5) {
-  [0]=>
-  string(53) "\t\r\v The quick brown fo\fx jumped over the lazy dog"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(53) "\t\r\v The quick brown fo\fx jumped over the lazy dog"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 3 --
-int(5)
-array(5) {
-  [0]=>
-  string(56) "This is a text with special chars: \!\@\#\$\%\^\&\*\(\)\"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(56) "This is a text with special chars: \!\@\#\$\%\^\&\*\(\)\"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  string(13) "hello world\t"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(13) "hello world\t"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 5 --
-int(5)
-array(5) {
-  [0]=>
-  string(74) "This is \ta text in bold letters\r\s\malong with slashes\n : HELLO WORLD\t"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(74) "This is \ta text in bold letters\r\s\malong with slashes\n : HELLO WORLD\t"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : single quoted strings for $var argument ***
 -- Iteration 1 --
 int(5)

diff --git a/ext/standard/tests/array/array_unshift_variation9.phpt b/ext/standard/tests/array/array_unshift_variation9.phpt
index 77d2f3a1316b6786f93224039f5dd12d07e9c8a4..8157724e27734a41863b1db6ed98b7a47b3c808d 100644 (file)
--- a/ext/standard/tests/array/array_unshift_variation9.phpt
+++ b/ext/standard/tests/array/array_unshift_variation9.phpt
@@ -94,222 +94,7 @@ foreach($vars as $var) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing array_unshift() : heredoc strings for $var argument ***
--- Iteration 1 --
-int(5)
-array(5) {
-  [0]=>
-  string(0) ""
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 2 --
-int(5)
-array(5) {
-  [0]=>
-  string(1) "
-"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(1) "
-"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 3 --
-int(5)
-array(5) {
-  [0]=>
-  string(86) "hello world
-The big brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(86) "hello world
-The big brown fox jumped over;
-the lazy dog
-This is a double quoted string"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 4 --
-int(5)
-array(5) {
-  [0]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(88) "hello
- world 
-1111            != 2222\v\v
-heredoc
-double quoted string. with\vdifferent\fwhite\vspaces"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 5 --
-int(5)
-array(5) {
-  [0]=>
-  string(44) "11 < 12. 123 >22
-2222 != 1111.   0000 = 0000
-"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(44) "11 < 12. 123 >22
-2222 != 1111.   0000 = 0000
-"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
--- Iteration 6 --
-int(5)
-array(5) {
-  [0]=>
-  string(123) "This's a string with quotes:
-"strings in double quote";
-'strings in single quote';
-this\line is single quoted /with\slashes"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [1]=>
-  int(1)
-  [2]=>
-  float(2.222)
-}
-int(7)
-array(7) {
-  [0]=>
-  string(123) "This's a string with quotes:
-"strings in double quote";
-'strings in single quote';
-this\line is single quoted /with\slashes"
-  [1]=>
-  string(5) "hello"
-  [2]=>
-  string(5) "world"
-  ["f"]=>
-  string(5) "first"
-  ["s"]=>
-  string(6) "second"
-  [3]=>
-  int(1)
-  [4]=>
-  float(2.222)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_unshift() : heredoc strings for $var argument ***
 -- Iteration 1 --
 int(5)

diff --git a/ext/standard/tests/array/array_user_key_compare.phpt b/ext/standard/tests/array/array_user_key_compare.phpt
index 8b42eb9092cddd0cca7384870c8b749f4c9bb127..e5267b0d0e9ed690f5eaaa01838559153380aa43 100644 (file)
--- a/ext/standard/tests/array/array_user_key_compare.phpt
+++ b/ext/standard/tests/array/array_user_key_compare.phpt
@@ -16,6 +16,4 @@ var_dump($a);
 
 ?>
 --EXPECTF--
-string(1) "A"
---UEXPECTF--
 unicode(1) "A"

diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt
index b281325ee7423b31a11b423309f73d86e3835072..c16b8a69268bc44dc091786d8c8394f6b375ec21 100644 (file)
Binary files a/ext/standard/tests/array/array_values.phpt and b/ext/standard/tests/array/array_values.phpt differ

diff --git a/ext/standard/tests/array/array_values_basic.phpt b/ext/standard/tests/array/array_values_basic.phpt
index 95e2b08726f8cec62a5c40fe367448ae7940c557..58acc992aea0cc68c891217172a7a49b1f198e33 100644 (file)
--- a/ext/standard/tests/array/array_values_basic.phpt
+++ b/ext/standard/tests/array/array_values_basic.phpt
@@ -23,22 +23,7 @@ var_dump( array_values($input) );
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_values() : basic functionality ***
-array(5) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-  [3]=>
-  int(3)
-  [4]=>
-  string(3) "ten"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_values() : basic functionality ***
 array(5) {
   [0]=>
@@ -52,4 +37,4 @@ array(5) {
   [4]=>
   unicode(3) "ten"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt
index 40170811af1188a6a01316334905e3cf1506d6c3..b513cf714dba27de69d2257127572124f6e74323 100644 (file)
--- a/ext/standard/tests/array/array_values_errors.phpt
+++ b/ext/standard/tests/array/array_values_errors.phpt
@@ -16,25 +16,7 @@ var_dump( array_values(new stdclass) );  // object
 
 echo "Done\n";
 ?>
---EXPECTF--    
-*** Testing error conditions ***
-
-Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: array_values() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: array_values() expects parameter 1 to be array, object given in %s on line %d
-NULL
-Done
---UEXPECTF--
+--EXPECTF--
 *** Testing error conditions ***
 
 Warning: array_values() expects exactly 1 parameter, 0 given in %s on line %d

diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt
index 15da1a621ebb49607c32740443be9e1b8b1ded4b..defe9ca03f4cdb4438f6aeeec5b1cb562c5d646c 100644 (file)
--- a/ext/standard/tests/array/array_values_variation.phpt
+++ b/ext/standard/tests/array/array_values_variation.phpt
@@ -35,7 +35,7 @@ var_dump( array_values(array()) );  // null array
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 *** Testing array_values() with resource type ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_values_variation1.phpt b/ext/standard/tests/array/array_values_variation1.phpt
index 963988f8112fbd0955fe5836edef2dcf055b3fbd..0b60874ed2b80c78a57c44f0392194365a7e5fb2 100644 (file)
--- a/ext/standard/tests/array/array_values_variation1.phpt
+++ b/ext/standard/tests/array/array_values_variation1.phpt
@@ -175,133 +175,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-array(0) {
-}
-
--- Iteration 19 --
-
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: array_values() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: array_values() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: array_values() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: array_values() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: array_values() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing array_values() : usage variations ***
-
--- Iteration 1 --
-
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: array_values() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: array_values() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: array_values() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: array_values() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: array_values() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: array_values() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: array_values() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: array_values() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: array_values() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: array_values() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 
@@ -348,4 +221,4 @@ NULL
 
 Warning: array_values() expects parameter 1 to be array, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation2.phpt b/ext/standard/tests/array/array_values_variation2.phpt
index f4c98e1de1a2ed5ce6ae087cc925469db9d0c022..68233ffe69d1738e66f97fe5643f8021590e1af6 100644 (file)
--- a/ext/standard/tests/array/array_values_variation2.phpt
+++ b/ext/standard/tests/array/array_values_variation2.phpt
@@ -166,102 +166,6 @@ array(4) {
   bool(false)
 }
 
--- Iteration 5: empty string data --
-array(2) {
-  [0]=>
-  string(0) ""
-  [1]=>
-  string(0) ""
-}
-
--- Iteration 6: empty array data --
-array(0) {
-}
-
--- Iteration 7: string data --
-array(3) {
-  [0]=>
-  string(6) "string"
-  [1]=>
-  string(6) "string"
-  [2]=>
-  string(11) "hello world"
-}
-
--- Iteration 8: object data --
-array(1) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-}
-
--- Iteration 9: undefined data --
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 10: unset data --
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 11: resource data --
-array(1) {
-  [0]=>
-  resource(%d) of type (stream)
-}
-Done
---UEXPECTF--
-*** Testing array_values() : usage variations ***
-
--- Iteration 1: int data --
-array(4) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(12345)
-  [3]=>
-  int(-2345)
-}
-
--- Iteration 2: float data --
-array(5) {
-  [0]=>
-  float(10.5)
-  [1]=>
-  float(-10.5)
-  [2]=>
-  float(123456789000)
-  [3]=>
-  float(1.23456789E-9)
-  [4]=>
-  float(0.5)
-}
-
--- Iteration 3: null data --
-array(2) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-}
-
--- Iteration 4: bool data --
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(false)
-}
-
 -- Iteration 5: empty string data --
 array(2) {
   [0]=>
@@ -308,4 +212,4 @@ array(1) {
   [0]=>
   resource(%d) of type (stream)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation3.phpt b/ext/standard/tests/array/array_values_variation3.phpt
index 1163ec5a724448dfde6ca401dc10c1a9606693ea..cd660993c1b7b86cab94c70bd20b4c5778ee38e7 100644 (file)
--- a/ext/standard/tests/array/array_values_variation3.phpt
+++ b/ext/standard/tests/array/array_values_variation3.phpt
@@ -103,102 +103,7 @@ foreach($inputs as $key => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_values() : usage variations ***
-
--- Iteration 1: int data --
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(8) "positive"
-  [3]=>
-  string(8) "negative"
-}
-
--- Iteration 2: float data --
-array(3) {
-  [0]=>
-  string(8) "positive"
-  [1]=>
-  string(8) "negative"
-  [2]=>
-  string(4) "half"
-}
-
--- Iteration 3: extreme floats data --
-array(2) {
-  [0]=>
-  string(5) "large"
-  [1]=>
-  string(5) "small"
-}
-
--- Iteration 4: null uppercase data --
-array(1) {
-  [0]=>
-  string(6) "null 1"
-}
-
--- Iteration 5: null lowercase data --
-array(1) {
-  [0]=>
-  string(6) "null 2"
-}
-
--- Iteration 6: bool lowercase data --
-array(2) {
-  [0]=>
-  string(6) "lowert"
-  [1]=>
-  string(6) "lowerf"
-}
-
--- Iteration 7: bool uppercase data --
-array(2) {
-  [0]=>
-  string(6) "uppert"
-  [1]=>
-  string(6) "upperf"
-}
-
--- Iteration 8: empty double quotes data --
-array(1) {
-  [0]=>
-  string(6) "emptyd"
-}
-
--- Iteration 9: empty single quotes data --
-array(1) {
-  [0]=>
-  string(6) "emptys"
-}
-
--- Iteration 10: string data --
-array(3) {
-  [0]=>
-  string(7) "stringd"
-  [1]=>
-  string(7) "strings"
-  [2]=>
-  string(7) "stringh"
-}
-
--- Iteration 11: undefined data --
-array(1) {
-  [0]=>
-  string(9) "undefined"
-}
-
--- Iteration 12: unset data --
-array(1) {
-  [0]=>
-  string(5) "unset"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_values() : usage variations ***
 
 -- Iteration 1: int data --
@@ -292,4 +197,4 @@ array(1) {
   [0]=>
   unicode(5) "unset"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation4.phpt b/ext/standard/tests/array/array_values_variation4.phpt
index f3457de76ede62a65b87abd392a1b84cb7b340cb..c2fc6474685f6e9a755c8f1a535e1454af0523b7 100644 (file)
--- a/ext/standard/tests/array/array_values_variation4.phpt
+++ b/ext/standard/tests/array/array_values_variation4.phpt
@@ -32,88 +32,7 @@ var_dump(array_values($input));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_values() : usage variations ***
-
--- Array values of a two-dimensional array --
-array(3) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
--- Array values of a sub-array --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-
--- Array values of an infinitely recursive array --
-array(4) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [3]=>
-  &array(4) {
-    ["zero"]=>
-    string(4) "zero"
-    ["un"]=>
-    string(3) "one"
-    ["sub"]=>
-    array(3) {
-      [0]=>
-      int(1)
-      [1]=>
-      int(2)
-      [2]=>
-      int(3)
-    }
-    [0]=>
-    &array(4) {
-      ["zero"]=>
-      string(4) "zero"
-      ["un"]=>
-      string(3) "one"
-      ["sub"]=>
-      array(3) {
-        [0]=>
-        int(1)
-        [1]=>
-        int(2)
-        [2]=>
-        int(3)
-      }
-      [0]=>
-      *RECURSION*
-    }
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_values() : usage variations ***
 
 -- Array values of a two-dimensional array --
@@ -193,4 +112,4 @@ array(4) {
     }
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation5.phpt b/ext/standard/tests/array/array_values_variation5.phpt
index 5199246a63f7ef52f6b0e9f36002832117423259..9edcbf02e0c2ffb351cdde1c3d4ebacf74041dc5 100644 (file)
--- a/ext/standard/tests/array/array_values_variation5.phpt
+++ b/ext/standard/tests/array/array_values_variation5.phpt
@@ -26,25 +26,7 @@ echo key($input) . " => " . current ($input) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_values() : usage variations ***
-
--- Call array_values() --
-array(3) {
-  [0]=>
-  string(2) "un"
-  [1]=>
-  string(4) "deux"
-  [2]=>
-  string(5) "trois"
-}
--- Position of Internal Pointer in Result: --
-0 => un
-
--- Position of Internal Pointer in Original Array: --
-one => un
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_values() : usage variations ***
 
 -- Call array_values() --
@@ -61,4 +43,4 @@ array(3) {
 
 -- Position of Internal Pointer in Original Array: --
 one => un
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation6.phpt b/ext/standard/tests/array/array_values_variation6.phpt
index 5ce82f3f950c0b908f70a09aad16ae4f5c60cc6e..f7b3caf877dff60276e1eca9fd64b3dcf11861a9 100644 (file)
--- a/ext/standard/tests/array/array_values_variation6.phpt
+++ b/ext/standard/tests/array/array_values_variation6.phpt
@@ -38,39 +38,6 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing array_values() : usage variations ***
 
--- $input is an array made up of referenced variables: --
-array(3) {
-  [0]=>
-  &string(3) "one"
-  [1]=>
-  &string(3) "two"
-  [2]=>
-  &string(5) "three"
-}
-Change $val2 and check result of array_values():
-array(3) {
-  [0]=>
-  &string(3) "one"
-  [1]=>
-  &string(4) "deux"
-  [2]=>
-  &string(5) "three"
-}
-
--- Pass $input argument by reference --
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing array_values() : usage variations ***
-
 -- $input is an array made up of referenced variables: --
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/array_values_variation7.phpt b/ext/standard/tests/array/array_values_variation7.phpt
index 2c724604caff64929bf316cf4abf7b638d943a94..01d549672c93d405a56ee40ad380d55b3b9b892c 100644 (file)
--- a/ext/standard/tests/array/array_values_variation7.phpt
+++ b/ext/standard/tests/array/array_values_variation7.phpt
@@ -26,34 +26,7 @@ var_dump(array_values($input));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing array_values() : usage variations ***
-
--- $input argument: --
-array(4) {
-  [3]=>
-  string(5) "three"
-  [2]=>
-  string(3) "two"
-  [1]=>
-  string(3) "one"
-  [0]=>
-  string(4) "zero"
-}
-
--- Result of array_values() --
-array(4) {
-  [0]=>
-  string(5) "three"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(3) "one"
-  [3]=>
-  string(4) "zero"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_values() : usage variations ***
 
 -- $input argument: --
@@ -79,4 +52,4 @@ array(4) {
   [3]=>
   unicode(4) "zero"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/array_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt
index 8b1e2c0b0e75d946367d67f90f990f217ced0fa1..a9c59df193c98cb29b9ac42c9a21b75f72ddb0b5 100644 (file)
--- a/ext/standard/tests/array/array_values_variation_64bit.phpt
+++ b/ext/standard/tests/array/array_values_variation_64bit.phpt
@@ -34,7 +34,7 @@ var_dump( array_values(array(1,2,3)) );
 var_dump( array_values(array()) );  // null array
 
 ?>
---EXPECTF--    
+--EXPECTF--
 *** Testing array_values() with resource type ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/array_walk.phpt b/ext/standard/tests/array/array_walk.phpt
index 8891f85af28275aad88d6dcadb97018868ce62ea..90303837f2421f02f5290e1e96a6122a03c79327 100644 (file)
--- a/ext/standard/tests/array/array_walk.phpt
+++ b/ext/standard/tests/array/array_walk.phpt
@@ -30,25 +30,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-int(1)
-int(0)
-string(4) "data"
-int(2)
-int(1)
-string(4) "data"
-bool(true)
-string(4) "data"
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_walk_basic1.phpt b/ext/standard/tests/array/array_walk_basic1.phpt
index c46631bd4000dbbc2b82d035a2e9fc0446040aa2..d78237f81c2f98bd0e585356ca2ee010fa08e344 100644 (file)
--- a/ext/standard/tests/array/array_walk_basic1.phpt
+++ b/ext/standard/tests/array/array_walk_basic1.phpt
@@ -46,41 +46,6 @@ echo "Done";
 --EXPECT--
 *** Testing array_walk() : basic functionality ***
 -- Using array_walk() with default parameters to show array contents --
-string(5) "lemon"
-int(0)
-
-string(6) "orange"
-int(1)
-
-string(6) "banana"
-int(2)
-
-string(5) "apple"
-int(3)
-
-bool(true)
--- Using array_walk() with all parameters --
-string(5) "lemon"
-int(0)
-string(5) "Added"
-
-string(6) "orange"
-int(1)
-string(5) "Added"
-
-string(6) "banana"
-int(2)
-string(5) "Added"
-
-string(5) "apple"
-int(3)
-string(5) "Added"
-
-bool(true)
-Done
---UEXPECTF--
-*** Testing array_walk() : basic functionality ***
--- Using array_walk() with default parameters to show array contents --
 unicode(5) "lemon"
 int(0)
 

diff --git a/ext/standard/tests/array/array_walk_basic2.phpt b/ext/standard/tests/array/array_walk_basic2.phpt
index f0294dc7a3419638a5b69bd8c7686359c667d806..87ef404e7770c969fe65d75aca3212a841b87fa6 100644 (file)
--- a/ext/standard/tests/array/array_walk_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_basic2.phpt
@@ -57,55 +57,6 @@ echo "Done";
 --EXPECT--
 *** Testing array_walk() : basic functionality ***
 -- Using array_walk with default parameters to show array contents --
-string(5) "lemon"
-string(1) "d"
-
-string(6) "orange"
-string(1) "a"
-
-string(6) "banana"
-string(1) "b"
-
-string(5) "apple"
-string(1) "c"
-
-bool(true)
--- Using array_walk with one optional parameter to modify contents --
-string(5) "lemon"
-string(1) "d"
-string(5) "fruit"
-
-string(6) "orange"
-string(1) "a"
-string(5) "fruit"
-
-string(6) "banana"
-string(1) "b"
-string(5) "fruit"
-
-string(5) "apple"
-string(1) "c"
-string(5) "fruit"
-
-bool(true)
--- Using array_walk with default parameters to show modified array contents --
-string(5) "lemon"
-string(1) "d"
-
-string(6) "orange"
-string(1) "a"
-
-string(6) "banana"
-string(1) "b"
-
-string(5) "apple"
-string(1) "c"
-
-bool(true)
-Done
---UEXPECTF--
-*** Testing array_walk() : basic functionality ***
--- Using array_walk with default parameters to show array contents --
 unicode(5) "lemon"
 unicode(1) "d"
 

diff --git a/ext/standard/tests/array/array_walk_error1.phpt b/ext/standard/tests/array/array_walk_error1.phpt
index 4b17023a95be00c57f63cfcba8ed6affabeefdad..334dfe4ef7502dfebdd424723485ba7ae4a05aca 100644 (file)
--- a/ext/standard/tests/array/array_walk_error1.phpt
+++ b/ext/standard/tests/array/array_walk_error1.phpt
@@ -46,18 +46,3 @@ NULL
 Warning: array_walk() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk() : error conditions ***
--- Testing array_walk() function with zero arguments --
-
-Warning: array_walk() expects at least 2 parameters, 0 given in %s on line %d
-NULL
--- Testing array_walk() function with one argument --
-
-Warning: array_walk() expects at least 2 parameters, 1 given in %s on line %d
-NULL
--- Testing array_walk() function with non existent callback function  --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_error2.phpt b/ext/standard/tests/array/array_walk_error2.phpt
index f9c3b23bae664d183dbe5a5a918c172b04e4df90..654637ab5a273ee9e150c6c6d15666459432bdad 100644 (file)
--- a/ext/standard/tests/array/array_walk_error2.phpt
+++ b/ext/standard/tests/array/array_walk_error2.phpt
@@ -57,26 +57,3 @@ bool(true)
 Warning: array_walk() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk() : error conditions - callback parameters ***
-
-Warning: Missing argument 3 for callback1() in %s on line %d
-
-callback1() invoked 
-bool(true)
-
-Warning: Missing argument 4 for callback2() in %s on line %d
-
-callback2() invoked 
-bool(true)
-
-callback1() invoked 
-bool(true)
-
-callback2() invoked 
-bool(true)
--- Testing array_walk() function with too many callback parameters --
-
-Warning: array_walk() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_object1.phpt b/ext/standard/tests/array/array_walk_object1.phpt
index 74cf581daff78c17652ce1884a004df0d53f4304..6a40a427288721e31a1f7503d5a2cba2a3f07e0e 100644 (file)
Binary files a/ext/standard/tests/array/array_walk_object1.phpt and b/ext/standard/tests/array/array_walk_object1.phpt differ

diff --git a/ext/standard/tests/array/array_walk_object2.phpt b/ext/standard/tests/array/array_walk_object2.phpt
index eab91a256db45ea07af26a22c2ac341cee44cb52..97606a659232aceeedbe6d95ec204f2ffd890e87 100644 (file)
--- a/ext/standard/tests/array/array_walk_object2.phpt
+++ b/ext/standard/tests/array/array_walk_object2.phpt
@@ -77,32 +77,7 @@ var_dump( array_walk($input, "callback_protected"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : array of objects ***
--- For private member --
-value : int(3)
-key : int(0)
-value : int(10)
-key : int(1)
-value : int(20)
-key : int(2)
-value : int(-10)
-key : int(3)
-bool(true)
--- For public member --
-value : int(3)
-value : int(10)
-value : int(20)
-value : int(-10)
-bool(true)
--- For protected member --
-value : int(3)
-value : int(10)
-value : int(20)
-value : int(-10)
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : array of objects ***
 -- For private member --
 value : int(3)

diff --git a/ext/standard/tests/array/array_walk_objects.phpt b/ext/standard/tests/array/array_walk_objects.phpt
index 40d50b19cc3cd81abc463c6c491266198a29f249..53b5cdc13385d5d591a40685d94a35d636aab91e 100644 (file)
Binary files a/ext/standard/tests/array/array_walk_objects.phpt and b/ext/standard/tests/array/array_walk_objects.phpt differ

diff --git a/ext/standard/tests/array/array_walk_rec_objects.phpt b/ext/standard/tests/array/array_walk_rec_objects.phpt
index 380d83ee03d12f54bb9b2e22d6c7bb6cb594e614..ff3ab6e39847c705da811b2d3fe67de4ece2251e 100644 (file)
Binary files a/ext/standard/tests/array/array_walk_rec_objects.phpt and b/ext/standard/tests/array/array_walk_rec_objects.phpt differ

diff --git a/ext/standard/tests/array/array_walk_recursive.phpt b/ext/standard/tests/array/array_walk_recursive.phpt
index c3b37c321c2139b35af93daded651734e9503e1b..c8523055e9a8f515225a6a6a175e3547b22d7ff2 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive.phpt
+++ b/ext/standard/tests/array/array_walk_recursive.phpt
@@ -15,7 +15,7 @@ var_dump (array_walk_recursive ($arr, 'foo'));
 var_dump (array_walk_recursive ($arr, 'bar'));
 
 ?>
---EXPECTF--
+--EXPECT--
 1 foo
 2 foo
 3 foo

diff --git a/ext/standard/tests/array/array_walk_recursive1.phpt b/ext/standard/tests/array/array_walk_recursive1.phpt
index ef7c8fdd6d76777a9f6a5aea38ca057b774bc557..096e50e1580d42ec93435777174be370c8fc2032 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive1.phpt
@@ -30,31 +30,7 @@ try {
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-int(1)
-int(0)
-string(4) "data"
-int(2)
-int(1)
-string(4) "data"
-int(2)
-int(0)
-string(4) "data"
-int(3)
-int(1)
-string(4) "data"
-bool(true)
-string(4) "data"
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/array_walk_recursive_basic1.phpt b/ext/standard/tests/array/array_walk_recursive_basic1.phpt
index d09b0202f0fecb45bb03c2104f1a5a4cecf7b869..1dbf52132b441aa4c63f61230c4c898fe4f71010 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_basic1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic1.phpt
@@ -46,41 +46,6 @@ echo "Done";
 --EXPECT--
 *** Testing array_walk_recursive() : basic functionality ***
 -- Using array_walk_recursive() with default parameters to show array contents --
-string(5) "lemon"
-int(0)
-
-string(6) "orange"
-int(0)
-
-string(6) "banana"
-int(1)
-
-string(5) "apple"
-int(0)
-
-bool(true)
--- Using array_walk_recursive() with all parameters --
-string(5) "lemon"
-int(0)
-string(5) "Added"
-
-string(6) "orange"
-int(0)
-string(5) "Added"
-
-string(6) "banana"
-int(1)
-string(5) "Added"
-
-string(5) "apple"
-int(0)
-string(5) "Added"
-
-bool(true)
-Done
---UEXPECTF--
-*** Testing array_walk_recursive() : basic functionality ***
--- Using array_walk_recursive() with default parameters to show array contents --
 unicode(5) "lemon"
 int(0)
 

diff --git a/ext/standard/tests/array/array_walk_recursive_basic2.phpt b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
index f118dcf105c5cf3b007f48b1b939230b6f581eaa..e5d706c4d2218844f795daa1e79867c9fdebe4db 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_basic2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_basic2.phpt
@@ -57,55 +57,6 @@ echo "Done";
 --EXPECT--
 *** Testing array_walk_recursive() : basic functionality ***
 -- Using array_walk_recursive with default parameters to show array contents --
-string(5) "lemon"
-string(1) "a"
-
-string(6) "orange"
-string(1) "c"
-
-string(6) "banana"
-string(1) "d"
-
-string(5) "apple"
-string(1) "f"
-
-bool(true)
--- Using array_walk_recursive with one optional parameter to modify contents --
-string(5) "lemon"
-string(1) "a"
-string(5) "fruit"
-
-string(6) "orange"
-string(1) "c"
-string(5) "fruit"
-
-string(6) "banana"
-string(1) "d"
-string(5) "fruit"
-
-string(5) "apple"
-string(1) "f"
-string(5) "fruit"
-
-bool(true)
--- Using array_walk_recursive with default parameters to show modified array contents --
-string(5) "lemon"
-string(1) "a"
-
-string(6) "orange"
-string(1) "c"
-
-string(6) "banana"
-string(1) "d"
-
-string(5) "apple"
-string(1) "f"
-
-bool(true)
-Done
---UEXPECTF--
-*** Testing array_walk_recursive() : basic functionality ***
--- Using array_walk_recursive with default parameters to show array contents --
 unicode(5) "lemon"
 unicode(1) "a"
 

diff --git a/ext/standard/tests/array/array_walk_recursive_error1.phpt b/ext/standard/tests/array/array_walk_recursive_error1.phpt
index 15ace972132d7f7f6dc12335b24a3613b1df128b..52b507361bc0289ecb08cb6a59bb4d3ccdc22b1a 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_error1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error1.phpt
@@ -46,18 +46,3 @@ NULL
 Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : error conditions ***
--- Testing array_walk_recursive() function with zero arguments --
-
-Warning: array_walk_recursive() expects at least 2 parameters, 0 given in %s on line %d
-NULL
--- Testing array_walk_recursive() function with one argument --
-
-Warning: array_walk_recursive() expects at least 2 parameters, 1 given in %s on line %d
-NULL
--- Testing array_walk_recursive() function with non existent callback function  --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_error2.phpt b/ext/standard/tests/array/array_walk_recursive_error2.phpt
index 89ed061ee544ea9e1b24e8f81118ddd938706abb..d628e9327afa46381b3ffce0dfba90ba9d539062 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_error2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_error2.phpt
@@ -57,26 +57,3 @@ bool(true)
 Warning: array_walk_recursive() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : error conditions - callback parameters ***
-
-Warning: Missing argument 3 for callback1() in %s on line %d
-
-callback1() invoked 
-bool(true)
-
-Warning: Missing argument 4 for callback2() in %s on line %d
-
-callback2() invoked 
-bool(true)
-
-callback1() invoked 
-bool(true)
-
-callback2() invoked 
-bool(true)
--- Testing array_walk_recursive() function with too many callback parameters --
-
-Warning: array_walk_recursive() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_object1.phpt b/ext/standard/tests/array/array_walk_recursive_object1.phpt
index da0d593049eacc6a58c9182c4f5666f1ac1b99d8..7c31601e809d54c8c01d4083a8cc0da26ce469c6 100644 (file)
Binary files a/ext/standard/tests/array/array_walk_recursive_object1.phpt and b/ext/standard/tests/array/array_walk_recursive_object1.phpt differ

diff --git a/ext/standard/tests/array/array_walk_recursive_object2.phpt b/ext/standard/tests/array/array_walk_recursive_object2.phpt
index 1a291fca5261802475a12751209b3c2d82f88dc2..87d8e49d950c10e5258a3cfac66e0e3b24292eeb 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_object2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_object2.phpt
@@ -79,32 +79,7 @@ var_dump( array_walk_recursive($input, "callback_protected"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : array of objects ***
--- For private member --
-value : int(3)
-key : int(0)
-value : int(10)
-key : int(1)
-value : int(20)
-key : int(1)
-value : int(-10)
-key : int(0)
-bool(true)
--- For public member --
-value : int(3)
-value : int(10)
-value : int(20)
-value : int(-10)
-bool(true)
--- For protected member --
-value : int(3)
-value : int(10)
-value : int(20)
-value : int(-10)
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : array of objects ***
 -- For private member --
 value : int(3)

diff --git a/ext/standard/tests/array/array_walk_recursive_variation1.phpt b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
index f728825adc0ac3ac6f5eb8c4749e4d7a425e98d0..ab7687a68cbf2381c2aa67a42cee02f3f58ee2b5 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation1.phpt
@@ -248,160 +248,3 @@ bool(false)
 Warning: array_walk_recursive(): The argument should be an array in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : unexpected values for 'input' argument ***
--- Iteration 1 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk_recursive(): The argument should be an array in %s on line %d
-bool(false)
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation2.phpt b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
index 6981365d26aef6fde3aa313ca9b8e81bb9797bbb..57267ec34cfbae75ed7d8b38dac5732de8c73bf4 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation2.phpt
@@ -269,181 +269,3 @@ NULL
 Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : unexpected values for 'funcname' argument ***
--- Iteration 1 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 16 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 24 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 25 --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation3.phpt b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
index 36cffee3b64b801c519e13410ec667bddfcd07ee..fb4b79a1951818dd9e83aa7ee2ea6ca1a59ae994 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation3.phpt
@@ -61,67 +61,7 @@ for($count = 0; $count < count($input_values); $count++) {
 }  
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : 'input' array with different values***
-
--- Iteration 1 --
-1 : 0 1
-1 : 1 0
-1 : 2 -10
-1 : 0 19
-1 : 1 -33
-1 : 0 90
-1 : 1 31
-1 : 2 -110
-bool(true)
-
--- Iteration 2 --
-2 : 0 3.4
-2 : 1 0.8
-2 : 2 -2.9
-2 : 0 625
-2 : 1 0.0082
-bool(true)
-
--- Iteration 3 --
-3 : 0 Mango
-3 : 0 Apple
-3 : 1 Orange
-3 : 2 Lemon
-bool(true)
-
--- Iteration 4 --
-4 : 0 1
-4 : 1 
-4 : 0 1
-4 : 1 
-bool(true)
-
--- Iteration 5 --
-5 : 0 
-5 : 0 
-bool(true)
-
--- Iteration 6 --
-bool(true)
-
--- Iteration 7 --
-7 : 0 binary
-bool(true)
-
--- Iteration 8 --
-8 : 0 16
-8 : 1 8.345
-8 : 0 Fruits
-8 : 0 1
-8 : 1 
-8 : 0 
-8 : 0 -98
-8 : 1 0.005
-8 : 2 banana
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : 'input' array with different values***
 
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/array_walk_recursive_variation4.phpt b/ext/standard/tests/array/array_walk_recursive_variation4.phpt
index 1cf95369c5177a12bfee0e714eff98213e2a7483..2c58abce90c5706df61a01b47ee116e2a37240bb 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation4.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation4.phpt
@@ -40,41 +40,7 @@ var_dump( array_walk_recursive( $input, "callback"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : array with subarray ***
-int(0)
-int(1)
-
-int(0)
-int(1)
-
-int(1)
-int(2)
-
-int(2)
-int(3)
-
-int(0)
-string(5) "Mango"
-
-int(1)
-string(6) "Orange"
-
-int(0)
-int(1)
-
-int(1)
-int(2)
-
-int(2)
-int(3)
-
-int(0)
-int(1)
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : array with subarray ***
 int(0)
 int(1)

diff --git a/ext/standard/tests/array/array_walk_recursive_variation5.phpt b/ext/standard/tests/array/array_walk_recursive_variation5.phpt
index 31d422cb9eb5dd5a3c67536b0ba045307c253943..4db59895828ed93352b6a31232bcb1c44da550e0 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation5.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation5.phpt
@@ -40,29 +40,7 @@ var_dump( array_walk_recursive($input, "callback"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : array with references ***
-int(0)
-int(10)
-
-int(0)
-int(-20)
-
-int(1)
-int(-35)
-
-int(0)
-int(10)
-
-int(1)
-int(0)
-
-int(0)
-int(50)
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : array with references ***
 int(0)
 int(10)

diff --git a/ext/standard/tests/array/array_walk_recursive_variation6.phpt b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
index db78b4d70349210a8a6bbd12389a98936ac1131e..896ae7e9293e45b71b551afc12e5c8472a36b130 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation6.phpt
@@ -81,71 +81,7 @@ var_dump( array_walk_recursive($input, "for_mixed"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : 'input' as an associative array ***
--- Associative array with numeric keys --
-int(1)
-int(25)
-int(10)
-
-int(5)
-int(12)
-int(10)
-
-int(0)
-int(-80)
-int(10)
-
-int(-2)
-int(100)
-int(10)
-
-int(5)
-int(30)
-int(10)
-
-bool(true)
--- Associative array with string keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(7) "Bananna"
-
-string(1) "c"
-string(6) "carrot"
-
-string(1) "o"
-string(6) "Orange"
-
-bool(true)
--- Associative array with binary keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
-bool(true)
--- Associative array with numeric/string keys --
-int(0)
-int(1)
-
-int(1)
-int(2)
-
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
-int(2)
-int(3)
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : 'input' as an associative array ***
 -- Associative array with numeric keys --
 int(1)

diff --git a/ext/standard/tests/array/array_walk_recursive_variation7.phpt b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
index 599f5089505af037ef9b6b2c1fec7200ffd94f94..0cdd6d248d5cbd2ac9fedfa0d8781706e2046fc4 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation7.phpt
@@ -91,58 +91,3 @@ NULL
 1
 bool(true)
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : anonymous function as callback ***
--- Anonymous function with one argument --
-int(2)
-
-int(5)
-
-int(10)
-
-int(0)
-
-bool(true)
--- Anonymous function with two arguments --
-int(0)
-int(2)
-
-int(1)
-int(5)
-
-int(0)
-int(10)
-
-int(1)
-int(0)
-
-bool(true)
--- Anonymous function with three arguments --
-int(0)
-int(2)
-int(10)
-
-int(1)
-int(5)
-int(10)
-
-int(0)
-int(10)
-int(10)
-
-int(1)
-int(0)
-int(10)
-
-bool(true)
--- Anonymous function with one more argument --
-
-Warning: array_walk_recursive() expects at most 3 parameters, 4 given in %s on line %d
-NULL
--- Anonymous function with null argument --
-1
-1
-1
-1
-bool(true)
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation8.phpt b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
index 2fab1ef7f52ae0f8f4ad67d9bcdeb41b3c3823c6..671fcdb375b5a256f80958e034de68eb694bea39 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation8.phpt
@@ -40,14 +40,3 @@ bool(true)
 Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk_recursive() : built-in function as callback ***
--- With 'pow' built-in function --
-bool(true)
--- With 'min' built-in function --
-bool(true)
--- With 'echo' language construct --
-
-Warning: array_walk_recursive() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_recursive_variation9.phpt b/ext/standard/tests/array/array_walk_recursive_variation9.phpt
index 076f94aca3dc691354fa2c91a2738b0e1fc93d58..da7e2f14e08f71f15e33e95420292341aa0393dd 100644 (file)
--- a/ext/standard/tests/array/array_walk_recursive_variation9.phpt
+++ b/ext/standard/tests/array/array_walk_recursive_variation9.phpt
@@ -50,54 +50,7 @@ var_dump( array_walk_recursive($input, 'callback_two_parameter', 10));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk_recursive() : callback function variation ***
--- callback function with both parameters --
-int(0)
-string(5) "Apple"
-
-int(1)
-string(6) "Banana"
-
-int(1)
-string(5) "Mango"
-
-int(0)
-string(6) "Orange"
-
-bool(true)
--- callback function with only one parameter --
-string(5) "Apple"
-
-string(6) "Banana"
-
-string(5) "Mango"
-
-string(6) "Orange"
-
-bool(true)
--- callback function without parameters --
-callback3() called
-callback3() called
-callback3() called
-callback3() called
-bool(true)
--- passing one more parameter to function with two parameters --
-int(0)
-string(5) "Apple"
-
-int(1)
-string(6) "Banana"
-
-int(1)
-string(5) "Mango"
-
-int(0)
-string(6) "Orange"
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk_recursive() : callback function variation ***
 -- callback function with both parameters --
 int(0)

diff --git a/ext/standard/tests/array/array_walk_variation1.phpt b/ext/standard/tests/array/array_walk_variation1.phpt
index 3e05d401de581c8c01346b350f20f02e72c03d25..e322437a7619adf31bc3dd22070a453a7e1c4156 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation1.phpt
+++ b/ext/standard/tests/array/array_walk_variation1.phpt
@@ -248,160 +248,3 @@ bool(false)
 Warning: array_walk(): The argument should be an array in %s on line %d
 bool(false)
 Done
---UEXPECTF--
-*** Testing array_walk() : unexpected values for 'input' argument ***
--- Iteration 1 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_walk(): The argument should be an array in %s on line %d
-bool(false)
-Done

diff --git a/ext/standard/tests/array/array_walk_variation2.phpt b/ext/standard/tests/array/array_walk_variation2.phpt
index a3c70653f6e4750dc10f9acb5547eb30d8e0c0f0..4e1ddc3160bb71e3d067df233da0752c4337a420 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation2.phpt
+++ b/ext/standard/tests/array/array_walk_variation2.phpt
@@ -269,181 +269,3 @@ NULL
 Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk() : unexpected values for 'funcname' argument ***
--- Iteration 1 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 16 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 24 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 25 --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-
-Warning: array_walk() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_variation3.phpt b/ext/standard/tests/array/array_walk_variation3.phpt
index 144def5c2e0498f7ba10c66979a05973deefadbf..7fe874bbd8cc69a1df6c129032c1953ce02f2b76 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation3.phpt
+++ b/ext/standard/tests/array/array_walk_variation3.phpt
@@ -61,67 +61,7 @@ for($count = 0; $count < count($input_values); $count++) {
 }  
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : 'input' array with different values***
-
--- Iteration 1 --
-1 : 0 1
-1 : 1 0
-1 : 2 -10
-1 : 3 19
-1 : 4 -33
-1 : 5 90
-1 : 6 31
-1 : 7 -110
-bool(true)
-
--- Iteration 2 --
-2 : 0 3.4
-2 : 1 0.8
-2 : 2 -2.9
-2 : 3 625
-2 : 4 0.0082
-bool(true)
-
--- Iteration 3 --
-3 : 0 Mango
-3 : 1 Apple
-3 : 2 Orange
-3 : 3 Lemon
-bool(true)
-
--- Iteration 4 --
-4 : 0 1
-4 : 1 
-4 : 2 1
-4 : 3 
-bool(true)
-
--- Iteration 5 --
-5 : 0 
-5 : 1 
-bool(true)
-
--- Iteration 6 --
-bool(true)
-
--- Iteration 7 --
-7 : 0 binary
-bool(true)
-
--- Iteration 8 --
-8 : 0 16
-8 : 1 8.345
-8 : 2 Fruits
-8 : 3 1
-8 : 4 
-8 : 5 
-8 : 6 -98
-8 : 7 0.005
-8 : 8 banana
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : 'input' array with different values***
 
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/array_walk_variation4.phpt b/ext/standard/tests/array/array_walk_variation4.phpt
index 9bb711bbd085242bedf9622ef39b67fa8b9700c3..0a2d49a592dfbdea2015452cf1585ba548bbdec1 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation4.phpt
+++ b/ext/standard/tests/array/array_walk_variation4.phpt
@@ -40,52 +40,7 @@ var_dump( array_walk( $input, "callback"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : array with subarray ***
-int(0)
-array(0) {
-}
-
-int(1)
-array(1) {
-  [0]=>
-  int(1)
-}
-
-int(2)
-array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-
-int(3)
-array(2) {
-  [0]=>
-  string(5) "Mango"
-  [1]=>
-  string(6) "Orange"
-}
-
-int(4)
-array(1) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-}
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : array with subarray ***
 int(0)
 array(0) {

diff --git a/ext/standard/tests/array/array_walk_variation5.phpt b/ext/standard/tests/array/array_walk_variation5.phpt
index 6fe2e8c1236d5f8b7d26323404d3b2e5d65a22c7..c80cfba44f3f4867e2a829e3e9597eb77b201d2c 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation5.phpt
+++ b/ext/standard/tests/array/array_walk_variation5.phpt
@@ -40,29 +40,7 @@ var_dump( array_walk($input, "callback"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : array with references ***
-int(0)
-int(10)
-
-int(1)
-int(-20)
-
-int(2)
-int(-35)
-
-int(3)
-int(10)
-
-int(4)
-int(0)
-
-int(5)
-int(50)
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : array with references ***
 int(0)
 int(10)

diff --git a/ext/standard/tests/array/array_walk_variation6.phpt b/ext/standard/tests/array/array_walk_variation6.phpt
index ba87f6b1a6d89865d87b397681ca9c5dc1e92af8..8083c66ed9ad2d2351609c2453e1c80b0d41d528 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation6.phpt
+++ b/ext/standard/tests/array/array_walk_variation6.phpt
@@ -81,67 +81,7 @@ var_dump( array_walk($input, "for_mixed"));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : 'input' as an associative array ***
--- Associative array with numeric keys --
-int(1)
-int(25)
-int(10)
-
-int(5)
-int(30)
-int(10)
-
-int(0)
-int(-80)
-int(10)
-
-int(-2)
-int(100)
-int(10)
-
-bool(true)
--- Associative array with string keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(7) "Bananna"
-
-string(1) "c"
-string(6) "carrot"
-
-string(1) "o"
-string(6) "Orange"
-
-bool(true)
--- Associative array with binary keys --
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
-bool(true)
--- Associative array with numeric/string keys --
-int(0)
-int(1)
-
-int(1)
-int(2)
-
-string(1) "a"
-string(5) "Apple"
-
-string(1) "b"
-string(6) "Banana"
-
-int(2)
-int(3)
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : 'input' as an associative array ***
 -- Associative array with numeric keys --
 int(1)

diff --git a/ext/standard/tests/array/array_walk_variation7.phpt b/ext/standard/tests/array/array_walk_variation7.phpt
index 2bf25373e1cb2ca5b512cfced4cfb3a435bfb12c..da85958b8e7465f9a59d57afe090353543958477 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation7.phpt
+++ b/ext/standard/tests/array/array_walk_variation7.phpt
@@ -91,58 +91,3 @@ NULL
 1
 bool(true)
 Done
---UEXPECTF--
-*** Testing array_walk() : anonymous function as callback ***
--- Anonymous function with one argument --
-int(2)
-
-int(5)
-
-int(10)
-
-int(0)
-
-bool(true)
--- Anonymous function with two arguments --
-int(0)
-int(2)
-
-int(1)
-int(5)
-
-int(2)
-int(10)
-
-int(3)
-int(0)
-
-bool(true)
--- Anonymous function with three arguments --
-int(0)
-int(2)
-int(10)
-
-int(1)
-int(5)
-int(10)
-
-int(2)
-int(10)
-int(10)
-
-int(3)
-int(0)
-int(10)
-
-bool(true)
--- Anonymous function with one more argument --
-
-Warning: array_walk() expects at most 3 parameters, 4 given in %s on line %d
-NULL
--- Anonymous function with null argument --
-1
-1
-1
-1
-bool(true)
-Done

diff --git a/ext/standard/tests/array/array_walk_variation8.phpt b/ext/standard/tests/array/array_walk_variation8.phpt
index 43c6f866d539b5765c199ccf015eacdb59714e8c..56a60e6b0f40f628e324b0e429b1574fb9786806 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation8.phpt
+++ b/ext/standard/tests/array/array_walk_variation8.phpt
@@ -40,14 +40,3 @@ bool(true)
 Warning: array_walk() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing array_walk() : built-in function as callback ***
--- With 'pow' built-in function --
-bool(true)
--- With 'min' built-in function --
-bool(true)
--- With 'echo' language construct --
-
-Warning: array_walk() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/array_walk_variation9.phpt b/ext/standard/tests/array/array_walk_variation9.phpt
index 4df1e9bf7f28dc95830739243814e47fc5abe6e0..b8526e8fa87dc516b7e41a351a32fa74e2468600 100644 (file)
--- a/ext/standard/tests/array/array_walk_variation9.phpt
+++ b/ext/standard/tests/array/array_walk_variation9.phpt
@@ -50,54 +50,7 @@ var_dump( array_walk($input, 'callback_two_parameter', 10));
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing array_walk() : callback function variation ***
--- callback function with both parameters --
-int(0)
-string(5) "Apple"
-
-int(1)
-string(6) "Banana"
-
-int(2)
-string(5) "Mango"
-
-int(3)
-string(6) "Orange"
-
-bool(true)
--- callback function with only one parameter --
-string(5) "Apple"
-
-string(6) "Banana"
-
-string(5) "Mango"
-
-string(6) "Orange"
-
-bool(true)
--- callback function without parameters --
-callback3() called
-callback3() called
-callback3() called
-callback3() called
-bool(true)
--- passing one more parameter to function with two parameters --
-int(0)
-string(5) "Apple"
-
-int(1)
-string(6) "Banana"
-
-int(2)
-string(5) "Mango"
-
-int(3)
-string(6) "Orange"
-
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing array_walk() : callback function variation ***
 -- callback function with both parameters --
 int(0)

diff --git a/ext/standard/tests/array/arsort_error.phpt b/ext/standard/tests/array/arsort_error.phpt
index a5db41cb1c07f4bf6300405372f78312dd4959a2..d8072333bdef443e89119a28558f6c383a459b25 100644 (file)
--- a/ext/standard/tests/array/arsort_error.phpt
+++ b/ext/standard/tests/array/arsort_error.phpt
@@ -77,46 +77,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing arsort() : error conditions ***
-
--- Testing arsort() function with Zero arguments --
-
-Warning: arsort() expects at least 1 parameter, 0 given in %sarsort_error.php on line %d
-bool(false)
-
--- Testing arsort() function with more than expected no. of arguments --
-
-Sort flag = SORT_REGULAR
-
-Warning: arsort() expects at most 2 parameters, 3 given in %sarsort_error.php on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_STRING
-
-Warning: arsort() expects at most 2 parameters, 3 given in %sarsort_error.php on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_NUMERIC
-
-Warning: arsort() expects at most 2 parameters, 3 given in %sarsort_error.php on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/arsort_variation1.phpt b/ext/standard/tests/array/arsort_variation1.phpt
index fab076085e6715dcb0df5b54a1d95e59b2d26603..cf5e071d703d0748ec33dd25c824846ad739e9c3 100644 (file)
--- a/ext/standard/tests/array/arsort_variation1.phpt
+++ b/ext/standard/tests/array/arsort_variation1.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - unexpected values for 'array_arg' ar
 
 /*
  * testing arsort() by providing different unexpected values for array argument with following flag values.
- * 1. flag value as defualt
+ * 1. flag value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
  * 4. SORT_STRING - compare items as strings
@@ -76,7 +76,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of arsort()
 // when $array arugment is supplied with different values from $unexpected_values
 echo "\n-- Testing arsort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
@@ -96,313 +96,7 @@ echo "Done";
 
 -- Testing arsort() by supplying different unexpected values for 'array' argument --
 
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
--- Iteration 1 --
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, double given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, null given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, boolean given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, object given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, string given in %sarsort_variation1.php on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
-bool(false)
-
-Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying different unexpected values for 'array' argument --
-
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
+-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
 Warning: arsort() expects parameter 1 to be array, integer given in %sarsort_variation1.php on line %d
@@ -702,4 +396,4 @@ bool(false)
 
 Warning: arsort() expects parameter 1 to be array, resource given in %sarsort_variation1.php on line %d
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/arsort_variation10.phpt b/ext/standard/tests/array/arsort_variation10.phpt
index 782dea8ce005c5199361382af40d379837737366..5869847ce36c56419f7e9a1ba9ade82612545d9a 100644 (file)
--- a/ext/standard/tests/array/arsort_variation10.phpt
+++ b/ext/standard/tests/array/arsort_variation10.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort octal values
 
 /*
  * testing arsort() by providing different octal array for $array argument with following flag values
- * 1.flag value as defualt
+ * 1.flag value as default
  * 2.SORT_REGULAR - compare items normally
  * 3.SORT_NUMERIC - compare items numerically
 */
@@ -23,7 +23,7 @@ $unsorted_oct_array = array (
    077 => 077, -066 => -066, -0345 => -0345, 0 => 0
 );
 
-echo "\n-- Testing arsort() by supplying octal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing arsort() by supplying octal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_oct_array;
 var_dump( arsort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -40,10 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
--- Testing arsort() by supplying octal value array, 'flag' value is defualt  --
+-- Testing arsort() by supplying octal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [669]=>
@@ -112,75 +112,3 @@ array(9) {
   int(-229)
 }
 Done
---UEXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying octal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [669]=>
-  int(669)
-  [506]=>
-  int(506)
-  [229]=>
-  int(229)
-  [209]=>
-  int(209)
-  [63]=>
-  int(63)
-  [54]=>
-  int(54)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-54)
-  [-229]=>
-  int(-229)
-}
-
--- Testing arsort() by supplying octal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [669]=>
-  int(669)
-  [506]=>
-  int(506)
-  [229]=>
-  int(229)
-  [209]=>
-  int(209)
-  [63]=>
-  int(63)
-  [54]=>
-  int(54)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-54)
-  [-229]=>
-  int(-229)
-}
-
--- Testing arsort() by supplying octal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [669]=>
-  int(669)
-  [506]=>
-  int(506)
-  [229]=>
-  int(229)
-  [209]=>
-  int(209)
-  [63]=>
-  int(63)
-  [54]=>
-  int(54)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-54)
-  [-229]=>
-  int(-229)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/arsort_variation11.phpt b/ext/standard/tests/array/arsort_variation11.phpt
index cead6c03b6a7d7a8c5119573de8108103b45078c..20666ebdb349fd3456f2becaa0a9aa899fa8d7cf 100644 (file)
Binary files a/ext/standard/tests/array/arsort_variation11.phpt and b/ext/standard/tests/array/arsort_variation11.phpt differ

diff --git a/ext/standard/tests/array/arsort_variation2.phpt b/ext/standard/tests/array/arsort_variation2.phpt
index 370ce32b96a88bc56118a07c583674b51c3886ae..6001622bab9f900f679681e5f8cc8bdad736c6d1 100644 (file)
--- a/ext/standard/tests/array/arsort_variation2.phpt
+++ b/ext/standard/tests/array/arsort_variation2.phpt
@@ -211,227 +211,6 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 14 --
-
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 15 --
-
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 16 --
-
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 17 --
-
-Warning: arsort() expects parameter 2 to be long, object given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 18 --
-
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 19 --
-
-Warning: arsort() expects parameter 2 to be long, string given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 20 --
-
-Warning: arsort() expects parameter 2 to be long, resource given in %sarsort_variation2.php on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
-Done
---UEXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying different unexpected values for 'sort_flags' argument --
--- Iteration 1 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 2 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 3 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 4 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 5 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 6 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 7 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 8 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 9 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 10 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 11 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 12 --
-bool(true)
-array(3) {
-  [3]=>
-  int(45)
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 13 --
-
 Warning: arsort() expects parameter 2 to be long, Unicode string given in %sarsort_variation2.php on line %d
 bool(false)
 array(3) {
@@ -526,4 +305,4 @@ array(3) {
   [3]=>
   int(45)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/arsort_variation3.phpt b/ext/standard/tests/array/arsort_variation3.phpt
index 609155ca73baf41a669fd3ba65f5c6f5f8739606..dab0ee51594e291e6765bf6d3d2a39cdae8268fe 100644 (file)
--- a/ext/standard/tests/array/arsort_variation3.phpt
+++ b/ext/standard/tests/array/arsort_variation3.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort integer/float values
 
 /*
  * Testing arsort() by providing different integer/float value arrays for $array argument with following values
- * 1. flag value as defualt
+ * 1. flag value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
 */
@@ -323,4 +323,4 @@ array(7) {
   [7]=>
   %s(-2147483649)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/arsort_variation4.phpt b/ext/standard/tests/array/arsort_variation4.phpt
index 97fcbc9428507ebfecebed66091db7ae0468a8f0..7e56f8017272490556920b0134a6a0eea929d086 100644 (file)
--- a/ext/standard/tests/array/arsort_variation4.phpt
+++ b/ext/standard/tests/array/arsort_variation4.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort reference variables
 
 /*
  * Testing arsort() by providing reference variable array with following flag values
- *  flag value as defualt
+ *  flag value as default
  *  SORT_REGULAR - compare items normally
  *  SORT_NUMERIC - compare items numerically
 */
@@ -24,7 +24,7 @@ $value3 = 555;
 // an array containing integer references 
 $unsorted_numerics =  array( 1 => &$value1 , 2 => &$value2, 3 => &$value3);
 
-echo "\n-- Testing arsort() by supplying reference variable array, 'flag' value is defualt --\n";
+echo "\n-- Testing arsort() by supplying reference variable array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( arsort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
@@ -41,10 +41,10 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing arsort() :usage variations  ***
 
--- Testing arsort() by supplying reference variable array, 'flag' value is defualt --
+-- Testing arsort() by supplying reference variable array, 'flag' value is default --
 bool(true)
 array(3) {
   [3]=>
@@ -77,39 +77,3 @@ array(3) {
   &int(33)
 }
 Done
---UEXPECTF--
-*** Testing arsort() :usage variations  ***
-
--- Testing arsort() by supplying reference variable array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  [3]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-
--- Testing arsort() by supplying reference variable array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [3]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-
--- Testing arsort() by supplying reference variable array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(3) {
-  [3]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/arsort_variation5.phpt b/ext/standard/tests/array/arsort_variation5.phpt
index 600738dc2d630b0332e1611847e9ce272e8584a9..75ae044f48a494a14587f1ab07c6ea340ae31232 100644 (file)
--- a/ext/standard/tests/array/arsort_variation5.phpt
+++ b/ext/standard/tests/array/arsort_variation5.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort strings
 
 /*
  * testing arsort() by providing different string arrays for $array argument with following flag values
- *  flag value as defualt
+ *  flag value as default
  *  SORT_REGULAR - compare items normally
  *  SORT_STRING  - compare items as strings
 */
@@ -57,196 +57,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying various string arrays --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(12) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-}
-- Sort_flag = SORT_STRING -
-bool(true)
-array(12) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(12) {
-  ["x"]=>
-  string(1) "x"
-  ["w"]=>
-  string(2) "ww"
-  ["t"]=>
-  string(3) "ttt"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["l"]=>
-  string(5) "lemoN"
-  ["b"]=>
-  string(6) "banana"
-  ["a"]=>
-  string(5) "apple"
-  ["X"]=>
-  string(1) "X"
-  ["Te"]=>
-  string(4) "Test"
-  ["T"]=>
-  string(4) "TTTT"
-  ["O"]=>
-  string(6) "Orange"
-  ["B"]=>
-  string(6) "BANANA"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  ["x"]=>
-  string(1) "x"
-  ["w"]=>
-  string(2) "ww"
-  ["t"]=>
-  string(3) "ttt"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["l"]=>
-  string(5) "lemoN"
-  ["b"]=>
-  string(6) "banana"
-  ["a"]=>
-  string(5) "apple"
-  ["X"]=>
-  string(1) "X"
-  ["Te"]=>
-  string(4) "Test"
-  ["T"]=>
-  string(4) "TTTT"
-  ["O"]=>
-  string(6) "Orange"
-  ["B"]=>
-  string(6) "BANANA"
-}
-- Sort_flag = SORT_STRING -
-bool(true)
-array(12) {
-  ["x"]=>
-  string(1) "x"
-  ["w"]=>
-  string(2) "ww"
-  ["t"]=>
-  string(3) "ttt"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["l"]=>
-  string(5) "lemoN"
-  ["b"]=>
-  string(6) "banana"
-  ["a"]=>
-  string(5) "apple"
-  ["X"]=>
-  string(1) "X"
-  ["Te"]=>
-  string(4) "Test"
-  ["T"]=>
-  string(4) "TTTT"
-  ["O"]=>
-  string(6) "Orange"
-  ["B"]=>
-  string(6) "BANANA"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
 -- Testing arsort() by supplying various string arrays --
@@ -434,4 +245,4 @@ array(12) {
   [u"B"]=>
   unicode(6) "BANANA"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/arsort_variation6.phpt b/ext/standard/tests/array/arsort_variation6.phpt
index 85137036b5b410762d951d01e5f4a819940c5d8c..5283e493bdd24bcbcebbdcafc5e3fafb254dd63e 100644 (file)
--- a/ext/standard/tests/array/arsort_variation6.phpt
+++ b/ext/standard/tests/array/arsort_variation6.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort hexadecimal values
 
 /*
  * testing arsort() by providing different hexa-decimal array for $array argument with following flag values
- * flag value as defualt
+ * flag value as default
  * SORT_REGULAR - compare items normally
  * SORT_NUMERIC - compare items numerically
 */
@@ -23,7 +23,7 @@ $unsorted_hex_array = array ( 0x1AB => 0x1AB, 0xFFF => 0xFFF, 0xF => 0xF, 0xFF =
                               0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
                             );
 
-echo "\n-- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing arsort() by supplying hexadecimal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_hex_array;
 var_dump(arsort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -40,10 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
--- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt  --
+-- Testing arsort() by supplying hexadecimal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [4095]=>
@@ -112,75 +112,3 @@ array(9) {
   int(-682)
 }
 Done
---UEXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying hexadecimal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-
--- Testing arsort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-
--- Testing arsort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/arsort_variation7.phpt b/ext/standard/tests/array/arsort_variation7.phpt
index d127022e446859d1181808613a31666f9048f9ed..839646450f64c39d33c11409761ab37f1a21247a 100644 (file)
--- a/ext/standard/tests/array/arsort_variation7.phpt
+++ b/ext/standard/tests/array/arsort_variation7.phpt
@@ -10,7 +10,7 @@ Test arsort() function : usage variations - sort bool values
 
 /*
  * testing arsort() by providing bool value array for $array argument with following flag values.
- * flag value as defualt
+ * flag value as default
  * SORT_REGULAR - compare items normally
 */
 
@@ -19,7 +19,7 @@ echo "*** Testing arsort() : usage variations ***\n";
 // bool value array
 $bool_values = array (1 => true, 2 => false, 3 => TRUE, 4 => FALSE);
 
-echo "\n-- Testing arsort() by supplying bool value array, 'flag' value is defualt --\n";
+echo "\n-- Testing arsort() by supplying bool value array, 'flag' value is default --\n";
 $temp_array = $bool_values;
 var_dump(arsort($temp_array) );
 var_dump($temp_array);
@@ -41,10 +41,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
--- Testing arsort() by supplying bool value array, 'flag' value is defualt --
+-- Testing arsort() by supplying bool value array, 'flag' value is default --
 bool(true)
 array(4) {
   [3]=>
@@ -96,58 +96,3 @@ array(4) {
   bool(false)
 }
 Done
---UEXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying bool value array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [3]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-}
-
--- Testing arsort() by supplying bool value array, 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [3]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-}
-
--- Testing arsort() by supplying bool value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(4) {
-  [3]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-}
-
--- Testing arsort() by supplying bool value array, 'flag' value is SORT_STRING --
-bool(true)
-array(4) {
-  [3]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/arsort_variation8.phpt b/ext/standard/tests/array/arsort_variation8.phpt
index b2d04b71be99d3fc5d8686cb3046d88f0239b1f4..f065146bef070e778ea830f288f5abd17bc0f39e 100644 (file)
--- a/ext/standard/tests/array/arsort_variation8.phpt
+++ b/ext/standard/tests/array/arsort_variation8.phpt
@@ -57,128 +57,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying various arrays containing sub arrays --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(0) {
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(1) {
-  ["sub_array[1][0]"]=>
-  array(0) {
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(1) {
-  ["sub_array[1][0]"]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  ["sub_array[2][0] "]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  ["data[2,0]"]=>
-  int(44)
-  ["data[2,1]"]=>
-  int(11)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["sub_array[2][0] "]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  ["data[2,0]"]=>
-  int(44)
-  ["data[2,1]"]=>
-  int(11)
-}
-
--- Iteration 4 --
-- With default sort_flag -
-bool(true)
-array(4) {
-  ["sub_array[3][0]"]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  ["sub_array[3][2]"]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  ["sub_array[3][1]"]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  ["sub_array[3][3]"]=>
-  array(0) {
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["sub_array[3][0]"]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  ["sub_array[3][2]"]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  ["sub_array[3][1]"]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  ["sub_array[3][3]"]=>
-  array(0) {
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
 -- Testing arsort() by supplying various arrays containing sub arrays --
@@ -298,4 +177,4 @@ array(4) {
   array(0) {
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/arsort_variation9.phpt b/ext/standard/tests/array/arsort_variation9.phpt
index f25e38b187087438d460d5b6efd5a4aba7033ead..1a003e28fb2a5c6bcf05f523e3523834908f6da8 100644 (file)
--- a/ext/standard/tests/array/arsort_variation9.phpt
+++ b/ext/standard/tests/array/arsort_variation9.phpt
@@ -49,214 +49,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing arsort() : usage variations ***
-
--- Testing arsort() by supplying various arrays with key values --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(5) {
-  [6]=>
-  int(66)
-  [5]=>
-  int(55)
-  [8]=>
-  int(33)
-  [7]=>
-  int(22)
-  [9]=>
-  int(11)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(5) {
-  [6]=>
-  int(66)
-  [5]=>
-  int(55)
-  [8]=>
-  int(33)
-  [7]=>
-  int(22)
-  [9]=>
-  int(11)
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  ["a"]=>
-  string(6) "orange"
-  [0]=>
-  string(6) "banana"
-  ["c"]=>
-  string(5) "apple"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["a"]=>
-  string(6) "orange"
-  [0]=>
-  string(6) "banana"
-  ["c"]=>
-  string(5) "apple"
-}
-
--- Iteration 3 --
-- With default sort_flag -
-bool(true)
-array(6) {
-  [5]=>
-  int(6)
-  [4]=>
-  int(5)
-  [3]=>
-  int(4)
-  [2]=>
-  int(3)
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [5]=>
-  int(6)
-  [4]=>
-  int(5)
-  [3]=>
-  int(4)
-  [2]=>
-  int(3)
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-
--- Iteration 4 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  [6]=>
-  string(5) "third"
-  [5]=>
-  string(6) "second"
-  [0]=>
-  string(5) "first"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [6]=>
-  string(5) "third"
-  [5]=>
-  string(6) "second"
-  [0]=>
-  string(5) "first"
-}
-
--- Iteration 5 --
-- With default sort_flag -
-bool(true)
-array(6) {
-  [9]=>
-  int(19)
-  [3]=>
-  int(13)
-  [4]=>
-  int(1)
-  [8]=>
-  int(1)
-  [1]=>
-  int(1)
-  [0]=>
-  int(1)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [9]=>
-  int(19)
-  [3]=>
-  int(13)
-  [4]=>
-  int(1)
-  [8]=>
-  int(1)
-  [1]=>
-  int(1)
-  [0]=>
-  int(1)
-}
-
--- Iteration 6 --
-- With default sort_flag -
-bool(true)
-array(2) {
-  ["foo"]=>
-  int(1)
-  ["bar"]=>
-  string(3) "baz"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(2) {
-  ["foo"]=>
-  int(1)
-  ["bar"]=>
-  string(3) "baz"
-}
-
--- Iteration 7 --
-- With default sort_flag -
-bool(true)
-array(4) {
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["d"]=>
-  int(5)
-  ["a"]=>
-  int(1)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["d"]=>
-  int(5)
-  ["a"]=>
-  int(1)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing arsort() : usage variations ***
 
 -- Testing arsort() by supplying various arrays with key values --
@@ -462,4 +255,4 @@ array(4) {
   [u"a"]=>
   int(1)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/asort_basic.phpt b/ext/standard/tests/array/asort_basic.phpt
index 4bcbed38f4e087c5713d74671de2e3b5d9b7354e..957785ff9381464257ab812a361f95687b20eaf3 100644 (file)
--- a/ext/standard/tests/array/asort_basic.phpt
+++ b/ext/standard/tests/array/asort_basic.phpt
@@ -56,82 +56,7 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : basic functionality ***
-
--- Testing asort() by supplying string array, 'flag' value is default --
-bool(true)
-array(3) {
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemon"
-  ["o"]=>
-  string(6) "orange"
-}
-
--- Testing asort() by supplying numeric array, 'flag' value is default --
-bool(true)
-array(4) {
-  [4]=>
-  int(22)
-  [2]=>
-  int(33)
-  [1]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-
--- Testing asort() by supplying string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemon"
-  ["o"]=>
-  string(6) "orange"
-}
-
--- Testing asort() by supplying numeric array, 'flag' = SORT_REGULAR --
-bool(true)
-array(4) {
-  [4]=>
-  int(22)
-  [2]=>
-  int(33)
-  [1]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-
--- Testing asort() by supplying string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemon"
-  ["o"]=>
-  string(6) "orange"
-}
-
--- Testing asort() by supplying numeric array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(4) {
-  [4]=>
-  int(22)
-  [2]=>
-  int(33)
-  [1]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : basic functionality ***
 
 -- Testing asort() by supplying string array, 'flag' value is default --

diff --git a/ext/standard/tests/array/asort_error.phpt b/ext/standard/tests/array/asort_error.phpt
index 277411d9b270faa1988fed6c72bf2b2fbaccb4d1..ef2329585bfc067485838391a28e7b807feb2273 100644 (file)
--- a/ext/standard/tests/array/asort_error.phpt
+++ b/ext/standard/tests/array/asort_error.phpt
@@ -77,46 +77,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing asort() : error conditions ***
-
--- Testing asort() function with Zero arguments --
-
-Warning: asort() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing asort() function with more than expected no. of arguments --
-
-Sort flag = SORT_REGULAR
-
-Warning: asort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_STRING
-
-Warning: asort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_NUMERIC
-
-Warning: asort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done

diff --git a/ext/standard/tests/array/asort_object1.phpt b/ext/standard/tests/array/asort_object1.phpt
index 88d6b141a131dd2df24120828e9f61a3e3723543..14cea00f5f2b3cf6354fc65c5e61f473d8e92faf 100644 (file)
--- a/ext/standard/tests/array/asort_object1.phpt
+++ b/ext/standard/tests/array/asort_object1.phpt
@@ -10,7 +10,7 @@ Test asort() function : object functionality - sort objects
 
 /*
  * testing asort() by providing integer/string object arrays with following flag values 
- * 1. Defualt flag value
+ * 1. default flag value
  * 2. SORT_REGULAR - compare items normally
 */
 
@@ -85,165 +85,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing asort() : object functionality ***
 
--- Testing asort() by supplying various object arrays, 'flag' value is default --
-bool(true)
-array(6) {
-  [4]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [6]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [5]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [1]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [3]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [2]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  ["g"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  ["f"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["h"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["e"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["a"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["d"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["b"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["c"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-
--- Testing asort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(6) {
-  [4]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [6]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [5]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [1]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [3]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [2]=>
-  object(for_integer_asort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  ["g"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  ["f"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["h"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["e"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["a"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["d"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["b"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["c"]=>
-  object(for_string_asort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-Done
---UEXPECTF--
-*** Testing asort() : object functionality ***
-
 -- Testing asort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(6) {

diff --git a/ext/standard/tests/array/asort_object2.phpt b/ext/standard/tests/array/asort_object2.phpt
index ad442ec471c829d4a02edefcf87660d5f71e7b62..a9fe7574ec7fa79a7fc194c6e27125b02dc7e8a1 100644 (file)
--- a/ext/standard/tests/array/asort_object2.phpt
+++ b/ext/standard/tests/array/asort_object2.phpt
@@ -10,7 +10,7 @@ Test asort() function : object functionality - sorting objects with diff. access
 
 /*
  * testing asort() by providing integer/string object arrays with following flag values 
- * 1. Defualt flag value
+ * 1. default flag value
    2. SORT_REGULAR - compare items normally
 */
 
@@ -91,169 +91,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing asort() : object functionality ***
 
--- Testing asort() by supplying various object arrays, 'flag' value is default --
-bool(true)
-array(4) {
-  [4]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(-4)
-  }
-  [1]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(2)
-  }
-  [3]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(23)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(32)
-    ["protected_class_value":protected]=>
-    int(6)
-  }
-  [2]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(44)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(66)
-    ["protected_class_value":protected]=>
-    int(3)
-  }
-}
-bool(true)
-array(4) {
-  ["d"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "PY"
-    ["private_class_value":"for_string_asort":private]=>
-    string(2) "py"
-    ["protected_class_value":protected]=>
-    string(1) "s"
-  }
-  ["b"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "T"
-    ["private_class_value":"for_string_asort":private]=>
-    string(1) "t"
-    ["protected_class_value":protected]=>
-    string(1) "q"
-  }
-  ["a"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_asort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(1) "d"
-  }
-  ["c"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_asort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-}
-
--- Testing asort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [4]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(-4)
-  }
-  [1]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(2)
-  }
-  [3]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(23)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(32)
-    ["protected_class_value":protected]=>
-    int(6)
-  }
-  [2]=>
-  object(for_integer_asort)#%d (3) {
-    ["public_class_value"]=>
-    int(44)
-    ["private_class_value":"for_integer_asort":private]=>
-    int(66)
-    ["protected_class_value":protected]=>
-    int(3)
-  }
-}
-bool(true)
-array(4) {
-  ["d"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "PY"
-    ["private_class_value":"for_string_asort":private]=>
-    string(2) "py"
-    ["protected_class_value":protected]=>
-    string(1) "s"
-  }
-  ["b"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "T"
-    ["private_class_value":"for_string_asort":private]=>
-    string(1) "t"
-    ["protected_class_value":protected]=>
-    string(1) "q"
-  }
-  ["a"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_asort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(1) "d"
-  }
-  ["c"]=>
-  object(for_string_asort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_asort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-*** Testing asort() : object functionality ***
-
 -- Testing asort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(4) {

diff --git a/ext/standard/tests/array/asort_variation1.phpt b/ext/standard/tests/array/asort_variation1.phpt
index 0b14cfd3c1919d565500c121b96544083270cdcd..ab0211ca8415486c154b4272fdf294b4ecb16532 100644 (file)
--- a/ext/standard/tests/array/asort_variation1.phpt
+++ b/ext/standard/tests/array/asort_variation1.phpt
@@ -10,7 +10,7 @@ Test asort() function : usage variations - unexpected values for 'array_arg' arg
 
 /*
  * testing asort() by providing different unexpected values for array argument with following flag values.
- * 1. flag value as defualt
+ * 1. flag value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
  * 4. SORT_STRING - compare items as strings
@@ -76,7 +76,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of asort()
 // when $array arugment is supplied with different values from $unexpected_values
 echo "\n-- Testing asort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
@@ -96,313 +96,7 @@ echo "Done";
 
 -- Testing asort() by supplying different unexpected values for 'array' argument --
 
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
--- Iteration 1 --
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: asort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: asort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: asort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying different unexpected values for 'array' argument --
-
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
+-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
 Warning: asort() expects parameter 1 to be array, integer given in %s on line %d

diff --git a/ext/standard/tests/array/asort_variation10.phpt b/ext/standard/tests/array/asort_variation10.phpt
index 7fee59b901d1bf55ff0b25eac7f36e640610034a..6bf3c450c702fe11edb69ac6667c1d4245ba626e 100644 (file)
--- a/ext/standard/tests/array/asort_variation10.phpt
+++ b/ext/standard/tests/array/asort_variation10.phpt
@@ -41,79 +41,7 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying octal value array, 'flag' value is default  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-229)
-  [-54]=>
-  int(-54)
-  [0]=>
-  int(0)
-  [54]=>
-  int(54)
-  [63]=>
-  int(63)
-  [209]=>
-  int(209)
-  [229]=>
-  int(229)
-  [506]=>
-  int(506)
-  [669]=>
-  int(669)
-}
-
--- Testing asort() by supplying octal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-229)
-  [-54]=>
-  int(-54)
-  [0]=>
-  int(0)
-  [54]=>
-  int(54)
-  [63]=>
-  int(63)
-  [209]=>
-  int(209)
-  [229]=>
-  int(229)
-  [506]=>
-  int(506)
-  [669]=>
-  int(669)
-}
-
--- Testing asort() by supplying octal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-229)
-  [-54]=>
-  int(-54)
-  [0]=>
-  int(0)
-  [54]=>
-  int(54)
-  [63]=>
-  int(63)
-  [209]=>
-  int(209)
-  [229]=>
-  int(229)
-  [506]=>
-  int(506)
-  [669]=>
-  int(669)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying octal value array, 'flag' value is default  --

diff --git a/ext/standard/tests/array/asort_variation11.phpt b/ext/standard/tests/array/asort_variation11.phpt
index d35356bdd07be07222693fcccc0ffff7023b6df0..6c6b772bc103fc9ddbb68aaa68d6e6be6e0484b2 100644 (file)
Binary files a/ext/standard/tests/array/asort_variation11.phpt and b/ext/standard/tests/array/asort_variation11.phpt differ

diff --git a/ext/standard/tests/array/asort_variation2.phpt b/ext/standard/tests/array/asort_variation2.phpt
index 3c8667ea40944a81c88dc0d254832fe46f9d3e89..ca07f5ec6f7c6216b059e966324d52c494e46dec 100644 (file)
--- a/ext/standard/tests/array/asort_variation2.phpt
+++ b/ext/standard/tests/array/asort_variation2.phpt
@@ -211,227 +211,6 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 14 --
-
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 15 --
-
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 16 --
-
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 17 --
-
-Warning: asort() expects parameter 2 to be long, object given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 18 --
-
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 19 --
-
-Warning: asort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
--- Iteration 20 --
-
-Warning: asort() expects parameter 2 to be long, resource given in %s on line %d
-bool(false)
-array(3) {
-  [1]=>
-  int(10)
-  [2]=>
-  int(2)
-  [3]=>
-  int(45)
-}
-Done
---UEXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying different unexpected values for 'sort_flags' argument --
--- Iteration 1 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 2 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 3 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 4 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 5 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 6 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 7 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 8 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 9 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 10 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 11 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 12 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [1]=>
-  int(10)
-  [3]=>
-  int(45)
-}
--- Iteration 13 --
-
 Warning: asort() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 array(3) {

diff --git a/ext/standard/tests/array/asort_variation3.phpt b/ext/standard/tests/array/asort_variation3.phpt
index e1d23f995dcd7d439b35cf980233ec4f1e7f4761..48666b492c71cfef4c616c753722c31570d0abc6 100644 (file)
--- a/ext/standard/tests/array/asort_variation3.phpt
+++ b/ext/standard/tests/array/asort_variation3.phpt
@@ -324,268 +324,3 @@ array(7) {
   %s(2147483648)
 }
 Done
---UEXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying various integer/float arrays --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(9) {
-  [10]=>
-  int(-41)
-  [6]=>
-  int(-31)
-  [4]=>
-  int(-21)
-  [2]=>
-  int(-11)
-  [7]=>
-  int(0)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(9) {
-  [10]=>
-  int(-41)
-  [6]=>
-  int(-31)
-  [4]=>
-  int(-21)
-  [2]=>
-  int(-11)
-  [7]=>
-  int(0)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-- Sort_flag = SORT_NUMERIC -
-bool(true)
-array(9) {
-  [10]=>
-  int(-41)
-  [6]=>
-  int(-31)
-  [4]=>
-  int(-21)
-  [2]=>
-  int(-11)
-  [7]=>
-  int(0)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(7) {
-  [2]=>
-  float(-10.5)
-  [7]=>
-  float(-0.1)
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [5]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [2]=>
-  float(-10.5)
-  [7]=>
-  float(-0.1)
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [5]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-}
-- Sort_flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [2]=>
-  float(-10.5)
-  [7]=>
-  float(-0.1)
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [5]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-}
-
--- Iteration 3 --
-- With default sort_flag -
-bool(true)
-array(11) {
-  [4]=>
-  int(-1)
-  [8]=>
-  float(-0.9)
-  [10]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [5]=>
-  int(0)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [6]=>
-  float(0.09)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [11]=>
-  int(33)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [4]=>
-  int(-1)
-  [8]=>
-  float(-0.9)
-  [10]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [5]=>
-  int(0)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [6]=>
-  float(0.09)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [11]=>
-  int(33)
-}
-- Sort_flag = SORT_NUMERIC -
-bool(true)
-array(11) {
-  [4]=>
-  int(-1)
-  [8]=>
-  float(-0.9)
-  [10]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [5]=>
-  int(0)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [6]=>
-  float(0.09)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [11]=>
-  int(33)
-}
-
--- Iteration 4 --
-- With default sort_flag -
-bool(true)
-array(7) {
-  [7]=>
-  %s(-2147483649)
-  [4]=>
-  %s(-2147483648)
-  [3]=>
-  int(-2147483647)
-  [6]=>
-  int(0)
-  [5]=>
-  int(0)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  %s(2147483648)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [7]=>
-  %s(-2147483649)
-  [4]=>
-  %s(-2147483648)
-  [3]=>
-  int(-2147483647)
-  [6]=>
-  int(0)
-  [5]=>
-  int(0)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  %s(2147483648)
-}
-- Sort_flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [7]=>
-  %s(-2147483649)
-  [4]=>
-  %s(-2147483648)
-  [3]=>
-  int(-2147483647)
-  [6]=>
-  int(0)
-  [5]=>
-  int(0)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  %s(2147483648)
-}
-Done

diff --git a/ext/standard/tests/array/asort_variation4.phpt b/ext/standard/tests/array/asort_variation4.phpt
index 9e5f8666da5de04d41b8f397ee9aea48e020dc5a..e42e704b329dc1e36dfc867c90b4a8b841a984cb 100644 (file)
--- a/ext/standard/tests/array/asort_variation4.phpt
+++ b/ext/standard/tests/array/asort_variation4.phpt
@@ -41,43 +41,7 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() :usage variations  ***
-
--- Testing asort() by supplying reference variable array, 'flag' value is default --
-bool(true)
-array(3) {
-  [2]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [3]=>
-  &int(555)
-}
-
--- Testing asort() by supplying reference variable array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [2]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [3]=>
-  &int(555)
-}
-
--- Testing asort() by supplying reference variable array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(3) {
-  [2]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [3]=>
-  &int(555)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() :usage variations  ***
 
 -- Testing asort() by supplying reference variable array, 'flag' value is default --

diff --git a/ext/standard/tests/array/asort_variation5.phpt b/ext/standard/tests/array/asort_variation5.phpt
index bb3cfe69e557b7fc4fd8f4ce30e27505f080c07e..2c80491df18753b6c103422a472caaa656c34063 100644 (file)
--- a/ext/standard/tests/array/asort_variation5.phpt
+++ b/ext/standard/tests/array/asort_variation5.phpt
@@ -57,196 +57,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying various string arrays --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(12) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-- Sort_flag = SORT_STRING -
-bool(true)
-array(12) {
-  ["null"]=>
-  NULL
-  ["NULL"]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(12) {
-  ["B"]=>
-  string(6) "BANANA"
-  ["O"]=>
-  string(6) "Orange"
-  ["T"]=>
-  string(4) "TTTT"
-  ["Te"]=>
-  string(4) "Test"
-  ["X"]=>
-  string(1) "X"
-  ["a"]=>
-  string(5) "apple"
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemoN"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["t"]=>
-  string(3) "ttt"
-  ["w"]=>
-  string(2) "ww"
-  ["x"]=>
-  string(1) "x"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  ["B"]=>
-  string(6) "BANANA"
-  ["O"]=>
-  string(6) "Orange"
-  ["T"]=>
-  string(4) "TTTT"
-  ["Te"]=>
-  string(4) "Test"
-  ["X"]=>
-  string(1) "X"
-  ["a"]=>
-  string(5) "apple"
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemoN"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["t"]=>
-  string(3) "ttt"
-  ["w"]=>
-  string(2) "ww"
-  ["x"]=>
-  string(1) "x"
-}
-- Sort_flag = SORT_STRING -
-bool(true)
-array(12) {
-  ["B"]=>
-  string(6) "BANANA"
-  ["O"]=>
-  string(6) "Orange"
-  ["T"]=>
-  string(4) "TTTT"
-  ["Te"]=>
-  string(4) "Test"
-  ["X"]=>
-  string(1) "X"
-  ["a"]=>
-  string(5) "apple"
-  ["b"]=>
-  string(6) "banana"
-  ["l"]=>
-  string(5) "lemoN"
-  ["o"]=>
-  string(6) "oraNGe"
-  ["t"]=>
-  string(3) "ttt"
-  ["w"]=>
-  string(2) "ww"
-  ["x"]=>
-  string(1) "x"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying various string arrays --

diff --git a/ext/standard/tests/array/asort_variation6.phpt b/ext/standard/tests/array/asort_variation6.phpt
index 6620c0e719078d8c2bcf4a05a762ef21d1b65dbe..99de6dbf03187beef045eda3d57e2e7b064d9526 100644 (file)
--- a/ext/standard/tests/array/asort_variation6.phpt
+++ b/ext/standard/tests/array/asort_variation6.phpt
@@ -40,79 +40,7 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying hexadecimal value array, 'flag' value is default  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-
--- Testing asort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-
--- Testing asort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying hexadecimal value array, 'flag' value is default  --

diff --git a/ext/standard/tests/array/asort_variation7.phpt b/ext/standard/tests/array/asort_variation7.phpt
index 2c8f1c349404f4cc21ba61db19b4be59d3f13156..bfbce98ccc82eb55be10654e01f4e94d47569bcd 100644 (file)
--- a/ext/standard/tests/array/asort_variation7.phpt
+++ b/ext/standard/tests/array/asort_variation7.phpt
@@ -42,62 +42,7 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying bool value array, 'flag' value is default --
-bool(true)
-array(4) {
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing asort() by supplying bool value array, 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing asort() by supplying bool value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(4) {
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing asort() by supplying bool value array, 'flag' value is SORT_STRING --
-bool(true)
-array(4) {
-  [4]=>
-  bool(false)
-  [2]=>
-  bool(false)
-  [1]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying bool value array, 'flag' value is default --

diff --git a/ext/standard/tests/array/asort_variation8.phpt b/ext/standard/tests/array/asort_variation8.phpt
index 2f9da35e0a0e8a999117a99d86350c71d59eec60..6562aaaa0b6a82c106f53ddd7cc13940dbb5396b 100644 (file)
--- a/ext/standard/tests/array/asort_variation8.phpt
+++ b/ext/standard/tests/array/asort_variation8.phpt
@@ -57,128 +57,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying various arrays containing sub arrays --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(0) {
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(1) {
-  ["sub_array[1][0]"]=>
-  array(0) {
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(1) {
-  ["sub_array[1][0]"]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  ["data[2,1]"]=>
-  int(11)
-  ["data[2,0]"]=>
-  int(44)
-  ["sub_array[2][0] "]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["data[2,1]"]=>
-  int(11)
-  ["data[2,0]"]=>
-  int(44)
-  ["sub_array[2][0] "]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-}
-
--- Iteration 4 --
-- With default sort_flag -
-bool(true)
-array(4) {
-  ["sub_array[3][3]"]=>
-  array(0) {
-  }
-  ["sub_array[3][1]"]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  ["sub_array[3][2]"]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  ["sub_array[3][0]"]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["sub_array[3][3]"]=>
-  array(0) {
-  }
-  ["sub_array[3][1]"]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  ["sub_array[3][2]"]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  ["sub_array[3][0]"]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying various arrays containing sub arrays --

diff --git a/ext/standard/tests/array/asort_variation9.phpt b/ext/standard/tests/array/asort_variation9.phpt
index 7de49e330764227606461f00d443c4b077ab62c0..b26cac7fc71871f43a4f53cf67aadbd7a5e8c9ec 100644 (file)
--- a/ext/standard/tests/array/asort_variation9.phpt
+++ b/ext/standard/tests/array/asort_variation9.phpt
@@ -49,214 +49,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing asort() : usage variations ***
-
--- Testing asort() by supplying various arrays with key values --
-
--- Iteration 1 --
-- With default sort_flag -
-bool(true)
-array(5) {
-  [9]=>
-  int(11)
-  [7]=>
-  int(22)
-  [8]=>
-  int(33)
-  [5]=>
-  int(55)
-  [6]=>
-  int(66)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(5) {
-  [9]=>
-  int(11)
-  [7]=>
-  int(22)
-  [8]=>
-  int(33)
-  [5]=>
-  int(55)
-  [6]=>
-  int(66)
-}
-
--- Iteration 2 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-
--- Iteration 3 --
-- With default sort_flag -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-
--- Iteration 4 --
-- With default sort_flag -
-bool(true)
-array(3) {
-  [0]=>
-  string(5) "first"
-  [5]=>
-  string(6) "second"
-  [6]=>
-  string(5) "third"
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [0]=>
-  string(5) "first"
-  [5]=>
-  string(6) "second"
-  [6]=>
-  string(5) "third"
-}
-
--- Iteration 5 --
-- With default sort_flag -
-bool(true)
-array(6) {
-  [4]=>
-  int(1)
-  [0]=>
-  int(1)
-  [8]=>
-  int(1)
-  [1]=>
-  int(1)
-  [3]=>
-  int(13)
-  [9]=>
-  int(19)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [4]=>
-  int(1)
-  [0]=>
-  int(1)
-  [8]=>
-  int(1)
-  [1]=>
-  int(1)
-  [3]=>
-  int(13)
-  [9]=>
-  int(19)
-}
-
--- Iteration 6 --
-- With default sort_flag -
-bool(true)
-array(2) {
-  ["bar"]=>
-  string(3) "baz"
-  ["foo"]=>
-  int(1)
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(2) {
-  ["bar"]=>
-  string(3) "baz"
-  ["foo"]=>
-  int(1)
-}
-
--- Iteration 7 --
-- With default sort_flag -
-bool(true)
-array(4) {
-  ["a"]=>
-  int(1)
-  ["d"]=>
-  int(5)
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-}
-- Sort_flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["a"]=>
-  int(1)
-  ["d"]=>
-  int(5)
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing asort() : usage variations ***
 
 -- Testing asort() by supplying various arrays with key values --

diff --git a/ext/standard/tests/array/bug20381.phpt b/ext/standard/tests/array/bug20381.phpt
index da06da0e383d6ac213e80f376920c00be7b73c69..9109fd6a8d611c7fa812ed83676af7fbd570c88a 100644 (file)
--- a/ext/standard/tests/array/bug20381.phpt
+++ b/ext/standard/tests/array/bug20381.phpt
@@ -23,61 +23,6 @@ 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"
-  }
-}
---UEXPECT--
 array(3) {
   [u"a1"]=>
   int(1)

diff --git a/ext/standard/tests/array/bug21182.phpt b/ext/standard/tests/array/bug21182.phpt
index 11ff76a5ce11658af7ab07d49193bf2ab2264340..7c273de1f0e5341404ed90316c7bd2062e23c3f2 100644 (file)
--- a/ext/standard/tests/array/bug21182.phpt
+++ b/ext/standard/tests/array/bug21182.phpt
@@ -9,7 +9,4 @@ echo "a2: $a : type : " . gettype($a) . "\n";
 ?>
 --EXPECT--
 a1: 20
-a2: 20 : type : string
---UEXPECT--
-a1: 20
 a2: 20 : type : unicode

diff --git a/ext/standard/tests/array/bug21918.phpt b/ext/standard/tests/array/bug21918.phpt
index 9288dd1520bf538cc25c5cc9f9c7f1719b759b72..db9e943a232b64a354b62db3844533551e2e2338 100755 (executable)
--- a/ext/standard/tests/array/bug21918.phpt
+++ b/ext/standard/tests/array/bug21918.phpt
@@ -33,29 +33,6 @@ echo "==Done==\n";
 --EXPECT--
 ==Mixed==
 int(-1)
-string(1) "a"
-int(-2)
-string(1) "b"
-int(3)
-string(1) "c"
-int(4)
-string(1) "d"
-int(5)
-string(1) "e"
-int(6001)
-string(1) "f"
-string(2) "07"
-string(1) "g"
-==Normal==
-int(0)
-string(1) "a"
-==Negative==
-int(-2)
-string(1) "a"
-==Done==
---UEXPECT--
-==Mixed==
-int(-1)
 unicode(1) "a"
 int(-2)
 unicode(1) "b"

diff --git a/ext/standard/tests/array/bug21998.phpt b/ext/standard/tests/array/bug21998.phpt
index b5fe8675c998fc883c43d73f92e4f4cab0197b49..5c36e536103368c32927b7a43dd7440fcb49974a 100644 (file)
--- a/ext/standard/tests/array/bug21998.phpt
+++ b/ext/standard/tests/array/bug21998.phpt
@@ -16,14 +16,6 @@ var_dump(key($a));
 ?>
 --EXPECT--
 int(0)
-string(1) "c"
-int(0)
-string(1) "b"
-int(0)
-string(1) "a"
-NULL
---UEXPECT--
-int(0)
 unicode(1) "c"
 int(0)
 unicode(1) "b"

diff --git a/ext/standard/tests/array/bug22088.phpt b/ext/standard/tests/array/bug22088.phpt
index 24f815ce9002841f6c15b082939102c647faea82..4594f576e5474d892eb6c8482f4e9f86ba308113 100644 (file)
--- a/ext/standard/tests/array/bug22088.phpt
+++ b/ext/standard/tests/array/bug22088.phpt
@@ -15,23 +15,6 @@ var_dump($a);
 
 ?>
 --EXPECT--
-array(3) {
-  [0]=>
-  string(1) "b"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(1) "a"
-}
-array(3) {
-  ["b"]=>
-  int(2)
-  ["c"]=>
-  int(3)
-  [0]=>
-  string(1) "a"
-}
---UEXPECT--
 array(3) {
   [0]=>
   unicode(1) "b"

diff --git a/ext/standard/tests/array/bug24198.phpt b/ext/standard/tests/array/bug24198.phpt
index abfde36e759a94d9589c4df1d2394e67f91cb225..d94400544a76b957c8613f0625f58423e36b39a0 100644 (file)
--- a/ext/standard/tests/array/bug24198.phpt
+++ b/ext/standard/tests/array/bug24198.phpt
@@ -7,23 +7,6 @@ $c = array('a' => 'aa','b' => 'bb');
 var_dump(array_merge_recursive($c, $c)); 
 ?>
 --EXPECT--
-array(2) {
-  ["a"]=>
-  array(2) {
-    [0]=>
-    string(2) "aa"
-    [1]=>
-    string(2) "aa"
-  }
-  ["b"]=>
-  array(2) {
-    [0]=>
-    string(2) "bb"
-    [1]=>
-    string(2) "bb"
-  }
-}
---UEXPECT--
 array(2) {
   [u"a"]=>
   array(2) {

diff --git a/ext/standard/tests/array/bug24220.phpt b/ext/standard/tests/array/bug24220.phpt
index 4a280d68d20d94e6d22f1d40341672e87ec12d40..b7f4b4ef998b4c7e22bf58cdc9c3e8ccb8c41ae9 100644 (file)
--- a/ext/standard/tests/array/bug24220.phpt
+++ b/ext/standard/tests/array/bug24220.phpt
@@ -13,89 +13,6 @@ array(2) {
   [1]=>
   int(2004)
 }
-array(26) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-  [7]=>
-  string(1) "h"
-  [8]=>
-  string(1) "i"
-  [9]=>
-  string(1) "j"
-  [10]=>
-  string(1) "k"
-  [11]=>
-  string(1) "l"
-  [12]=>
-  string(1) "m"
-  [13]=>
-  string(1) "n"
-  [14]=>
-  string(1) "o"
-  [15]=>
-  string(1) "p"
-  [16]=>
-  string(1) "q"
-  [17]=>
-  string(1) "r"
-  [18]=>
-  string(1) "s"
-  [19]=>
-  string(1) "t"
-  [20]=>
-  string(1) "u"
-  [21]=>
-  string(1) "v"
-  [22]=>
-  string(1) "w"
-  [23]=>
-  string(1) "x"
-  [24]=>
-  string(1) "y"
-  [25]=>
-  string(1) "z"
-}
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
---UEXPECT--
-array(2) {
-  [0]=>
-  int(2003)
-  [1]=>
-  int(2004)
-}
 array(26) {
   [0]=>
   unicode(1) "a"

diff --git a/ext/standard/tests/array/bug24980.phpt b/ext/standard/tests/array/bug24980.phpt
index 0e481a7af7a7896b80196de82a1d6806b0ab429c..872c0b2b65cf501654aec3e40583058f15774148 100644 (file)
--- a/ext/standard/tests/array/bug24980.phpt
+++ b/ext/standard/tests/array/bug24980.phpt
@@ -47,16 +47,6 @@ running_total is 4, current_value is 3
 running_total is 13, current_value is 5
 running_total is 38, current_value is 7
 Total is 87
-string(3) "abc"
-int(15)
-int(1200)
-int(1)
---UEXPECT--
-running_total is 0, current_value is 2
-running_total is 4, current_value is 3
-running_total is 13, current_value is 5
-running_total is 38, current_value is 7
-Total is 87
 unicode(3) "abc"
 int(15)
 int(1200)

diff --git a/ext/standard/tests/array/bug25359.phpt b/ext/standard/tests/array/bug25359.phpt
index 8ad36c2cfede602f9ba4a235dd63b2512aeb55b1..ee4cf795fc70e1c4689a71bf9aa9445cae7b54f2 100644 (file)
--- a/ext/standard/tests/array/bug25359.phpt
+++ b/ext/standard/tests/array/bug25359.phpt
@@ -18,19 +18,6 @@ does_not_work();
 
 ?>
 --EXPECT--
-array(5) {
-  [0]=>
-  string(5) "first"
-  [1]=>
-  string(6) "second"
-  [2]=>
-  string(5) "third"
-  [3]=>
-  string(5) "forth"
-  [4]=>
-  string(5) "fifth"
-}
---UEXPECT--
 array(5) {
   [0]=>
   unicode(5) "first"

diff --git a/ext/standard/tests/array/bug25708.phpt b/ext/standard/tests/array/bug25708.phpt
index fdaed851f264037b06332eeaacd52578abb4a0de..4377123c532a41647b0bf04761593ac5f6f2e9dd 100644 (file)
--- a/ext/standard/tests/array/bug25708.phpt
+++ b/ext/standard/tests/array/bug25708.phpt
@@ -97,161 +97,6 @@ long(3) refcount(1)
 long(3) refcount(2)
 --
 long(4) refcount(1)
-string(1) "x" refcount(1)
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(3) refcount(2)
---
-long(1) refcount(2)
-long(2) refcount(2)
-----a
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(3) refcount(1)
-long(1) refcount(1)
-long(3) refcount(1)
---
-long(4) refcount(1)
-long(3) refcount(1)
-long(4) refcount(1)
-long(3) refcount(1)
---
-long(3) refcount(1)
-long(3) refcount(1)
-long(3) refcount(2)
---
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(3) refcount(2)
---
-long(1) refcount(2)
-long(2) refcount(2)
-----ra
-NULL refcount(2)
-NULL refcount(2)
-long(1) refcount(3)
-long(2) refcount(3)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(3) refcount(1)
-long(1) refcount(1)
-long(3) refcount(1)
---
-long(4) refcount(1)
-long(3) refcount(1)
-long(4) refcount(1)
-long(3) refcount(1)
---
-long(3) refcount(1)
-long(3) refcount(1)
-long(3) refcount(2)
---
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(3) refcount(2)
---
-long(1) refcount(2)
-long(2) refcount(2)
-----
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(3) refcount(1)
-long(1) refcount(1)
-long(3) refcount(1)
---
-long(4) refcount(1)
-long(3) refcount(1)
-long(4) refcount(1)
-long(3) refcount(1)
---
-long(3) refcount(1)
-long(3) refcount(1)
-long(3) refcount(2)
---
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(4) refcount(1)
-string(1) "x" refcount(1)
-long(3) refcount(2)
---
-long(1) refcount(2)
-long(2) refcount(2)
-----r
-string(2) "ok" refcount(2)
-string(2) "ok" refcount(2)
---UEXPECT--
-NULL refcount(2)
-NULL refcount(2)
-long(1) refcount(3)
-long(2) refcount(3)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(2) refcount(1)
-long(1) refcount(1)
-long(2) refcount(1)
---
-long(1) refcount(1)
-long(3) refcount(1)
-long(1) refcount(1)
-long(3) refcount(1)
---
-long(4) refcount(1)
-long(3) refcount(1)
-long(4) refcount(1)
-long(3) refcount(1)
---
-long(3) refcount(1)
-long(3) refcount(1)
-long(3) refcount(2)
---
-long(4) refcount(1)
 unicode(1) "x" { 0078 } refcount(1)
 long(4) refcount(1)
 unicode(1) "x" { 0078 } refcount(1)

diff --git a/ext/standard/tests/array/bug26458.phpt b/ext/standard/tests/array/bug26458.phpt
index c1d1ef71bf2531c329cc333df59071b3901c9090..b522cf87fb8e1e3dc7a723e36ff0f311823f60ca 100644 (file)
Binary files a/ext/standard/tests/array/bug26458.phpt and b/ext/standard/tests/array/bug26458.phpt differ

diff --git a/ext/standard/tests/array/bug28739.phpt b/ext/standard/tests/array/bug28739.phpt
index 418ae9f77e38f1dcbe8d635fe1f76234a0a27ff9..7c81c43cc97bba554d1dbd43668580ea58232582 100644 (file)
--- a/ext/standard/tests/array/bug28739.phpt
+++ b/ext/standard/tests/array/bug28739.phpt
@@ -18,45 +18,6 @@ echo "Now diffing:\n";
 print_r(array_udiff($p1,$p2, 'b'));
 ?>
 --EXPECT--
-string(1) "a"
-string(1) "a"
-Array
-(
-    [2] => p Object
-        (
-            [x] => 0
-        )
-
-    [1] => p Object
-        (
-            [x] => 1
-        )
-
-    [0] => p Object
-        (
-            [x] => 2
-        )
-
-)
-Now diffing:
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-string(1) "b"
-Array
-(
-    [1] => p Object
-        (
-            [x] => 1
-        )
-
-)
---UEXPECT--
 unicode(1) "a"
 unicode(1) "a"
 Array
@@ -94,4 +55,4 @@ Array
             [x] => 1
         )
 
-)
\ No newline at end of file
+)

diff --git a/ext/standard/tests/array/bug29253.phpt b/ext/standard/tests/array/bug29253.phpt
index 6c3a11968c1112d191a9f157b351486637587ea1..34d1e1183e8d26eacb63ab2699a555717dffcdcd 100755 (executable)
--- a/ext/standard/tests/array/bug29253.phpt
+++ b/ext/standard/tests/array/bug29253.phpt
@@ -38,41 +38,6 @@ Notice: Array to string conversion in %s on line %d
 
 Notice: Array to string conversion in %s on line %d
 
-Notice: Array to string conversion in %s on line %d
-array(0) {
-}
-string(4) "afad"
---UEXPECTF--
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
 Notice: Array to string conversion in %s on line %d
 array(0) {
 }

diff --git a/ext/standard/tests/array/bug29493.phpt b/ext/standard/tests/array/bug29493.phpt
index adcb7065cec53a8f18c6149684ebd02cc0ba687f..f7ce34d89137a72c1141d8e098b3b56e703ca789 100644 (file)
--- a/ext/standard/tests/array/bug29493.phpt
+++ b/ext/standard/tests/array/bug29493.phpt
@@ -73,47 +73,6 @@ t2();
 t3();
 ?>
 --EXPECT--
-array(1) {
-  ["foo"]=>
-  string(3) "aaa"
-}
-array(1) {
-  ["foo"]=>
-  string(3) "bbb"
-}
-array(1) {
-  ["foo"]=>
-  &string(3) "noo"
-}
-array(1) {
-  ["foo"]=>
-  string(3) "bbb"
-}
-array(1) {
-  ["foo"]=>
-  string(3) "bbb"
-}
-array(1) {
-  ["foo"]=>
-  string(3) "bbb"
-}
-array(1) {
-  ["foo"]=>
-  &string(3) "noo"
-}
-array(1) {
-  ["foo"]=>
-  &string(3) "noo"
-}
-array(1) {
-  ["foo"]=>
-  string(3) "aaa"
-}
-array(1) {
-  ["foo"]=>
-  &string(3) "noo"
-}
---UEXPECT--
 array(1) {
   [u"foo"]=>
   unicode(3) "aaa"

diff --git a/ext/standard/tests/array/bug30833.phpt b/ext/standard/tests/array/bug30833.phpt
index e556fb224d5a391e04dafdb1004dbcbc6a38eeda..2195b5bd60478f8e402f457f60ce61ffe5dc55da 100644 (file)
--- a/ext/standard/tests/array/bug30833.phpt
+++ b/ext/standard/tests/array/bug30833.phpt
@@ -13,27 +13,7 @@ var_dump($foo);
 
 echo "Done\n";
 ?>
---EXPECT--     
-array(2) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(4) "0000"
-}
-array(2) {
-  ["abc"]=>
-  int(1)
-  ["0000"]=>
-  int(1)
-}
-array(2) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(4) "0000"
-}
-Done
---UEXPECT--    
+--EXPECT--
 array(2) {
   [0]=>
   unicode(3) "abc"

diff --git a/ext/standard/tests/array/bug31158.phpt b/ext/standard/tests/array/bug31158.phpt
index e672a10b28d62a0bbd99abf6b8cd6c58f538fa30..f99f6434a9103b9dfdbf92321645255d58419fe1 100755 (executable)
--- a/ext/standard/tests/array/bug31158.phpt
+++ b/ext/standard/tests/array/bug31158.phpt
@@ -14,4 +14,3 @@ echo "ok\n";
 --EXPECTF--
 Notice: Undefined variable: GLOBALS in %sbug31158.php on line 6
 ok
-

diff --git a/ext/standard/tests/array/bug31213.phpt b/ext/standard/tests/array/bug31213.phpt
index 02fafca52e577086bf5c660c587d8cc28a67f0ae..4b3a8a98e428fc2fa6ae1c76c3485d901c394062 100644 (file)
--- a/ext/standard/tests/array/bug31213.phpt
+++ b/ext/standard/tests/array/bug31213.phpt
@@ -37,31 +37,6 @@ int(1)
 int(2)
 int(2)
 int(2)
-array(2) {
-  ["_a"]=>
-  &int(2)
-  ["_b"]=>
-  &int(2)
-}
-int(1)
-int(1)
-int(1)
-int(2)
-int(2)
-int(2)
-array(2) {
-  ["_a"]=>
-  &int(2)
-  ["_b"]=>
-  &int(2)
-}
---UEXPECT--
-int(1)
-int(1)
-int(1)
-int(2)
-int(2)
-int(2)
 array(2) {
   [u"_a"]=>
   &int(2)

diff --git a/ext/standard/tests/array/bug33382.phpt b/ext/standard/tests/array/bug33382.phpt
index 5710258998d95f52b88f6031891df53a77adf081..33ac20d5b52c21b0608f680385e407cc4b0cf9be 100644 (file)
--- a/ext/standard/tests/array/bug33382.phpt
+++ b/ext/standard/tests/array/bug33382.phpt
@@ -11,7 +11,7 @@ var_dump(array_reverse($array));
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 array(5) {
   [0]=>
   int(5)

diff --git a/ext/standard/tests/array/bug34066.phpt b/ext/standard/tests/array/bug34066.phpt
index 31f6b4c1db66eda19146ec7fc9651048e39a07fe..e25a16dc872b8adc65172cda75edfa98bc01b2b3 100644 (file)
--- a/ext/standard/tests/array/bug34066.phpt
+++ b/ext/standard/tests/array/bug34066.phpt
@@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix)
 }
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 gen_xml(prefix=/Docs/)
 gen_xml(prefix=/Docs/@)
 /Docs/@Version=1.0

diff --git a/ext/standard/tests/array/bug34066_1.phpt b/ext/standard/tests/array/bug34066_1.phpt
index edc16efd05d8a37cf7906c7570232afb1d89049f..f014697e1aaf5c8292202df1cc2d9447962ed908 100644 (file)
--- a/ext/standard/tests/array/bug34066_1.phpt
+++ b/ext/standard/tests/array/bug34066_1.phpt
@@ -265,7 +265,7 @@ function gen_xml($val, $key, $prefix)
 }
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 gen_xml(prefix=/Docs/)
 /Docs/Version=1.0
 gen_xml(prefix=/Docs/) end

diff --git a/ext/standard/tests/array/bug35014.phpt b/ext/standard/tests/array/bug35014.phpt
index c09ccf4cb44809b51ce2c5da7f5a3cef3a759885..adf33d2f21491b00744a3c1550aaca77f2da038b 100644 (file)
--- a/ext/standard/tests/array/bug35014.phpt
+++ b/ext/standard/tests/array/bug35014.phpt
@@ -22,18 +22,7 @@ foreach ($tests as $v) {
        var_dump(array_product($v));
 }
 ?>
---EXPECTF--    
-Warning: array_product() expects parameter 1 to be array, string given in %s on line %d
-NULL
-int(0)
-int(0)
-int(3)
-int(9)
-float(1)
-float(9.9999998E+15)
-float(2.8404260053903E+20)
-float(8589934590)
---UEXPECTF--
+--EXPECTF--
 Warning: array_product() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 int(0)

diff --git a/ext/standard/tests/array/bug35014_64bit.phpt b/ext/standard/tests/array/bug35014_64bit.phpt
index b314ecceea2cde925699a1b08e159530d5ef00bc..d9fc6c05c8da4a22ab19424d19ed8ac2c08b6673 100644 (file)
--- a/ext/standard/tests/array/bug35014_64bit.phpt
+++ b/ext/standard/tests/array/bug35014_64bit.phpt
@@ -22,18 +22,7 @@ foreach ($tests as $v) {
        var_dump(array_product($v));
 }
 ?>
---EXPECTF--    
-Warning: array_product() expects parameter 1 to be array, string given in %s on line %d
-NULL
-int(0)
-int(0)
-int(3)
-int(9)
-float(1)
-int(9999999800000001)
-float(1.219953680145E+30)
-float(3.6893488147419E+19)
---UEXPECTF--
+--EXPECTF--
 Warning: array_product() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 int(0)

diff --git a/ext/standard/tests/array/bug35022.phpt b/ext/standard/tests/array/bug35022.phpt
index ae4069601f99e3068bbad55d5b8c1e8f0b222620..d03b2aa64db81e50e9955dd3ea745e989e26d5b1 100644 (file)
--- a/ext/standard/tests/array/bug35022.phpt
+++ b/ext/standard/tests/array/bug35022.phpt
@@ -13,13 +13,7 @@ foo($state);
 reset($state);
 var_dump( key($state), current($state) );
 ?>
---EXPECT--     
-three => 3
-two => 2
-one => 1
-string(3) "one"
-int(1)
---UEXPECT--    
+--EXPECT--
 three => 3
 two => 2
 one => 1

diff --git a/ext/standard/tests/array/bug35821.phpt b/ext/standard/tests/array/bug35821.phpt
index 05140d0d37d71d53c4d888b57fcd6625f3890535..5b49d4aa92b539eed5c6722bf2d5c2a5bbb1cae0 100644 (file)
--- a/ext/standard/tests/array/bug35821.phpt
+++ b/ext/standard/tests/array/bug35821.phpt
@@ -21,7 +21,7 @@ array_map(array('Element', 'CallBack'), $arr);
 
 echo "Done\n";
 ?>
---EXPECTF--    
+--EXPECTF--
 
 Warning: array_map(): An error occurred while invoking the map callback in %s on line %d
 

diff --git a/ext/standard/tests/array/bug36975.phpt b/ext/standard/tests/array/bug36975.phpt
index b0044880a16e4973a730549ed0b765e9122c1495..e68f9844ae884997431304e050a3e806ce844d42 100644 (file)
--- a/ext/standard/tests/array/bug36975.phpt
+++ b/ext/standard/tests/array/bug36975.phpt
@@ -26,42 +26,6 @@ var_dump($c);
 ?>
 --EXPECT--
 natcasesort success!
-array(6) {
-  [0]=>
-  string(2) "aa"
-  [1]=>
-  string(2) "aa"
-  [3]=>
-  string(2) "bb"
-  [2]=>
-  string(2) "bb"
-  [5]=>
-  string(2) "cc"
-  [6]=>
-  string(2) "cc"
-}
-Array
-(
-    [1] => foo
-    [2] => bar
-    [3] => bar
-)
-array(6) {
-  [4]=>
-  int(0)
-  [3]=>
-  int(0)
-  [2]=>
-  int(0)
-  [1]=>
-  int(0)
-  [5]=>
-  string(3) "foo"
-  [6]=>
-  string(3) "bar"
-}
---UEXPECT--
-natcasesort success!
 array(6) {
   [0]=>
   unicode(2) "aa"

diff --git a/ext/standard/tests/array/bug38464.phpt b/ext/standard/tests/array/bug38464.phpt
index 26a90dcbd2d55c1853b52d53112e4e86537ffaad..d6aa504b46926e720cccc8d6a27d54862b498e74 100644 (file)
--- a/ext/standard/tests/array/bug38464.phpt
+++ b/ext/standard/tests/array/bug38464.phpt
@@ -5,20 +5,7 @@ Bug #38464 (array_count_values() mishandles numeric strings)
 $array = array('-000', ' 001', 1, ' 123', '+123');
 var_dump(array_count_values($array));
 ?>
---EXPECT--     
-array(5) {
-  ["-000"]=>
-  int(1)
-  [" 001"]=>
-  int(1)
-  [1]=>
-  int(1)
-  [" 123"]=>
-  int(1)
-  ["+123"]=>
-  int(1)
-}
---UEXPECT--
+--EXPECT--
 array(5) {
   [u"-000"]=>
   int(1)

diff --git a/ext/standard/tests/array/bug39576.phpt b/ext/standard/tests/array/bug39576.phpt
index c58c0ed2a73b72f2b36ebf8b8eaca2b10ceb8f92..4742838cf718b0ca39ced89acc0997c4e5f3aaaf 100644 (file)
--- a/ext/standard/tests/array/bug39576.phpt
+++ b/ext/standard/tests/array/bug39576.phpt
@@ -32,25 +32,7 @@ array_intersect_key (
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Strict Standards: Only variables should be passed by reference in %s on line %d
-object(Test)#%d (4) {
-  ["_table"]=>
-  string(0) ""
-  ["_columns"]=>
-  array(1) {
-    ["name"]=>
-    object(stdClass)#%d (0) {
-    }
-  }
-  ["_primary"]=>
-  array(0) {
-  }
-  ["name"]=>
-  string(4) "test"
-}
-Done
---UEXPECTF--
+--EXPECTF--
 Strict Standards: Only variables should be passed by reference in %s on line %d
 object(Test)#%d (4) {
   [u"_table"]=>

diff --git a/ext/standard/tests/array/bug40191.phpt b/ext/standard/tests/array/bug40191.phpt
index eb1251b84ccbf02731d82a339fce2a84855a005d..cce8e9466db3b6dc4aa3a83e7aac621b7abe0cbb 100644 (file)
--- a/ext/standard/tests/array/bug40191.phpt
+++ b/ext/standard/tests/array/bug40191.phpt
@@ -15,15 +15,7 @@ var_dump($arr);
 
 echo "Done\n";
 ?>
---EXPECTF--    
-array(2) {
-  [0]=>
-  string(3) "foo"
-  [1]=>
-  string(3) "bar"
-}
-Done
---UEXPECTF--
+--EXPECTF--
 array(2) {
   [0]=>
   unicode(3) "foo"

diff --git a/ext/standard/tests/array/bug40709.phpt b/ext/standard/tests/array/bug40709.phpt
index 6ab6bbd4101b033c68c97a5ce3516bdd08a2f0d6..6f7d29910ece6a331c3b548ed558c52fa63749bb 100644 (file)
--- a/ext/standard/tests/array/bug40709.phpt
+++ b/ext/standard/tests/array/bug40709.phpt
@@ -20,7 +20,7 @@ echo "result for arr2: ".array_reduce($arr2,'CommaSeperatedList')."\n";
 
 echo "Done\n";
 ?>
---EXPECT--     
+--EXPECT--
 result for arr1: 1,2,3
 result for arr2: 1
 result for arr1: 1,2,3

diff --git a/ext/standard/tests/array/bug41121.phpt b/ext/standard/tests/array/bug41121.phpt
index a03bdaf4ce90051ebb7f0ccc5588f236b7e32805..fb6e91bc74a2ee18995b28ee0a81ee77d851c84b 100644 (file)
--- a/ext/standard/tests/array/bug41121.phpt
+++ b/ext/standard/tests/array/bug41121.phpt
@@ -23,7 +23,7 @@ var_dump(range(2147483647, 2147483645, 1 ));
 var_dump(range(2147483648, 2147483645, 1 ));
 
 ?>
---EXPECT--     
+--EXPECT--
 array(3) {
   [0]=>
   int(2147483400)

diff --git a/ext/standard/tests/array/bug41686.phpt b/ext/standard/tests/array/bug41686.phpt
index 74863f0d66d53344076ad9c49068daf948d2d161..08e1aaecb5095de4052bff7ebe0e306bd6f15e14 100644 (file)
--- a/ext/standard/tests/array/bug41686.phpt
+++ b/ext/standard/tests/array/bug41686.phpt
@@ -16,45 +16,7 @@ var_dump(
 
 echo "Done\n";
 ?>
---EXPECT--     
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-array(2) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(2) {
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-array(2) {
-  ["b"]=>
-  int(1)
-  ["c"]=>
-  int(2)
-}
-array(2) {
-  ["b"]=>
-  int(1)
-  ["c"]=>
-  int(2)
-}
-array(2) {
-  ["b"]=>
-  int(1)
-  ["c"]=>
-  int(2)
-}
-Done
---UEXPECT--
+--EXPECT--
 array(2) {
   [0]=>
   int(2)

diff --git a/ext/standard/tests/array/bug42233.phpt b/ext/standard/tests/array/bug42233.phpt
index c3d215bcd4a377fc8729b19dae9261d25ffb6d8a..f1dd4af45e3fa37ff53115edceda546200caceb2 100644 (file)
--- a/ext/standard/tests/array/bug42233.phpt
+++ b/ext/standard/tests/array/bug42233.phpt
@@ -18,20 +18,6 @@ var_dump($æøåäö);
 echo "Done.\n";
 ?>
 --EXPECT--
-array(3) {
-  ["a"]=>
-  string(1) "1"
-  ["æ"]=>
-  string(1) "2"
-  ["æøåäö"]=>
-  string(1) "3"
-}
-int(3)
-string(1) "1"
-string(1) "2"
-string(1) "3"
-Done.
---UEXPECT--
 array(3) {
   [u"a"]=>
   unicode(1) "1"

diff --git a/ext/standard/tests/array/bug42850.phpt b/ext/standard/tests/array/bug42850.phpt
index 8be97e4da36385650e461b08620ec57a5896d449..cb789b3255e3dc16d60671a69c5c273e4eb3f910 100644 (file)
--- a/ext/standard/tests/array/bug42850.phpt
+++ b/ext/standard/tests/array/bug42850.phpt
@@ -24,40 +24,6 @@ myfunc($data);
 var_dump($data);
 
 --EXPECT--
-array(2) {
-  ["key1"]=>
-  string(4) "val1"
-  [0]=>
-  array(1) {
-    ["key2"]=>
-    string(4) "val2"
-  }
-}
-array(2) {
-  ["key1"]=>
-  string(4) "val1"
-  [0]=>
-  array(1) {
-    ["key2"]=>
-    string(4) "val2"
-  }
-}
-array(2) {
-  ["key1"]=>
-  string(4) "val1"
-  [0]=>
-  string(7) "altered"
-}
-array(2) {
-  ["key1"]=>
-  string(4) "val1"
-  [0]=>
-  array(1) {
-    ["key2"]=>
-    string(4) "val2"
-  }
-}
---UEXPECT--
 array(2) {
   [u"key1"]=>
   unicode(4) "val1"

diff --git a/ext/standard/tests/array/bug43495.phpt b/ext/standard/tests/array/bug43495.phpt
index cd0fab141a3437dedd6a576202c49aafe773d788..8b8f3a6edb3bc89ffeeefdeb1714324e197006a7 100644 (file)
--- a/ext/standard/tests/array/bug43495.phpt
+++ b/ext/standard/tests/array/bug43495.phpt
@@ -17,5 +17,5 @@ $b["key1"]["key2"]["key3"] = null;
 echo "Done.\n";
 ?>
 --EXPECTF--
-Warning: array_merge_recursive(): recursion detected in %s/bug43495.php on line %d
+Warning: array_merge_recursive(): recursion detected in %sbug43495.php on line %d
 Done.

diff --git a/ext/standard/tests/array/bug43505.phpt b/ext/standard/tests/array/bug43505.phpt
index 90df7ca1d658832de6c6899145c1e8b480beb100..2ca872be530ceaea211467abfe5ce2a05c5c85b0 100644 (file)
--- a/ext/standard/tests/array/bug43505.phpt
+++ b/ext/standard/tests/array/bug43505.phpt
@@ -25,15 +25,6 @@ $b =& $a['test'];
 var_dump($a);
 ?>
 --EXPECT--
-array(1) {
-  ["test"]=>
-  &NULL
-}
-array(1) {
-  ["test"]=>
-  &NULL
-}
---UEXPECT--
 array(1) {
   [u"test"]=>
   &NULL

diff --git a/ext/standard/tests/array/bug43541.phpt b/ext/standard/tests/array/bug43541.phpt
index 2b3da44665eb58d658ba78dbbf2e61e18dcb1201..847f61ad2bb2c24be961011a01bf484622078bab 100644 (file)
--- a/ext/standard/tests/array/bug43541.phpt
+++ b/ext/standard/tests/array/bug43541.phpt
@@ -20,16 +20,3 @@ array(2) {
   [1]=>
   int(2)
 }
---UEXPECT--
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}

diff --git a/ext/standard/tests/array/compact.phpt b/ext/standard/tests/array/compact.phpt
index 635d353c1e11776ca1ba2a421906d5b891132a0d..d21f47982ed60fe680c3bdee9aa43350d48839d6 100644 (file)
--- a/ext/standard/tests/array/compact.phpt
+++ b/ext/standard/tests/array/compact.phpt
@@ -16,13 +16,6 @@ $result = compact("event", $location_vars);
 var_dump($result);
 ?>
 --EXPECT--
-array(2) {
-  ["event"]=>
-  string(8) "SIGGRAPH"
-  ["state"]=>
-  string(2) "CA"
-}
---UEXPECT--
 array(3) {
   [u"event"]=>
   unicode(8) "SIGGRAPH"
@@ -31,4 +24,3 @@ array(3) {
   [u"state"]=>
   unicode(2) "CA"
 }
-

diff --git a/ext/standard/tests/array/compact_basic.phpt b/ext/standard/tests/array/compact_basic.phpt
index 013b59fdc4bc4ac37aa568f19aedcbc3cf1ad3af..52ed040cac59d1188b8166fad68e78ef19ccd3e1 100644 (file)
--- a/ext/standard/tests/array/compact_basic.phpt
+++ b/ext/standard/tests/array/compact_basic.phpt
@@ -36,55 +36,6 @@ echo "Done";
 ?>
 --EXPECT--
 *** Testing compact() : basic functionality ***
-array(6) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  float(0.2)
-  ["c"]=>
-  bool(true)
-  ["d"]=>
-  array(1) {
-    ["key"]=>
-    string(3) "val"
-  }
-  ["e"]=>
-  NULL
-  ["f"]=>
-  string(6) "string"
-}
-array(6) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  float(0.2)
-  ["c"]=>
-  bool(true)
-  ["d"]=>
-  array(1) {
-    ["key"]=>
-    string(3) "val"
-  }
-  ["e"]=>
-  NULL
-  ["f"]=>
-  string(6) "string"
-}
-array(2) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  float(0.2)
-}
-array(0) {
-}
-array(0) {
-}
-array(0) {
-}
-Done
---UEXPECT--
-*** Testing compact() : basic functionality ***
 array(6) {
   [u"a"]=>
   int(1)
@@ -131,4 +82,4 @@ array(0) {
 }
 array(0) {
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/compact_variation1.phpt b/ext/standard/tests/array/compact_variation1.phpt
index c41126e732db3a6a37776aa0e6091fc7735c7b95..712ea738fd9c54316f8be84508d8aebadba25039 100644 (file)
--- a/ext/standard/tests/array/compact_variation1.phpt
+++ b/ext/standard/tests/array/compact_variation1.phpt
@@ -32,33 +32,6 @@ echo "Done";
 --EXPECTF--
 *** Testing compact() : usage variations  - arrays containg references ***
 
-Warning: compact(): recursion detected in %s on line %d
-array(1) {
-  ["a"]=>
-  int(1)
-}
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-array(2) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-}
-array(1) {
-  ["c"]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing compact() : usage variations  - arrays containg references ***
-
 Warning: compact(): recursion detected in %s on line %d
 array(1) {
   [u"a"]=>
@@ -82,4 +55,4 @@ array(1) {
   [u"c"]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/count_basic.phpt b/ext/standard/tests/array/count_basic.phpt
index 9c92d8c4646ec796bfe19bb8f03e06f84d59998d..e61fb81b583dda8204f99744e66db42f6f0bc760 100644 (file)
--- a/ext/standard/tests/array/count_basic.phpt
+++ b/ext/standard/tests/array/count_basic.phpt
@@ -31,7 +31,7 @@ var_dump(count($array_multi, 1));
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing count() : basic functionality ***
 
 -- One Dimensional Array: --
@@ -43,15 +43,3 @@ $mode = 0:               int(3)
 $mode = COUNT_RECURSIVE: int(6)
 $mode = 1:               int(6)
 Done
---UEXPECTF--
-*** Testing count() : basic functionality ***
-
--- One Dimensional Array: --
-int(3)
-
--- Two Dimensional Array: --
-$mode = COUNT_NORMAL:    int(3)
-$mode = 0:               int(3)
-$mode = COUNT_RECURSIVE: int(6)
-$mode = 1:               int(6)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/count_error.phpt b/ext/standard/tests/array/count_error.phpt
index 71636c6bf568eafcbf81a639955b4c2ecda13eab..d2be3c8e7a48f7355917b5373be4de23e10558c3 100644 (file)
--- a/ext/standard/tests/array/count_error.phpt
+++ b/ext/standard/tests/array/count_error.phpt
@@ -39,16 +39,3 @@ NULL
 Warning: count() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing count() : error conditions ***
-
--- Testing count() function with Zero arguments --
-
-Warning: count() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing count() function with more than expected no. of arguments --
-
-Warning: count() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/count_variation1.phpt b/ext/standard/tests/array/count_variation1.phpt
index 27a3119a02b2a6827eda29b716d4856dd94bd4b5..34294a553be97fa26545ed3dded93d7175f4311c 100644 (file)
--- a/ext/standard/tests/array/count_variation1.phpt
+++ b/ext/standard/tests/array/count_variation1.phpt
@@ -93,7 +93,7 @@ fclose($fp);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing count() : usage variations ***
 
 -- Iteration 1 --
@@ -168,78 +168,3 @@ int(0)
 -- Iteration 24 --
 int(1)
 Done
---UEXPECTF--
-*** Testing count() : usage variations ***
-
--- Iteration 1 --
-int(1)
-
--- Iteration 2 --
-int(1)
-
--- Iteration 3 --
-int(1)
-
--- Iteration 4 --
-int(1)
-
--- Iteration 5 --
-int(1)
-
--- Iteration 6 --
-int(1)
-
--- Iteration 7 --
-int(1)
-
--- Iteration 8 --
-int(1)
-
--- Iteration 9 --
-int(1)
-
--- Iteration 10 --
-int(0)
-
--- Iteration 11 --
-int(0)
-
--- Iteration 12 --
-int(1)
-
--- Iteration 13 --
-int(1)
-
--- Iteration 14 --
-int(1)
-
--- Iteration 15 --
-int(1)
-
--- Iteration 16 --
-int(1)
-
--- Iteration 17 --
-int(1)
-
--- Iteration 18 --
-int(1)
-
--- Iteration 19 --
-int(1)
-
--- Iteration 20 --
-int(1)
-
--- Iteration 21 --
-int(1)
-
--- Iteration 22 --
-int(0)
-
--- Iteration 23 --
-int(0)
-
--- Iteration 24 --
-int(1)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/count_variation2.phpt b/ext/standard/tests/array/count_variation2.phpt
index 10f490b4fc59f96312b186c3fccb928ed35f822f..1bcde5cd5d9f23905857719d4199481007f20ee2 100644 (file)
--- a/ext/standard/tests/array/count_variation2.phpt
+++ b/ext/standard/tests/array/count_variation2.phpt
@@ -146,95 +146,6 @@ int(3)
 
 -- Iteration 16 --
 
-Warning: count() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: count() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: count() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: count() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: count() expects parameter 2 to be long, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: count() expects parameter 2 to be long, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-int(3)
-
--- Iteration 23 --
-int(3)
-
--- Iteration 24 --
-
-Warning: count() expects parameter 2 to be long, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing count() : usage variations ***
-
--- Iteration 1 --
-int(3)
-
--- Iteration 2 --
-int(5)
-
--- Iteration 3 --
-int(3)
-
--- Iteration 4 --
-int(3)
-
--- Iteration 5 --
-int(3)
-
--- Iteration 6 --
-int(3)
-
--- Iteration 7 --
-int(3)
-
--- Iteration 8 --
-int(3)
-
--- Iteration 9 --
-int(3)
-
--- Iteration 10 --
-int(3)
-
--- Iteration 11 --
-int(3)
-
--- Iteration 12 --
-int(5)
-
--- Iteration 13 --
-int(3)
-
--- Iteration 14 --
-int(5)
-
--- Iteration 15 --
-int(3)
-
--- Iteration 16 --
-
 Warning: count() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 
@@ -273,4 +184,4 @@ int(3)
 
 Warning: count() expects parameter 2 to be long, resource given in %s on line %d
 NULL
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/count_variation3.phpt b/ext/standard/tests/array/count_variation3.phpt
index 36338103b43de20b9267a800215224e36328da89..e11b4c2449c1f888113f626ac5055314f8af3527 100644 (file)
--- a/ext/standard/tests/array/count_variation3.phpt
+++ b/ext/standard/tests/array/count_variation3.phpt
@@ -37,14 +37,3 @@ int(4)
 Warning: count(): recursion detected in %s on line %d
 int(12)
 Done
---UEXPECTF--
-*** Testing count() : usage variations ***
-
--- $mode not set: --
-int(4)
-
--- $mode = 1: --
-
-Warning: count(): recursion detected in %s on line %d
-int(12)
-Done

diff --git a/ext/standard/tests/array/current_basic.phpt b/ext/standard/tests/array/current_basic.phpt
index 7aa946379850d49e905e8f3a490fe324f7665067..adfe7da0532a1dd17f57c855b1cfcbf9ac33a18d 100644 (file)
--- a/ext/standard/tests/array/current_basic.phpt
+++ b/ext/standard/tests/array/current_basic.phpt
@@ -23,14 +23,7 @@ next($array);
 var_dump(current($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing current() : basic functionality ***
-string(4) "zero"
-string(3) "one"
-int(3)
-bool(false)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing current() : basic functionality ***
 unicode(4) "zero"
 unicode(3) "one"

diff --git a/ext/standard/tests/array/current_error.phpt b/ext/standard/tests/array/current_error.phpt
index d86b6087cc64f7d155527c1c4af9b348c746301f..d140ba6c8c926d7e2525c6c60b9a7ea77a8af182 100644 (file)
--- a/ext/standard/tests/array/current_error.phpt
+++ b/ext/standard/tests/array/current_error.phpt
@@ -38,16 +38,3 @@ NULL
 Warning: current() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 ===DONE===
---UEXPECTF--
-*** Testing current() : error conditions ***
-
--- Testing current() function with Zero arguments --
-
-Warning: current() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing current() function with more than expected no. of arguments --
-
-Warning: current() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===

diff --git a/ext/standard/tests/array/current_variation1.phpt b/ext/standard/tests/array/current_variation1.phpt
index 0f28d0749df34a2853aebd40fbe24d4086667dc0..24accd4a6f17a627ef0c39bdf03756c100c1b345 100644 (file)
--- a/ext/standard/tests/array/current_variation1.phpt
+++ b/ext/standard/tests/array/current_variation1.phpt
@@ -174,129 +174,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 19 --
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: current() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: current() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: current() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-===DONE===
---UEXPECTF--
-*** Testing current() : usage variations ***
-
--- Iteration 1 --
-
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: current() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: current() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: current() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: current() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: current() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/current_variation2.phpt b/ext/standard/tests/array/current_variation2.phpt
index 60ef11dcf07c40427c4facb5ab3b76f7cbade2d4..16504c6ef684be1d549a03a4818d5360f36fe358 100644 (file)
--- a/ext/standard/tests/array/current_variation2.phpt
+++ b/ext/standard/tests/array/current_variation2.phpt
@@ -131,43 +131,6 @@ NULL
 -- Iteration 4 : bool data --
 bool(true)
 
--- Iteration 5 : empty string data --
-string(0) ""
-
--- Iteration 6 : empty array data --
-bool(false)
-
--- Iteration 7 : string data --
-string(6) "string"
-
--- Iteration 8 : object data --
-object(classA)#%d (0) {
-}
-
--- Iteration 9 : undefined data --
-NULL
-
--- Iteration 10 : unset data --
-NULL
-
--- Iteration 11 : resource data --
-resource(%d) of type (stream)
-===DONE===
---UEXPECTF--
-*** Testing current() : usage variations ***
-
--- Iteration 1 : int data --
-int(0)
-
--- Iteration 2 : float data --
-float(10.5)
-
--- Iteration 3 : null data --
-NULL
-
--- Iteration 4 : bool data --
-bool(true)
-
 -- Iteration 5 : empty string data --
 unicode(0) ""
 

diff --git a/ext/standard/tests/array/current_variation3.phpt b/ext/standard/tests/array/current_variation3.phpt
index cb84b19b2aa38161feac1574521c51b9bb1bc9a3..1cfd802a56234274b22fd4338a948faf0c30d42d 100644 (file)
--- a/ext/standard/tests/array/current_variation3.phpt
+++ b/ext/standard/tests/array/current_variation3.phpt
@@ -30,17 +30,7 @@ echo "\$array2: ";
 var_dump(current($array2));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing current() : usage variations ***
-
--- Initial position of internal pointer --
-string(4) "zero"
-
--- Position after calling next() --
-$array1: string(3) "one"
-$array2: string(3) "one"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing current() : usage variations ***
 
 -- Initial position of internal pointer --

diff --git a/ext/standard/tests/array/current_variation4.phpt b/ext/standard/tests/array/current_variation4.phpt
index 39ac2a83634575ade273e229427fd4b123a3533b..5f42fa45de653cae2ed59a1903ac24fb6ee04f63 100644 (file)
--- a/ext/standard/tests/array/current_variation4.phpt
+++ b/ext/standard/tests/array/current_variation4.phpt
@@ -46,30 +46,7 @@ var_dump(current($multi_array[3][3][3]));
 var_dump(current($multi_array[3][3][3][1]));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing current() : usage variations ***
-
--- Two Dimensional Array --
-Initial Position: string(4) "zero"
-Next Position:    array(3) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-}
-End Position:     string(3) "two"
-
--- Access an Array Within an Array --
-Initial Position: int(1)
-
--- Recursive, Multidimensional Array --
-Current Position: string(3) "two"
-string(3) "two"
-int(1)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing current() : usage variations ***
 
 -- Two Dimensional Array --

diff --git a/ext/standard/tests/array/each.phpt b/ext/standard/tests/array/each.phpt
index 84d0dd6a1dbee33171eb099aec29fec79e38b95f..edbdde072758a654cbc90796a42e00f1ace04f1d 100644 (file)
Binary files a/ext/standard/tests/array/each.phpt and b/ext/standard/tests/array/each.phpt differ

diff --git a/ext/standard/tests/array/each_basic.phpt b/ext/standard/tests/array/each_basic.phpt
index 96d199c7d349c3ffbad6181338dca07c7d2f74f1..e9c05d50772ac06b2e700261e096b4d256e42415 100644 (file)
--- a/ext/standard/tests/array/each_basic.phpt
+++ b/ext/standard/tests/array/each_basic.phpt
@@ -30,49 +30,7 @@ var_dump(each($arr));
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing each() : basic functionality ***
-
--- Passed array: --
-array(4) {
-  ["one"]=>
-  int(1)
-  [0]=>
-  string(4) "zero"
-  ["two"]=>
-  string(4) "deux"
-  [20]=>
-  string(6) "twenty"
-}
-
--- Initial position: --
-array(4) {
-  [1]=>
-  int(1)
-  ["value"]=>
-  int(1)
-  [0]=>
-  string(3) "one"
-  ["key"]=>
-  string(3) "one"
-}
-
--- End position: --
-array(4) {
-  [1]=>
-  string(6) "twenty"
-  ["value"]=>
-  string(6) "twenty"
-  [0]=>
-  int(20)
-  ["key"]=>
-  int(20)
-}
-
--- Passed the end of array: --
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing each() : basic functionality ***
 
 -- Passed array: --
@@ -113,4 +71,4 @@ array(4) {
 
 -- Passed the end of array: --
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/each_error.phpt b/ext/standard/tests/array/each_error.phpt
index 7c39b9e77ddd70756ee26b2f33856c1503573e12..08a127737cbe010033ed009e2bcc9ad7aae74a69 100644 (file)
--- a/ext/standard/tests/array/each_error.phpt
+++ b/ext/standard/tests/array/each_error.phpt
@@ -40,16 +40,3 @@ NULL
 Warning: Wrong parameter count for each() in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing each() : error conditions ***
-
--- Testing each() function with Zero arguments --
-
-Warning: Wrong parameter count for each() in %s on line %d
-NULL
-
--- Testing each() function with more than expected no. of arguments --
-
-Warning: Wrong parameter count for each() in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/each_variation1.phpt b/ext/standard/tests/array/each_variation1.phpt
index 9b0011211beb485cbe240942017394c9f62aa82d..0afef31432512f739dcc9ced88c0cbe77796bce7 100644 (file)
--- a/ext/standard/tests/array/each_variation1.phpt
+++ b/ext/standard/tests/array/each_variation1.phpt
@@ -220,128 +220,3 @@ NULL
 Warning: Variable passed to each() is not an array or object in %s on line %d
 NULL
 Done
-
---UEXPECTF--
-*** Testing each() : usage variations ***
-
--- Iteration 1 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 18 --
-bool(false)
-
--- Iteration 19 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 22 --
-bool(false)
-
--- Iteration 23 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: Variable passed to each() is not an array or object in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/each_variation2.phpt b/ext/standard/tests/array/each_variation2.phpt
index 9031b43567c131a47762f33427037b8afda2c60c..fbb5feebfe3fafb7ae91801db5d23ff4bddf060d 100644 (file)
--- a/ext/standard/tests/array/each_variation2.phpt
+++ b/ext/standard/tests/array/each_variation2.phpt
@@ -121,134 +121,6 @@ echo "Done";
 --EXPECTF--
 *** Testing each() : usage variations ***
 
--- Iteration 1: int data --
-array(4) {
-  [1]=>
-  int(0)
-  ["value"]=>
-  int(0)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 2: float data --
-array(4) {
-  [1]=>
-  float(10.5)
-  ["value"]=>
-  float(10.5)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 3: null data --
-array(4) {
-  [1]=>
-  NULL
-  ["value"]=>
-  NULL
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 4: bool data --
-array(4) {
-  [1]=>
-  bool(true)
-  ["value"]=>
-  bool(true)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 5: empty string data --
-array(4) {
-  [1]=>
-  string(0) ""
-  ["value"]=>
-  string(0) ""
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 6: empty array data --
-bool(false)
-
--- Iteration 7: string data --
-array(4) {
-  [1]=>
-  string(6) "string"
-  ["value"]=>
-  string(6) "string"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 8: object data --
-array(4) {
-  [1]=>
-  object(classA)#%d (0) {
-  }
-  ["value"]=>
-  object(classA)#%d (0) {
-  }
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 9: undefined data --
-array(4) {
-  [1]=>
-  NULL
-  ["value"]=>
-  NULL
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 10: unset data --
-array(4) {
-  [1]=>
-  NULL
-  ["value"]=>
-  NULL
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 11: resource data --
-array(4) {
-  [1]=>
-  resource(%d) of type (stream)
-  ["value"]=>
-  resource(%d) of type (stream)
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-Done
---UEXPECTF--
-*** Testing each() : usage variations ***
-
 -- Iteration 1: int data --
 array(4) {
   [1]=>
@@ -373,4 +245,4 @@ array(4) {
   [u"key"]=>
   int(0)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/each_variation3.phpt b/ext/standard/tests/array/each_variation3.phpt
index 8814a80637300351d226c46de01c66cc2f7ff678..ff1791aa714dba988725b0bb2c17f3c8665ad5a7 100644 (file)
--- a/ext/standard/tests/array/each_variation3.phpt
+++ b/ext/standard/tests/array/each_variation3.phpt
@@ -104,154 +104,7 @@ foreach($inputs as $key => $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing each() : usage variations ***
-
--- Iteration 1: int data --
-array(4) {
-  [1]=>
-  string(4) "zero"
-  ["value"]=>
-  string(4) "zero"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- Iteration 2: float data --
-array(4) {
-  [1]=>
-  string(8) "positive"
-  ["value"]=>
-  string(8) "positive"
-  [0]=>
-  int(10)
-  ["key"]=>
-  int(10)
-}
-
--- Iteration 3: extreme floats data --
-array(4) {
-  [1]=>
-  string(5) "large"
-  ["value"]=>
-  string(5) "large"
-  [0]=>
-  int(12345678)
-  ["key"]=>
-  int(12345678)
-}
-
--- Iteration 4: null uppercase data --
-array(4) {
-  [1]=>
-  string(6) "null 1"
-  ["value"]=>
-  string(6) "null 1"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-
--- Iteration 5: null lowercase data --
-array(4) {
-  [1]=>
-  string(6) "null 2"
-  ["value"]=>
-  string(6) "null 2"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-
--- Iteration 6: bool lowercase data --
-array(4) {
-  [1]=>
-  string(6) "lowert"
-  ["value"]=>
-  string(6) "lowert"
-  [0]=>
-  int(1)
-  ["key"]=>
-  int(1)
-}
-
--- Iteration 7: bool uppercase data --
-array(4) {
-  [1]=>
-  string(6) "uppert"
-  ["value"]=>
-  string(6) "uppert"
-  [0]=>
-  int(1)
-  ["key"]=>
-  int(1)
-}
-
--- Iteration 8: empty double quotes data --
-array(4) {
-  [1]=>
-  string(6) "emptyd"
-  ["value"]=>
-  string(6) "emptyd"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-
--- Iteration 9: empty single quotes data --
-array(4) {
-  [1]=>
-  string(6) "emptys"
-  ["value"]=>
-  string(6) "emptys"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-
--- Iteration 10: string data --
-array(4) {
-  [1]=>
-  string(7) "stringd"
-  ["value"]=>
-  string(7) "stringd"
-  [0]=>
-  string(7) "stringd"
-  ["key"]=>
-  string(7) "stringd"
-}
-
--- Iteration 11: undefined data --
-array(4) {
-  [1]=>
-  string(9) "undefined"
-  ["value"]=>
-  string(9) "undefined"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-
--- Iteration 12: unset data --
-array(4) {
-  [1]=>
-  string(5) "unset"
-  ["value"]=>
-  string(5) "unset"
-  [0]=>
-  string(0) ""
-  ["key"]=>
-  string(0) ""
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing each() : usage variations ***
 
 -- Iteration 1: int data --
@@ -397,4 +250,4 @@ array(4) {
   [u"key"]=>
   unicode(0) ""
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/each_variation4.phpt b/ext/standard/tests/array/each_variation4.phpt
index 1ddb8f36dc404a6d16e4a1515614fbf06421e8c7..765159441bcbd30872788118ac4654e742dced61 100644 (file)
--- a/ext/standard/tests/array/each_variation4.phpt
+++ b/ext/standard/tests/array/each_variation4.phpt
@@ -42,55 +42,6 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing each() : usage variations ***
 
--- Array made up of referenced variables: --
--- Call each until at the end of the array: --
-array(4) {
-  [1]=>
-  string(3) "foo"
-  ["value"]=>
-  string(3) "foo"
-  [0]=>
-  string(3) "one"
-  ["key"]=>
-  string(3) "one"
-}
-array(4) {
-  [1]=>
-  string(3) "bar"
-  ["value"]=>
-  string(3) "bar"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-bool(false)
-
--- Pass an array by reference to each(): --
-array(4) {
-  [1]=>
-  string(4) "zero"
-  ["value"]=>
-  string(4) "zero"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
--- Check original array: --
-array(3) {
-  [0]=>
-  string(4) "zero"
-  [1]=>
-  string(3) "one"
-  [2]=>
-  string(3) "two"
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing each() : usage variations ***
-
 -- Array made up of referenced variables: --
 -- Call each until at the end of the array: --
 array(4) {

diff --git a/ext/standard/tests/array/each_variation5.phpt b/ext/standard/tests/array/each_variation5.phpt
index 13c2a42b39f7cdf02616609bfbeeeb322967b711..09bf3f4f6da270c89d6ba029f1b49d9b602dfa4e 100644 (file)
--- a/ext/standard/tests/array/each_variation5.phpt
+++ b/ext/standard/tests/array/each_variation5.phpt
@@ -33,68 +33,7 @@ var_dump( each($arr[2]));
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing each() : usage variations ***
-
--- Pass each() a two-dimensional array --
-array(4) {
-  [1]=>
-  string(4) "zero"
-  ["value"]=>
-  string(4) "zero"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-array(4) {
-  [1]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  ["value"]=>
-  array(3) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-  }
-  [0]=>
-  int(1)
-  ["key"]=>
-  int(1)
-}
-array(4) {
-  [1]=>
-  string(2) "un"
-  ["value"]=>
-  string(2) "un"
-  [0]=>
-  string(3) "one"
-  ["key"]=>
-  string(3) "one"
-}
-
--- Pass each() a sub-array --
-array(4) {
-  [1]=>
-  string(1) "a"
-  ["value"]=>
-  string(1) "a"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing each() : usage variations ***
 
 -- Pass each() a two-dimensional array --
@@ -154,4 +93,4 @@ array(4) {
   [u"key"]=>
   int(0)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/each_variation6.phpt b/ext/standard/tests/array/each_variation6.phpt
index 267ad14ddf93c04c8202d5c8f9bacc085cd692ee..5fa5460188d54e970483f380255ad6cefa58e98e 100644 (file)
--- a/ext/standard/tests/array/each_variation6.phpt
+++ b/ext/standard/tests/array/each_variation6.phpt
@@ -28,28 +28,7 @@ echo key($arr) . " => " . current($arr) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing each() : usage variations ***
-
--- Current position: --
-0 => zero
-
--- Call to each(): --
-array(4) {
-  [1]=>
-  string(4) "zero"
-  ["value"]=>
-  string(4) "zero"
-  [0]=>
-  int(0)
-  ["key"]=>
-  int(0)
-}
-
--- New position: --
-1 => one
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing each() : usage variations ***
 
 -- Current position: --
@@ -69,4 +48,4 @@ array(4) {
 
 -- New position: --
 1 => one
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/end.phpt b/ext/standard/tests/array/end.phpt
index f87593e122de8c0a0999cea98ae28acef21703f4..0406da0f739277bca3cab493c0b3afb3dd0f93cb 100644 (file)
--- a/ext/standard/tests/array/end.phpt
+++ b/ext/standard/tests/array/end.phpt
@@ -139,112 +139,6 @@ int(0)
 int(100)
 int(100)
 -- Iteration 3 --
-string(1) "y"
-string(1) "y"
--- Iteration 4 --
-NULL
-NULL
--- Iteration 5 --
-int(5)
-int(5)
--- Iteration 6 --
-float(-0.9)
-float(-0.9)
--- Iteration 7 --
-float(-4.9999999)
-float(-4.9999999)
--- Iteration 8 --
-bool(false)
-bool(false)
--- Iteration 9 --
-string(3) "SOA"
-string(3) "SOA"
--- Iteration 10 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 11 --
-string(0) ""
-string(0) ""
--- Iteration 12 --
-string(1) " "
-string(1) " "
--- Iteration 13 --
-float(-2147483648)
-float(-2147483648)
--- Iteration 14 --
-float(-2147483648)
-float(-2147483648)
--- Iteration 15 --
-float(2)
-float(2)
-
-*** Testing end() with sub-arrays ***
-array(3) {
-  [1]=>
-  string(3) "one"
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(1) "f"
-}
-string(1) "f"
-
-*** Testing end() when array elements are deleted ***
-
--- Remove first element from array --
-string(7) "neg.008"
-
--- Remove last element from array --
-int(-4)
-int(-4)
-
--- Remove any element from array apart from first and last element --
-int(-4)
-string(1) "b"
-int(-4)
-
-*** Testing end() on objects ***
-object(foo1)#%d (0) {
-}
-array(2) {
-  [0]=>
-  &object(foo)#%d (0) {
-  }
-  [1]=>
-  &object(foo1)#%d (0) {
-  }
-}
-
-*** Testing end() on resource type ***
-resource(%d) of type (stream)
-resource(%d) of type (stream)
-
-*** Testing error conditions ***
-
-Warning: end() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-bool(false)
-Done
---UEXPECTF--
-*** Testing end() on different arrays ***
--- Iteration 1 --
-int(0)
-int(0)
--- Iteration 2 --
-int(100)
-int(100)
--- Iteration 3 --
 unicode(1) "y"
 unicode(1) "y"
 -- Iteration 4 --

diff --git a/ext/standard/tests/array/end_64bit.phpt b/ext/standard/tests/array/end_64bit.phpt
index 2fceafefbbcdfa94190f7c61d0d1e3cb950f5d43..dafea1cde0ca4f6f66956f5d17fa434a45418f16 100644 (file)
--- a/ext/standard/tests/array/end_64bit.phpt
+++ b/ext/standard/tests/array/end_64bit.phpt
@@ -139,112 +139,6 @@ int(0)
 int(100)
 int(100)
 -- Iteration 3 --
-string(1) "y"
-string(1) "y"
--- Iteration 4 --
-NULL
-NULL
--- Iteration 5 --
-int(5)
-int(5)
--- Iteration 6 --
-float(-0.9)
-float(-0.9)
--- Iteration 7 --
-float(-4.9999999)
-float(-4.9999999)
--- Iteration 8 --
-bool(false)
-bool(false)
--- Iteration 9 --
-string(3) "SOA"
-string(3) "SOA"
--- Iteration 10 --
-array(0) {
-}
-array(0) {
-}
--- Iteration 11 --
-string(0) ""
-string(0) ""
--- Iteration 12 --
-string(1) " "
-string(1) " "
--- Iteration 13 --
-int(-2147483648)
-int(-2147483648)
--- Iteration 14 --
-int(-2147483648)
-int(-2147483648)
--- Iteration 15 --
-float(2)
-float(2)
-
-*** Testing end() with sub-arrays ***
-array(3) {
-  [1]=>
-  string(3) "one"
-  ["two"]=>
-  int(2)
-  [""]=>
-  string(1) "f"
-}
-string(1) "f"
-
-*** Testing end() when array elements are deleted ***
-
--- Remove first element from array --
-string(7) "neg.008"
-
--- Remove last element from array --
-int(-4)
-int(-4)
-
--- Remove any element from array apart from first and last element --
-int(-4)
-string(1) "b"
-int(-4)
-
-*** Testing end() on objects ***
-object(foo1)#%d (0) {
-}
-array(2) {
-  [0]=>
-  &object(foo)#%d (0) {
-  }
-  [1]=>
-  &object(foo1)#%d (0) {
-  }
-}
-
-*** Testing end() on resource type ***
-resource(%d) of type (stream)
-resource(%d) of type (stream)
-
-*** Testing error conditions ***
-
-Warning: end() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
-Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-bool(false)
-Done
---UEXPECTF--
-*** Testing end() on different arrays ***
--- Iteration 1 --
-int(0)
-int(0)
--- Iteration 2 --
-int(100)
-int(100)
--- Iteration 3 --
 unicode(1) "y"
 unicode(1) "y"
 -- Iteration 4 --

diff --git a/ext/standard/tests/array/end_basic.phpt b/ext/standard/tests/array/end_basic.phpt
index 2e42fc092352301977a14c90144dc8334fb67793..56f037ab2ff2956f6a6d7cc2c2ba4a6a6acf4d62 100644 (file)
--- a/ext/standard/tests/array/end_basic.phpt
+++ b/ext/standard/tests/array/end_basic.phpt
@@ -29,22 +29,7 @@ $array[2] = 'foo';
 var_dump(end($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing end() : basic functionality ***
-
--- Initial Position: --
-0 => zero
-
--- Call to end() --
-string(3) "two"
-
--- Current Position: --
-200 => two
-
--- Add a new element to array --
-string(3) "foo"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing end() : basic functionality ***
 
 -- Initial Position: --

diff --git a/ext/standard/tests/array/end_error.phpt b/ext/standard/tests/array/end_error.phpt
index 284433c89575084079b352d26ce13514a639b946..96e8429558817f21cd2cb5b3ebc3ffbdb0544ac5 100644 (file)
--- a/ext/standard/tests/array/end_error.phpt
+++ b/ext/standard/tests/array/end_error.phpt
@@ -37,16 +37,3 @@ NULL
 Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 ===DONE===
---UEXPECTF--
-*** Testing end() : error conditions ***
-
--- Testing end() function with Zero arguments --
-
-Warning: end() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing end() function with more than expected no. of arguments --
-
-Warning: end() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===

diff --git a/ext/standard/tests/array/end_variation1.phpt b/ext/standard/tests/array/end_variation1.phpt
index eaf63efb09dc8501ee60bcdb97adb64818512ec5..5ad896109f834be0eb0a3fd3425868b0ede67fc0 100644 (file)
--- a/ext/standard/tests/array/end_variation1.phpt
+++ b/ext/standard/tests/array/end_variation1.phpt
@@ -174,132 +174,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-bool(false)
-
--- Iteration 19 --
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: end() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: end() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: end() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: end() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: end() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-===DONE===
---UEXPECTF--
-*** Testing end() : usage variations ***
-
--- Iteration 1 --
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: end() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: end() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: end() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: end() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: end() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: end() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: end() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: end() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: end() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: end() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/end_variation2.phpt b/ext/standard/tests/array/end_variation2.phpt
index e1636fa8667de5197faba8086e196a1fc0d03f74..ea9c336ac0ff9aae314aa15f082f16b3280c199b 100644 (file)
--- a/ext/standard/tests/array/end_variation2.phpt
+++ b/ext/standard/tests/array/end_variation2.phpt
@@ -25,23 +25,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n";
 var_dump(end($array_arg[0]));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing end() : usage variations ***
-
--- Pass a two-dimensional array as $array_arg --
-array(3) {
-  [0]=>
-  int(9)
-  [1]=>
-  int(8)
-  [2]=>
-  int(7)
-}
-
--- Pass a sub-array as $array_arg --
-int(7)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing end() : usage variations ***
 
 -- Pass a two-dimensional array as $array_arg --

diff --git a/ext/standard/tests/array/end_variation3.phpt b/ext/standard/tests/array/end_variation3.phpt
index ac95fe3f0ec3550ef362b3bcf5d8f199ed083b24..0a8334294999018b1781cc3a253cf22f28147160 100644 (file)
--- a/ext/standard/tests/array/end_variation3.phpt
+++ b/ext/standard/tests/array/end_variation3.phpt
@@ -29,17 +29,7 @@ echo "\$array2: ";
 var_dump(current($array2));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing end() : usage variations ***
-
--- Initial position of internal pointer --
-string(4) "zero"
-
--- Position after calling end() --
-$array1: string(3) "two"
-$array2: string(3) "two"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing end() : usage variations ***
 
 -- Initial position of internal pointer --

diff --git a/ext/standard/tests/array/extract_error.phpt b/ext/standard/tests/array/extract_error.phpt
index 52fbc4b1608abf3637dac974a27fae383faf78f3..55aa8af8e8fb121349588312118d65b11a6ee4bc 100644 (file)
--- a/ext/standard/tests/array/extract_error.phpt
+++ b/ext/standard/tests/array/extract_error.phpt
@@ -48,32 +48,6 @@ NULL
 Warning: extract() expects parameter 1 to be array, integer given in %s on line %d
 NULL
 
-Warning: extract() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
-Warning: extract() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
-Warning: extract(): specified extract type requires the prefix parameter in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing Error Conditions ***
-
-Warning: extract() expects at least 1 parameter, 0 given in %s on line %d
-NULL
-
-Notice: A non well formed numeric value encountered in %s on line %d
-
-Warning: extract(): Invalid extract type in %s on line %d
-NULL
-
-Warning: extract(): Invalid extract type in %s on line %d
-NULL
-
-Warning: extract() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
 Warning: extract() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/extract_variation1.phpt b/ext/standard/tests/array/extract_variation1.phpt
index 2a4b3582149fef1d9661bc34b7e4a148e9957f69..448be723a604691c1d67cd2288f7955fa98e3c1d 100644 (file)
--- a/ext/standard/tests/array/extract_variation1.phpt
+++ b/ext/standard/tests/array/extract_variation1.phpt
@@ -17,15 +17,7 @@ debug_zval_dump($str);
 echo "\nDone";
 ?>
 
---EXPECTF--
-long(4) refcount(2)
-string(4) "John" refcount(2)
-int(%d)
-long(4) refcount(2)
-string(4) "John" refcount(2)
-
-Done
---UEXPECTF--
+--EXPECT--
 long(4) refcount(2)
 unicode(4) "John" { 004a 006f 0068 006e } refcount(2)
 int(10)

diff --git a/ext/standard/tests/array/extract_variation2.phpt b/ext/standard/tests/array/extract_variation2.phpt
index 570e75f0761b03d37862f76e16e4c69c35d54c24..5483fa0c9d1e060f97fa8940db93d95a9abfc412 100644 (file)
--- a/ext/standard/tests/array/extract_variation2.phpt
+++ b/ext/standard/tests/array/extract_variation2.phpt
@@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 0 --
 int(0)
 int(0)

diff --git a/ext/standard/tests/array/extract_variation3.phpt b/ext/standard/tests/array/extract_variation3.phpt
index 2dcb775fe71eea293229b5738127136b9fbc5830..1a6a088646f9b57231c9b58f6e6a0cee9cfd6f8e 100644 (file)
--- a/ext/standard/tests/array/extract_variation3.phpt
+++ b/ext/standard/tests/array/extract_variation3.phpt
@@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 0 --
 int(0)
 int(0)

diff --git a/ext/standard/tests/array/extract_variation4.phpt b/ext/standard/tests/array/extract_variation4.phpt
index 11528f4b87132cfec080d374d54fcaeb182260b6..31adb6e814cccaf847ec3594bf13d80cbf0721b3 100644 (file)
--- a/ext/standard/tests/array/extract_variation4.phpt
+++ b/ext/standard/tests/array/extract_variation4.phpt
@@ -33,7 +33,7 @@ foreach ( $mixed_array as $sub_array ) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 0 --
 int(0)
 int(0)

diff --git a/ext/standard/tests/array/extract_variation5.phpt b/ext/standard/tests/array/extract_variation5.phpt
index 4a3e95bbb74b0ccdd0232b40abe57a5cff501e86..f4455e9e579a844a24f492a720909e66fc29a989 100644 (file)
--- a/ext/standard/tests/array/extract_variation5.phpt
+++ b/ext/standard/tests/array/extract_variation5.phpt
@@ -32,7 +32,7 @@ foreach ( $mixed_array as $sub_array ) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 -- Iteration 0 --
 int(0)
 int(0)

diff --git a/ext/standard/tests/array/extract_variation6.phpt b/ext/standard/tests/array/extract_variation6.phpt
index b57b173474693f7a9a27ed4e42630e0300f12b5b..68a85dcbe50b96db9911308a50802284a4bacb3f 100644 (file)
--- a/ext/standard/tests/array/extract_variation6.phpt
+++ b/ext/standard/tests/array/extract_variation6.phpt
@@ -16,17 +16,7 @@ var_dump($a);
 
 echo "Done\n";
 ?>
---EXPECTF--
-int(1)
-string(3) "aaa"
-int(1)
-string(3) "bbb"
-array(1) {
-  ["foo"]=>
-  &string(3) "bbb"
-}
-Done
---UEXPECTF--
+--EXPECT--
 int(1)
 unicode(3) "aaa"
 int(1)

diff --git a/ext/standard/tests/array/extract_variation7.phpt b/ext/standard/tests/array/extract_variation7.phpt
index 653941dc9b98e96b48d140587953b60831cf64a6..8104450df2c50cc579866ec311485d03bd6b71e2 100644 (file)
--- a/ext/standard/tests/array/extract_variation7.phpt
+++ b/ext/standard/tests/array/extract_variation7.phpt
@@ -15,7 +15,7 @@ var_dump ( extract($b, EXTR_PREFIX_ALL, "diff"));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing for EXTR_PREFIX_ALL called twice with same prefix string ***
 int(5)
 int(11)

diff --git a/ext/standard/tests/array/extract_variation8.phpt b/ext/standard/tests/array/extract_variation8.phpt
index 0d15fd494e79a6eeb7ad3f71306129ff4066f796..de9271a1cb65243cb43a090abdcdac138baddbd7 100644 (file)
--- a/ext/standard/tests/array/extract_variation8.phpt
+++ b/ext/standard/tests/array/extract_variation8.phpt
@@ -18,7 +18,7 @@ var_dump ( extract($var1));
 echo "\nDone";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing for Numerical prefixes ***
 int(3)
 int(1)

diff --git a/ext/standard/tests/array/extract_variation9.phpt b/ext/standard/tests/array/extract_variation9.phpt
index 9d1db4cc7b357b96c5762036b21d8945d24a9148..4d42a697624732129b4456dbc59d90106839bf56 100644 (file)
--- a/ext/standard/tests/array/extract_variation9.phpt
+++ b/ext/standard/tests/array/extract_variation9.phpt
@@ -14,7 +14,7 @@ var_dump ( extract(get_object_vars($A),EXTR_REFS));
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing for object ***
 int(1)
 Done

diff --git a/ext/standard/tests/array/in_array_errors.phpt b/ext/standard/tests/array/in_array_errors.phpt
index cc27c1e4bdaf8d3d6ebbb0f21a8ef13eaa896181..33e6d8cbbd881eabeb0d5252609fbe0e4fd5a35d 100644 (file)
--- a/ext/standard/tests/array/in_array_errors.phpt
+++ b/ext/standard/tests/array/in_array_errors.phpt
@@ -37,24 +37,6 @@ NULL
 Warning: in_array() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 
-Warning: in_array() expects parameter 2 to be array, string given in %s on line %d
-NULL
-
-Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing error conditions of in_array() ***
-
-Warning: in_array() expects at least 2 parameters, 0 given in %s on line %d
-NULL
-
-Warning: in_array() expects at most 3 parameters, 4 given in %s on line %d
-NULL
-
-Warning: in_array() expects at least 2 parameters, 1 given in %s on line %d
-NULL
-
 Warning: in_array() expects parameter 2 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/in_array_variation1.phpt b/ext/standard/tests/array/in_array_variation1.phpt
index 0e1cf7fde27c5b68aa5991a1c7895d4021a973b3..45f18d0a10510a9bc31083a0fc6d35343e9b492b 100644 (file)
--- a/ext/standard/tests/array/in_array_variation1.phpt
+++ b/ext/standard/tests/array/in_array_variation1.phpt
@@ -61,586 +61,7 @@ foreach($arrays as $array) {
                
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing in_array() with different needle values ***
--- Iteration 1 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 2 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 3 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 4 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 5 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 6 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 7 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 8 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 9 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 10 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 11 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 12 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 13 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 14 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 15 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 16 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 17 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 18 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 19 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 20 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 21 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 22 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 23 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 24 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 25 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 26 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 27 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 28 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 29 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 30 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 31 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 32 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 33 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 34 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 35 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 36 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 37 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 38 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 39 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 40 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 41 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 42 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 43 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 44 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 45 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 46 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 47 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 48 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 49 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 50 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 51 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 52 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 53 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 54 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 55 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 56 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 57 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 58 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 59 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 60 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 61 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 62 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 63 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 64 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 65 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 66 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 67 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 68 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 69 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 70 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 71 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 72 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 73 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 74 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 75 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 76 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 77 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 78 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 79 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 80 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 81 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 82 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 83 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 84 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 85 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 86 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 87 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 88 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 89 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 90 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 91 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 92 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 93 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 94 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 95 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 96 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 97 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 98 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 99 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 100 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 101 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 102 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 103 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 104 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 105 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 106 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 107 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 108 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 109 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 110 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 111 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 112 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 113 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 114 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 115 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 116 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 117 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 118 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 119 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 120 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 121 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 122 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 123 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 124 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 125 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 126 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 127 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 128 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 129 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 130 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 131 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 132 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 133 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 134 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 135 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 136 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 137 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 138 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 139 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 140 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 141 --
-bool(false)
-bool(false)
-bool(false)
--- Iteration 142 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 143 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 144 --
-bool(false)
-bool(false)
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing in_array() with different needle values ***
 -- Iteration 1 --
 bool(false)

diff --git a/ext/standard/tests/array/in_array_variation2.phpt b/ext/standard/tests/array/in_array_variation2.phpt
index d70da2d6ceafb068f06b77ae1bfcd3f5692e6b31..1f42bb3f0700924e8ad942e13d5edb9e874758b9 100644 (file)
--- a/ext/standard/tests/array/in_array_variation2.phpt
+++ b/ext/standard/tests/array/in_array_variation2.phpt
@@ -49,58 +49,7 @@ foreach($array_type as $type) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing in_array() with different haystack values ***
--- Iteration 1 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 2 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 3 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 4 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 5 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 6 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 7 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 8 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 9 --
-bool(true)
-bool(true)
-bool(true)
--- Iteration 10 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 11 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 12 --
-bool(true)
-bool(true)
-bool(true)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing in_array() with different haystack values ***
 -- Iteration 1 --
 bool(true)

diff --git a/ext/standard/tests/array/in_array_variation3.phpt b/ext/standard/tests/array/in_array_variation3.phpt
index 7e56c5271762206bf3703c4d1317ca0177c5f79b..c8b6445cd166abe52c7cdc0d2ae6f24d214cbd67 100644 (file)
--- a/ext/standard/tests/array/in_array_variation3.phpt
+++ b/ext/standard/tests/array/in_array_variation3.phpt
@@ -59,18 +59,3 @@ Warning: in_array() expects parameter 2 to be array, object given in %s on line
 NULL
 bool(true)
 Done
---UEXPECTF--
-*** Testing sub-arrays with in_array() ***
-bool(true)
-bool(true)
-bool(true)
-
-*** Testing objects with in_array() ***
-
-Warning: in_array() expects parameter 2 to be array, object given in %s on line %d
-NULL
-
-Warning: in_array() expects parameter 2 to be array, object given in %s on line %d
-NULL
-bool(true)
-Done

diff --git a/ext/standard/tests/array/in_array_variation4.phpt b/ext/standard/tests/array/in_array_variation4.phpt
index 625ce6311a82d12b37d0bd7083caf455edd85c56..6ab416f7b71d47c5846cb6874fda8fe10439fc6e 100644 (file)
--- a/ext/standard/tests/array/in_array_variation4.phpt
+++ b/ext/standard/tests/array/in_array_variation4.phpt
@@ -58,24 +58,7 @@ var_dump( in_array('123abc', array(123), TRUE) ); // false in strict mode
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing resource type with in_array() ***
-bool(true)
-bool(false)
-
-*** Testing miscelleneos inputs with in_array() ***
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(true)
-bool(true)
-bool(false)
-bool(false)
-bool(true)
-bool(false)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing resource type with in_array() ***
 bool(true)
 bool(false)

diff --git a/ext/standard/tests/array/key_basic.phpt b/ext/standard/tests/array/key_basic.phpt
index d596fe31edf76f412d78444f6d510708ae88ea23..0b4377ef52af2fb1d398650d2e3d6d2276b6a6b9 100644 (file)
--- a/ext/standard/tests/array/key_basic.phpt
+++ b/ext/standard/tests/array/key_basic.phpt
@@ -30,22 +30,7 @@ next($array);
 var_dump(key($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing key() : basic functionality ***
-
--- Initial Position: --
-int(0)
-
--- Next Position: --
-int(99)
-
--- End Position: --
-string(5) "three"
-
--- Past end of the array --
-NULL
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing key() : basic functionality ***
 
 -- Initial Position: --

diff --git a/ext/standard/tests/array/key_error.phpt b/ext/standard/tests/array/key_error.phpt
index 32dffb1b4a1549b26f128b205ab1a7bc57050645..1200f74f146c23df50f0ea31edcab2c1e651aafd 100644 (file)
--- a/ext/standard/tests/array/key_error.phpt
+++ b/ext/standard/tests/array/key_error.phpt
@@ -37,16 +37,3 @@ NULL
 Warning: key() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 ===DONE===
---UEXPECTF--
-*** Testing key() : error conditions ***
-
--- Testing key() function with Zero arguments --
-
-Warning: key() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing key() function with more than expected no. of arguments --
-
-Warning: key() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===

diff --git a/ext/standard/tests/array/key_variation1.phpt b/ext/standard/tests/array/key_variation1.phpt
index 42c2aa016e112ad492f46f947cedea9ae2c60bb2..93d0ebc7142f756849a15e1d81d55d447d251d94 100644 (file)
--- a/ext/standard/tests/array/key_variation1.phpt
+++ b/ext/standard/tests/array/key_variation1.phpt
@@ -174,132 +174,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-NULL
-
--- Iteration 19 --
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: key() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: key() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: key() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-===DONE===
---UEXPECTF--
-*** Testing key() : usage variations ***
-
--- Iteration 1 --
-
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: key() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: key() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: key() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: key() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: key() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/key_variation2.phpt b/ext/standard/tests/array/key_variation2.phpt
index 119a6dfdfcc6ca7bcbc03b38c48ffa2fea6eec8c..6a463b9fdf96abf6c7ee77fa9c476d8ee5be580a 100644 (file)
--- a/ext/standard/tests/array/key_variation2.phpt
+++ b/ext/standard/tests/array/key_variation2.phpt
@@ -104,56 +104,7 @@ foreach($inputs as $key => $input) {
 };
 ?>
 ===DONE===
---EXPECTF--
-*** Testing key() : usage variations ***
-
--- Iteration 1 : int data --
-int(0)
-int(1)
-int(12345)
-int(-2345)
-
--- Iteration 2 : float data --
-int(10)
-int(-10)
-int(0)
-
--- Iteration 3 : extreme floats data --
-int(12345678)
-int(0)
-
--- Iteration 4 : null uppercase data --
-string(0) ""
-
--- Iteration 5 : null lowercase data --
-string(0) ""
-
--- Iteration 6 : bool lowercase data --
-int(1)
-int(0)
-
--- Iteration 7 : bool uppercase data --
-int(1)
-int(0)
-
--- Iteration 8 : empty double quotes data --
-string(0) ""
-
--- Iteration 9 : empty single quotes data --
-string(0) ""
-
--- Iteration 10 : string data --
-string(7) "stringd"
-string(7) "strings"
-string(11) "hello world"
-
--- Iteration 11 : undefined data --
-string(0) ""
-
--- Iteration 12 : unset data --
-string(0) ""
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing key() : usage variations ***
 
 -- Iteration 1 : int data --

diff --git a/ext/standard/tests/array/key_variation3.phpt b/ext/standard/tests/array/key_variation3.phpt
index e4880aee5636544eceffb8c159fcaa0393818446..916e99af38424cb588db95bf476c2ae017986e28 100644 (file)
--- a/ext/standard/tests/array/key_variation3.phpt
+++ b/ext/standard/tests/array/key_variation3.phpt
@@ -31,17 +31,7 @@ echo "\$array2: ";
 var_dump(key($array2));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing key() : usage variations ***
-
--- Initial position of internal pointer --
-int(0)
-
--- Position after calling next() --
-$array1: int(1)
-$array2: int(1)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing key() : usage variations ***
 
 -- Initial position of internal pointer --

diff --git a/ext/standard/tests/array/key_variation4.phpt b/ext/standard/tests/array/key_variation4.phpt
index 1aad797f8e773209f6034d9329ac98659217e7e4..6698d6385a5b5e5249f32bee7d7bc467af029daa 100644 (file)
--- a/ext/standard/tests/array/key_variation4.phpt
+++ b/ext/standard/tests/array/key_variation4.phpt
@@ -45,23 +45,7 @@ var_dump(key($multi_array[3][3][3]));
 var_dump(key($multi_array[3][3][3][1]));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing key() : usage variations ***
-
--- Two Dimensional Array --
-Initial Position: int(0)
-Next Position:    int(1)
-End Position:     int(2)
-
--- Access an Array Within an Array --
-Initial Position: int(0)
-
--- Recursive, Multidimensional Array --
-Current Position: int(2)
-int(2)
-int(0)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing key() : usage variations ***
 
 -- Two Dimensional Array --

diff --git a/ext/standard/tests/array/krsort_basic.phpt b/ext/standard/tests/array/krsort_basic.phpt
index 8895fa02527aca07db40fffc4c49d6b607ca8c73..28ec4f126f6449cdfc1ae13440240e6479ea7bab 100644 (file)
--- a/ext/standard/tests/array/krsort_basic.phpt
+++ b/ext/standard/tests/array/krsort_basic.phpt
@@ -10,7 +10,7 @@ Test krsort() function : basic functionality
 /*
  * Testing krsort() by providing array of integer/string values to check the basic functionality 
  * with following flag values :
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
  *  4.SORT_STRING - compare items as strings
@@ -23,12 +23,12 @@ $unsorted_strings =   array( "lemon" => "l", "orange" => "o", "banana" => "b" );
 // an array containing unsorted numeric values with indices 
 $unsorted_numerics =  array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 );
 
-echo "\n-- Testing krsort() by supplying string array, 'flag' value is defualt --\n";
+echo "\n-- Testing krsort() by supplying string array, 'flag' value is default --\n";
 $temp_array = $unsorted_strings;
 var_dump( krsort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
 
-echo "\n-- Testing krsort() by supplying numeric array, 'flag' value is defualt --\n";
+echo "\n-- Testing krsort() by supplying numeric array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( krsort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
@@ -55,85 +55,10 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : basic functionality ***
 
--- Testing krsort() by supplying string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  ["orange"]=>
-  string(1) "o"
-  ["lemon"]=>
-  string(1) "l"
-  ["banana"]=>
-  string(1) "b"
-}
-
--- Testing krsort() by supplying numeric array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [555]=>
-  int(2)
-  [100]=>
-  int(4)
-  [33]=>
-  int(3)
-  [22]=>
-  int(1)
-}
-
--- Testing krsort() by supplying string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  ["orange"]=>
-  string(1) "o"
-  ["lemon"]=>
-  string(1) "l"
-  ["banana"]=>
-  string(1) "b"
-}
-
--- Testing krsort() by supplying numeric array, 'flag' = SORT_REGULAR --
-bool(true)
-array(4) {
-  [555]=>
-  int(2)
-  [100]=>
-  int(4)
-  [33]=>
-  int(3)
-  [22]=>
-  int(1)
-}
-
--- Testing krsort() by supplying string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  ["orange"]=>
-  string(1) "o"
-  ["lemon"]=>
-  string(1) "l"
-  ["banana"]=>
-  string(1) "b"
-}
-
--- Testing krsort() by supplying numeric array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(4) {
-  [555]=>
-  int(2)
-  [100]=>
-  int(4)
-  [33]=>
-  int(3)
-  [22]=>
-  int(1)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : basic functionality ***
-
--- Testing krsort() by supplying string array, 'flag' value is defualt --
+-- Testing krsort() by supplying string array, 'flag' value is default --
 bool(true)
 array(3) {
   [u"orange"]=>
@@ -144,7 +69,7 @@ array(3) {
   unicode(1) "b"
 }
 
--- Testing krsort() by supplying numeric array, 'flag' value is defualt --
+-- Testing krsort() by supplying numeric array, 'flag' value is default --
 bool(true)
 array(4) {
   [555]=>

diff --git a/ext/standard/tests/array/krsort_error.phpt b/ext/standard/tests/array/krsort_error.phpt
index 9cb908f21a44dc08851e26947d8f014a3c9a70ae..1bca5f928db2f84412db08f77c816db52abfd285 100644 (file)
--- a/ext/standard/tests/array/krsort_error.phpt
+++ b/ext/standard/tests/array/krsort_error.phpt
@@ -76,46 +76,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing krsort() : error conditions ***
-
--- Testing krsort() function with zero arguments --
-
-Warning: krsort() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing krsort() function with more than expected no. of arguments --
-
-- Sort flag = SORT_REGULAR -
-
-Warning: krsort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-
-- Sort flag = SORT_STRING -
-
-Warning: krsort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-
-- Sort flag = SORT_NUMERIC -
-
-Warning: krsort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-Done

diff --git a/ext/standard/tests/array/krsort_object.phpt b/ext/standard/tests/array/krsort_object.phpt
index deafe8b8bd8c90ff9ebb43e28d9df6bf2e3ee3e7..b87214d5702c6931cc311b247790ffc0f4cb1136 100644 (file)
--- a/ext/standard/tests/array/krsort_object.phpt
+++ b/ext/standard/tests/array/krsort_object.phpt
@@ -8,7 +8,7 @@ Test krsort() function : object functionality - sort objects
 */
 /*
  * testing krsort() by providing array of integer/string objects with following flag values:
- *  1.Defualt flag value
+ *  1.default flag value
  *  2.SORT_REGULAR - compare items normally
 */
 
@@ -56,14 +56,14 @@ $unsorted_str_obj = array (
 );
 
 
-echo "\n-- Testing krsort() by supplying various object arrays, 'flag' value is defualt --\n";
+echo "\n-- Testing krsort() by supplying various object arrays, 'flag' value is default --\n";
 
-// testing krsort() function by supplying integer object array, flag value is defualt
+// testing krsort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(krsort($temp_array) );
 var_dump($temp_array);
 
-// testing krsort() function by supplying string object array, flag value is defualt
+// testing krsort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(krsort($temp_array) );
 var_dump($temp_array);
@@ -84,166 +84,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing krsort() : object functionality ***
 
--- Testing krsort() by supplying various object arrays, 'flag' value is defualt --
-bool(true)
-array(6) {
-  [50]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [20]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-  [10]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [6]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [4]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [3]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-}
-bool(true)
-array(8) {
-  ["w"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-  ["t"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["py"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["axx"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["apple"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["aPPle"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["Orange"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["Lemon"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-}
-
--- Testing krsort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(6) {
-  [50]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [20]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-  [10]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [6]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [4]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [3]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-}
-bool(true)
-array(8) {
-  ["w"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-  ["t"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["py"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["axx"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["apple"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["aPPle"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["Orange"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["Lemon"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-}
-Done
---UEXPECTF--
-*** Testing krsort() : object functionality ***
-
--- Testing krsort() by supplying various object arrays, 'flag' value is defualt --
+-- Testing krsort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(6) {
   [50]=>

diff --git a/ext/standard/tests/array/krsort_variation1.phpt b/ext/standard/tests/array/krsort_variation1.phpt
index d54aea0beb3b2d29772bf3197c7ce1da8ad79367..331af0bbaa28a7c953a7002ad5a6ad91dfc4f325 100644 (file)
--- a/ext/standard/tests/array/krsort_variation1.phpt
+++ b/ext/standard/tests/array/krsort_variation1.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - unexpected values for 'array' argume
 /*
  * testing krsort() by providing different unexpected values for array argument
  * with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
  *  4.SORT_STRING - compare items as strings
@@ -74,7 +74,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of krsort()
 // when $array arugment is supplied with different values from $unexpected_values
 echo "\n-- Testing krsort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
@@ -94,313 +94,7 @@ echo "Done";
 
 -- Testing krsort() by supplying different unexpected values for 'array' argument --
 
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
--- Iteration 1 --
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: krsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: krsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: krsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying different unexpected values for 'array' argument --
-
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
+-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
 Warning: krsort() expects parameter 1 to be array, integer given in %s on line %d

diff --git a/ext/standard/tests/array/krsort_variation10.phpt b/ext/standard/tests/array/krsort_variation10.phpt
index 864655d743a38946f93eda67a4f6bc84ba304da4..06dc13e78feee10bc1db8248b67ad7f95023b9a9 100644 (file)
--- a/ext/standard/tests/array/krsort_variation10.phpt
+++ b/ext/standard/tests/array/krsort_variation10.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort heredoc strings
 /*
  * testing krsort() by providing array of heredoc strings for $array argument with
  * following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_STRING  - compare items as strings
 */
@@ -37,7 +37,7 @@ $array = array (
   $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!"
 );
 
-echo "\n-- Testing krsort() by supplying heredoc string array, 'flag' value is defualt --\n";
+echo "\n-- Testing krsort() by supplying heredoc string array, 'flag' value is default --\n";
 $temp_array = $array;
 var_dump(krsort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -54,52 +54,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
--- Testing krsort() by supplying heredoc string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-}
-
--- Testing krsort() by supplying heredoc string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-}
-
--- Testing krsort() by supplying heredoc string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying heredoc string array, 'flag' value is defualt --
+-- Testing krsort() by supplying heredoc string array, 'flag' value is default --
 bool(true)
 array(3) {
   [u"heredoc string    with!@# and 123

diff --git a/ext/standard/tests/array/krsort_variation11.phpt b/ext/standard/tests/array/krsort_variation11.phpt
index 9f8376009b5be16776be71263bc3d7569021b148..271559c3e5c314a5e627a7d91c5641d1c8b9899e 100644 (file)
--- a/ext/standard/tests/array/krsort_variation11.phpt
+++ b/ext/standard/tests/array/krsort_variation11.phpt
@@ -9,7 +9,7 @@ Test krsort() function : usage variations - sort bool values
 
 /*
  * testing krsort() by providing array of boolean values for $array argument with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
 */
 
@@ -18,7 +18,7 @@ echo "*** Testing krsort() : usage variations ***\n";
 // bool value array
 $bool_values = array (true => true, false => false, TRUE => TRUE, FALSE => FALSE);
 
-echo "\n-- Testing krsort() by supplying boolean value array, 'flag' value is defualt --\n";
+echo "\n-- Testing krsort() by supplying boolean value array, 'flag' value is default --\n";
 $temp_array = $bool_values;
 var_dump(krsort($temp_array) );
 var_dump($temp_array);
@@ -40,49 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
--- Testing krsort() by supplying boolean value array, 'flag' value is defualt --
-bool(true)
-array(2) {
-  [1]=>
-  bool(true)
-  [0]=>
-  bool(false)
-}
-
--- Testing krsort() by supplying boolean value array, 'flag' value is SORT_REGULAR --
-bool(true)
-array(2) {
-  [1]=>
-  bool(true)
-  [0]=>
-  bool(false)
-}
-
--- Testing krsort() by supplying boolean value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(2) {
-  [1]=>
-  bool(true)
-  [0]=>
-  bool(false)
-}
-
--- Testing krsort() by supplying boolean value array, 'flag' value is SORT_STRING --
-bool(true)
-array(2) {
-  [1]=>
-  bool(true)
-  [0]=>
-  bool(false)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying boolean value array, 'flag' value is defualt --
+-- Testing krsort() by supplying boolean value array, 'flag' value is default --
 bool(true)
 array(2) {
   [1]=>

diff --git a/ext/standard/tests/array/krsort_variation2.phpt b/ext/standard/tests/array/krsort_variation2.phpt
index 5ac9a1097633b8b5e0169a186f645db8f0ce8627..bc0da1c065a9a311b5a64b8e544881006b7eba33 100644 (file)
--- a/ext/standard/tests/array/krsort_variation2.phpt
+++ b/ext/standard/tests/array/krsort_variation2.phpt
@@ -210,227 +210,6 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 14 --
-
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 15 --
-
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 16 --
-
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 17 --
-
-Warning: krsort() expects parameter 2 to be long, object given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 18 --
-
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 19 --
-
-Warning: krsort() expects parameter 2 to be long, string given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 20 --
-
-Warning: krsort() expects parameter 2 to be long, resource given in %s on line %d%d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying different unexpected values for 'sort_flags' argument --
--- Iteration 1 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 2 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 3 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 4 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 5 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 6 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 7 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 8 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 9 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 10 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 11 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 12 --
-bool(true)
-array(3) {
-  [45]=>
-  int(45)
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-}
--- Iteration 13 --
-
 Warning: krsort() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 array(3) {

diff --git a/ext/standard/tests/array/krsort_variation3.phpt b/ext/standard/tests/array/krsort_variation3.phpt
index b5ca28dd75f09062a2a2f1a1c3df65fecfbeb11a..d7f636bebf81255430228527db2a5ed66ad1be90 100644 (file)
--- a/ext/standard/tests/array/krsort_variation3.phpt
+++ b/ext/standard/tests/array/krsort_variation3.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort integer/float values
 /*
  * Testing krsort() by providing array of integer/float/mixed values for $array argument
  * with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
 */
@@ -40,7 +40,7 @@ echo "\n-- Testing krsort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n"; 
+  echo "- With default sort flag -\n"; 
   $temp_array = $array; 
   var_dump(krsort($temp_array) );
   var_dump($temp_array);
@@ -57,13 +57,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
 -- Testing krsort() by supplying various integer/float arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(9) {
   [8]=>
@@ -131,7 +131,7 @@ array(9) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [6]=>
@@ -181,210 +181,7 @@ array(6) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  [11]=>
-  int(33)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [6]=>
-  float(0.09)
-  [5]=>
-  int(0)
-  [4]=>
-  int(-1)
-  [2]=>
-  float(0.0021)
-  [1]=>
-  float(0.0001)
-  [-3]=>
-  float(-0.01)
-  [-8]=>
-  float(-0.9)
-  [-10]=>
-  float(-0.106)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [11]=>
-  int(33)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [6]=>
-  float(0.09)
-  [5]=>
-  int(0)
-  [4]=>
-  int(-1)
-  [2]=>
-  float(0.0021)
-  [1]=>
-  float(0.0001)
-  [-3]=>
-  float(-0.01)
-  [-8]=>
-  float(-0.9)
-  [-10]=>
-  float(-0.106)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(11) {
-  [11]=>
-  int(33)
-  [9]=>
-  float(0.106)
-  [7]=>
-  int(2)
-  [6]=>
-  float(0.09)
-  [5]=>
-  int(0)
-  [4]=>
-  int(-1)
-  [2]=>
-  float(0.0021)
-  [1]=>
-  float(0.0001)
-  [-3]=>
-  float(-0.01)
-  [-8]=>
-  float(-0.9)
-  [-10]=>
-  float(-0.106)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying various integer/float arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(9) {
-  [8]=>
-  int(41)
-  [7]=>
-  int(0)
-  [5]=>
-  int(31)
-  [3]=>
-  int(21)
-  [1]=>
-  int(11)
-  [-2]=>
-  int(-11)
-  [-4]=>
-  int(-21)
-  [-6]=>
-  int(-31)
-  [-10]=>
-  int(-41)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(9) {
-  [8]=>
-  int(41)
-  [7]=>
-  int(0)
-  [5]=>
-  int(31)
-  [3]=>
-  int(21)
-  [1]=>
-  int(11)
-  [-2]=>
-  int(-11)
-  [-4]=>
-  int(-21)
-  [-6]=>
-  int(-31)
-  [-10]=>
-  int(-41)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(9) {
-  [8]=>
-  int(41)
-  [7]=>
-  int(0)
-  [5]=>
-  int(31)
-  [3]=>
-  int(21)
-  [1]=>
-  int(11)
-  [-2]=>
-  int(-11)
-  [-4]=>
-  int(-21)
-  [-6]=>
-  int(-31)
-  [-10]=>
-  int(-41)
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [3]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [0]=>
-  float(0.5)
-  [-7]=>
-  float(-0.1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [3]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [0]=>
-  float(0.5)
-  [-7]=>
-  float(-0.1)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(6) {
-  [6]=>
-  float(0.0001)
-  [4]=>
-  float(0.106)
-  [3]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [0]=>
-  float(0.5)
-  [-7]=>
-  float(-0.1)
-}
-
--- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [11]=>

diff --git a/ext/standard/tests/array/krsort_variation4.phpt b/ext/standard/tests/array/krsort_variation4.phpt
index b1cfb0aba27f860ea306048792575cc4ed0a121e..b50c75f5c03fd15f4e8797871b8c8b7703da638f 100644 (file)
--- a/ext/standard/tests/array/krsort_variation4.phpt
+++ b/ext/standard/tests/array/krsort_variation4.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort octal values
 /*
  * testing krsort() by providing array of octal values for $array argument
  * with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
 */
@@ -23,7 +23,7 @@ $unsorted_oct_array = array (
   077 => 06, -066 => -01, -0345 => -02, 0 => 0
 );
 
-echo "\n-- Testing krsort() by supplying octal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing krsort() by supplying octal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_oct_array;
 var_dump( krsort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -40,82 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
--- Testing krsort() by supplying octal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [669]=>
-  int(1)
-  [506]=>
-  int(5)
-  [229]=>
-  int(3)
-  [209]=>
-  int(2)
-  [63]=>
-  int(6)
-  [54]=>
-  int(4)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-1)
-  [-229]=>
-  int(-2)
-}
-
--- Testing krsort() by supplying octal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [669]=>
-  int(1)
-  [506]=>
-  int(5)
-  [229]=>
-  int(3)
-  [209]=>
-  int(2)
-  [63]=>
-  int(6)
-  [54]=>
-  int(4)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-1)
-  [-229]=>
-  int(-2)
-}
-
--- Testing krsort() by supplying octal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [669]=>
-  int(1)
-  [506]=>
-  int(5)
-  [229]=>
-  int(3)
-  [209]=>
-  int(2)
-  [63]=>
-  int(6)
-  [54]=>
-  int(4)
-  [0]=>
-  int(0)
-  [-54]=>
-  int(-1)
-  [-229]=>
-  int(-2)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying octal value array, 'flag' value is defualt  --
+-- Testing krsort() by supplying octal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [669]=>

diff --git a/ext/standard/tests/array/krsort_variation5.phpt b/ext/standard/tests/array/krsort_variation5.phpt
index 81a519a3abb0da16f17cc9d21a82f5fa056f8408..d259205ac2a115b554b4358b48ce2cc6f538144c 100644 (file)
--- a/ext/standard/tests/array/krsort_variation5.phpt
+++ b/ext/standard/tests/array/krsort_variation5.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort strings
 /*
  * testing krsort() by providing array of string values for $array argument with
  * following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_STRING  - compare items as strings
 */
@@ -40,7 +40,7 @@ echo "\n-- Testing krsort() by supplying various string arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump(krsort($temp_array) ); // expecting : bool(true)
   var_dump($temp_array);
@@ -57,190 +57,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
 -- Testing krsort() by supplying various string arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  [""]=>
-  NULL
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  [""]=>
-  NULL
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(11) {
-  ["\xhh"]=>
-  string(4) "\xhh"
-  ["\e"]=>
-  string(2) "\e"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\a"]=>
-  string(2) "\a"
-  ["
-"]=>
-  string(1) "
-"
-  ["\f"]=>
-  string(1) "\f"
-  ["\v"]=>
-  string(1) "\v"
-  ["
-"]=>
-  string(1) "
-"
-  ["   "]=>
-  string(1) "  "
-  [""]=>
-  NULL
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  ["x"]=>
-  string(1) "X"
-  ["te"]=>
-  string(4) "Test"
-  ["t"]=>
-  string(4) "TTTT"
-  ["o"]=>
-  string(6) "Orange"
-  ["X"]=>
-  string(1) "x"
-  ["W"]=>
-  string(2) "ww"
-  ["T"]=>
-  string(3) "ttt"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Apple"]=>
-  string(5) "apple"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  ["x"]=>
-  string(1) "X"
-  ["te"]=>
-  string(4) "Test"
-  ["t"]=>
-  string(4) "TTTT"
-  ["o"]=>
-  string(6) "Orange"
-  ["X"]=>
-  string(1) "x"
-  ["W"]=>
-  string(2) "ww"
-  ["T"]=>
-  string(3) "ttt"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Apple"]=>
-  string(5) "apple"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(11) {
-  ["x"]=>
-  string(1) "X"
-  ["te"]=>
-  string(4) "Test"
-  ["t"]=>
-  string(4) "TTTT"
-  ["o"]=>
-  string(6) "Orange"
-  ["X"]=>
-  string(1) "x"
-  ["W"]=>
-  string(2) "ww"
-  ["T"]=>
-  string(3) "ttt"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Apple"]=>
-  string(5) "apple"
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying various string arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [u"\xhh"]=>
@@ -332,7 +155,7 @@ array(11) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [u"x"]=>

diff --git a/ext/standard/tests/array/krsort_variation6.phpt b/ext/standard/tests/array/krsort_variation6.phpt
index c8fb885ede8ccdbf49e170d6cf989acff9c7ce92..6be8a849f7d32a29fda5b5d7e2d3aa7d483c6377 100644 (file)
--- a/ext/standard/tests/array/krsort_variation6.phpt
+++ b/ext/standard/tests/array/krsort_variation6.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort hexadecimal values
 /*
  * testing krsort() by providing array of hexa-decimal values for $array argument
  * with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
 */
@@ -23,7 +23,7 @@ $unsorted_hex_array = array (
   0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
 );
 
-echo "\n-- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing krsort() by supplying hexadecimal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_hex_array;
 var_dump(krsort( $temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -40,82 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
--- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-
--- Testing krsort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-
--- Testing krsort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [4095]=>
-  int(4095)
-  [682]=>
-  int(682)
-  [427]=>
-  int(427)
-  [255]=>
-  int(255)
-  [187]=>
-  int(187)
-  [15]=>
-  int(15)
-  [0]=>
-  int(0)
-  [-255]=>
-  int(-255)
-  [-682]=>
-  int(-682)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying hexadecimal value array, 'flag' value is defualt  --
+-- Testing krsort() by supplying hexadecimal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [4095]=>

diff --git a/ext/standard/tests/array/krsort_variation7.phpt b/ext/standard/tests/array/krsort_variation7.phpt
index 469a0e319e2873127ba9d3ec7c24d85579076371..7bb45a9cb1b9a1fc7e3126b9241f09911c3ac54f 100644 (file)
--- a/ext/standard/tests/array/krsort_variation7.phpt
+++ b/ext/standard/tests/array/krsort_variation7.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort array with diff. sub arrays
 /*
  * testing krsort() by providing arrays contains sub arrays for $array argument 
  * with flowing flag values
- *  1.flag  value as defualt
+ *  1.flag  value as default
  *  2.SORT_REGULAR - compare items normally
 */
 
@@ -40,7 +40,7 @@ echo "\n-- Testing krsort() by supplying various arrays containing sub arrays --
 foreach ($various_arrays as $array) {
  
   echo "\n-- Iteration $count --\n"; 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump( krsort($temp_array) );
   var_dump($temp_array);
@@ -60,7 +60,7 @@ echo "Done\n";
 -- Testing krsort() by supplying various arrays containing sub arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(0) {
 }
@@ -70,7 +70,7 @@ array(0) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(1) {
   [1]=>
@@ -86,7 +86,7 @@ array(1) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [4]=>
@@ -118,128 +118,7 @@ array(3) {
 }
 
 -- Iteration 4 --
-- With defualt sort flag -
-bool(true)
-array(4) {
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [0]=>
-  array(0) {
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [0]=>
-  array(0) {
-  }
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying various arrays containing sub arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(0) {
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(1) {
-  [1]=>
-  array(0) {
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(1) {
-  [1]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  [4]=>
-  int(44)
-  [3]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [1]=>
-  int(11)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [4]=>
-  int(44)
-  [3]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [1]=>
-  int(11)
-}
-
--- Iteration 4 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [3]=>

diff --git a/ext/standard/tests/array/krsort_variation8.phpt b/ext/standard/tests/array/krsort_variation8.phpt
index 755c1cece4acc895d6b5c90132e5360810da6faa..d21e14ec4e2a2a3b9c3a77d8b7a9df3ccf2caf47 100644 (file)
Binary files a/ext/standard/tests/array/krsort_variation8.phpt and b/ext/standard/tests/array/krsort_variation8.phpt differ

diff --git a/ext/standard/tests/array/krsort_variation9.phpt b/ext/standard/tests/array/krsort_variation9.phpt
index 0a72fc3af9dcdccec2278052497e03baae9177f7..a9b0352bb5e576b7b574be08841f556673be94a6 100644 (file)
--- a/ext/standard/tests/array/krsort_variation9.phpt
+++ b/ext/standard/tests/array/krsort_variation9.phpt
@@ -10,7 +10,7 @@ Test krsort() function : usage variations - sort array with/without key values
 /*
  * Testing krsort() by providing arrays  with/without key values for $array argument
  * with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  */
 
@@ -34,7 +34,7 @@ echo "\n-- Testing krsort() by supplying various arrays with/without key values
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump( krsort($temp_array) );
   var_dump($temp_array);
@@ -48,13 +48,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing krsort() : usage variations ***
 
 -- Testing krsort() by supplying various arrays with/without key values --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(5) {
   [9]=>
@@ -84,214 +84,7 @@ array(5) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-
--- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [5]=>
-  int(6)
-  [4]=>
-  int(5)
-  [3]=>
-  int(4)
-  [2]=>
-  int(3)
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [5]=>
-  int(6)
-  [4]=>
-  int(5)
-  [3]=>
-  int(4)
-  [2]=>
-  int(3)
-  [1]=>
-  int(2)
-  [0]=>
-  int(1)
-}
-
--- Iteration 4 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  [5]=>
-  string(6) "second"
-  [1]=>
-  string(5) "third"
-  [0]=>
-  string(5) "first"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [5]=>
-  string(6) "second"
-  [1]=>
-  string(5) "third"
-  [0]=>
-  string(5) "first"
-}
-
--- Iteration 5 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [9]=>
-  int(19)
-  [8]=>
-  int(1)
-  [4]=>
-  int(1)
-  [3]=>
-  int(13)
-  [1]=>
-  int(1)
-  [0]=>
-  int(1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [9]=>
-  int(19)
-  [8]=>
-  int(1)
-  [4]=>
-  int(1)
-  [3]=>
-  int(13)
-  [1]=>
-  int(1)
-  [0]=>
-  int(1)
-}
-
--- Iteration 6 --
-- With defualt sort flag -
-bool(true)
-array(2) {
-  ["foo"]=>
-  int(1)
-  ["bar"]=>
-  string(3) "baz"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(2) {
-  ["foo"]=>
-  int(1)
-  ["bar"]=>
-  string(3) "baz"
-}
-
--- Iteration 7 --
-- With defualt sort flag -
-bool(true)
-array(4) {
-  ["d"]=>
-  int(5)
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["a"]=>
-  int(1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["d"]=>
-  int(5)
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["a"]=>
-  int(1)
-}
-Done
---UEXPECTF--
-*** Testing krsort() : usage variations ***
-
--- Testing krsort() by supplying various arrays with/without key values --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(5) {
-  [9]=>
-  int(11)
-  [8]=>
-  int(33)
-  [7]=>
-  int(22)
-  [6]=>
-  int(66)
-  [5]=>
-  int(55)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(5) {
-  [9]=>
-  int(11)
-  [8]=>
-  int(33)
-  [7]=>
-  int(22)
-  [6]=>
-  int(66)
-  [5]=>
-  int(55)
-}
-
--- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [u"c"]=>
@@ -313,7 +106,7 @@ array(3) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [5]=>
@@ -347,7 +140,7 @@ array(6) {
 }
 
 -- Iteration 4 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [5]=>
@@ -369,7 +162,7 @@ array(3) {
 }
 
 -- Iteration 5 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [9]=>
@@ -403,7 +196,7 @@ array(6) {
 }
 
 -- Iteration 6 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(2) {
   [u"foo"]=>
@@ -421,7 +214,7 @@ array(2) {
 }
 
 -- Iteration 7 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [u"d"]=>

diff --git a/ext/standard/tests/array/ksort_basic.phpt b/ext/standard/tests/array/ksort_basic.phpt
index 822150423c5118e560fb0ef808b11b9edae40af2..6719424172bc445359e9e3c4b3c5d5f46d6c8afd 100644 (file)
--- a/ext/standard/tests/array/ksort_basic.phpt
+++ b/ext/standard/tests/array/ksort_basic.phpt
@@ -9,7 +9,7 @@ Test ksort() function : basic functionality
 
 /*
  * Testing ksort() by providing  array of integer/string values to check the basic functionality with following flag values :
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
  *  4.SORT_STRING - compare items as strings
@@ -22,12 +22,12 @@ $unsorted_strings =   array( "lemon" => "l", "orange" => "o", "banana" => "b" );
 // an array containing unsorted numeric values with indices 
 $unsorted_numerics =  array( 100 => 4, 33 => 3, 555 => 2, 22 => 1 );
 
-echo "\n-- Testing ksort() by supplying string array, 'flag' value is defualt --\n";
+echo "\n-- Testing ksort() by supplying string array, 'flag' value is default --\n";
 $temp_array = $unsorted_strings;
 var_dump( ksort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
 
-echo "\n-- Testing ksort() by supplying numeric array, 'flag' value is defualt --\n";
+echo "\n-- Testing ksort() by supplying numeric array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( ksort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
@@ -54,85 +54,10 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : basic functionality ***
 
--- Testing ksort() by supplying string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  ["banana"]=>
-  string(1) "b"
-  ["lemon"]=>
-  string(1) "l"
-  ["orange"]=>
-  string(1) "o"
-}
-
--- Testing ksort() by supplying numeric array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [22]=>
-  int(1)
-  [33]=>
-  int(3)
-  [100]=>
-  int(4)
-  [555]=>
-  int(2)
-}
-
--- Testing ksort() by supplying string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  ["banana"]=>
-  string(1) "b"
-  ["lemon"]=>
-  string(1) "l"
-  ["orange"]=>
-  string(1) "o"
-}
-
--- Testing ksort() by supplying numeric array, 'flag' = SORT_REGULAR --
-bool(true)
-array(4) {
-  [22]=>
-  int(1)
-  [33]=>
-  int(3)
-  [100]=>
-  int(4)
-  [555]=>
-  int(2)
-}
-
--- Testing ksort() by supplying string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  ["banana"]=>
-  string(1) "b"
-  ["lemon"]=>
-  string(1) "l"
-  ["orange"]=>
-  string(1) "o"
-}
-
--- Testing ksort() by supplying numeric array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(4) {
-  [22]=>
-  int(1)
-  [33]=>
-  int(3)
-  [100]=>
-  int(4)
-  [555]=>
-  int(2)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : basic functionality ***
-
--- Testing ksort() by supplying string array, 'flag' value is defualt --
+-- Testing ksort() by supplying string array, 'flag' value is default --
 bool(true)
 array(3) {
   [u"banana"]=>
@@ -143,7 +68,7 @@ array(3) {
   unicode(1) "o"
 }
 
--- Testing ksort() by supplying numeric array, 'flag' value is defualt --
+-- Testing ksort() by supplying numeric array, 'flag' value is default --
 bool(true)
 array(4) {
   [22]=>

diff --git a/ext/standard/tests/array/ksort_error.phpt b/ext/standard/tests/array/ksort_error.phpt
index c92ced79608dd204ca62175a112a955680fd3877..f2b102ae0149f7e34cf4e6cb0525e5b3cebb9e58 100644 (file)
--- a/ext/standard/tests/array/ksort_error.phpt
+++ b/ext/standard/tests/array/ksort_error.phpt
@@ -76,46 +76,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing ksort() : error conditions ***
-
--- Testing ksort() function with Zero arguments --
-
-Warning: ksort() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing ksort() function with more than expected no. of arguments --
-
-- Sort flag = SORT_REGULAR -
-
-Warning: ksort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-
-- Sort flag = SORT_STRING -
-
-Warning: ksort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-
-- Sort flag = SORT_NUMERIC -
-
-Warning: ksort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-}
-Done

diff --git a/ext/standard/tests/array/ksort_object.phpt b/ext/standard/tests/array/ksort_object.phpt
index e27b9cfddeaf4867df0853e8b11186e6ebb89570..55ee7e270e207c699de10f65574a158619ec259e 100644 (file)
--- a/ext/standard/tests/array/ksort_object.phpt
+++ b/ext/standard/tests/array/ksort_object.phpt
@@ -55,14 +55,14 @@ $unsorted_str_obj = array (
   "apple" => new String("apple"), "Orange" => new String("Orange"),
   "Lemon" => new String("Lemon"), "aPPle" => new String("aPPle")
 );
-echo "\n-- Testing ksort() by supplying various object arrays, 'flag' value is defualt --\n";
+echo "\n-- Testing ksort() by supplying various object arrays, 'flag' value is default --\n";
 
-// testing ksort() function by supplying integer object array, flag value is defualt
+// testing ksort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(ksort($temp_array) );
 var_dump($temp_array);
 
-// testing ksort() function by supplying string object array, flag value is defualt
+// testing ksort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(ksort($temp_array) );
 var_dump($temp_array);
@@ -83,166 +83,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing ksort() : object functionality ***
 
--- Testing ksort() by supplying various object arrays, 'flag' value is defualt --
-bool(true)
-array(6) {
-  [-5]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [0]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [1]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [11]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [23]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [66]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  ["Lemon"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  ["Orange"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["aPPle"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["apple"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["axx"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["py"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["t"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["w"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-
--- Testing ksort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(6) {
-  [-5]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [0]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [1]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [11]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [23]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [66]=>
-  object(Integer)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  ["Lemon"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  ["Orange"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  ["aPPle"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  ["apple"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  ["axx"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  ["py"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  ["t"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  ["w"]=>
-  object(String)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-Done
---UEXPECTF--
-*** Testing ksort() : object functionality ***
-
--- Testing ksort() by supplying various object arrays, 'flag' value is defualt --
+-- Testing ksort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(6) {
   [-5]=>

diff --git a/ext/standard/tests/array/ksort_variation1.phpt b/ext/standard/tests/array/ksort_variation1.phpt
index d056728fd089dd6009b4bb2751e905f916ab45ad..9838eea4c5ff43c703bec3f24f51847d0ecdb036 100644 (file)
--- a/ext/standard/tests/array/ksort_variation1.phpt
+++ b/ext/standard/tests/array/ksort_variation1.phpt
@@ -9,7 +9,7 @@ Test ksort() function : usage variations - unexpected values for 'array' argumen
 
 /*
  * testing ksort() by providing different unexpected values for array argument with following flag values:
- *  1. flag value as defualt
+ *  1. flag value as default
  *  2. SORT_REGULAR - compare items normally
  *  3. SORT_NUMERIC - compare items numerically
  *  4. SORT_STRING - compare items as strings
@@ -74,7 +74,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of ksort()
 // when $array arugment is supplied with different values from $unexpected_values
 echo "\n-- Testing ksort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
@@ -94,313 +94,7 @@ echo "Done";
 
 -- Testing ksort() by supplying different unexpected values for 'array' argument --
 
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
--- Iteration 1 --
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: ksort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: ksort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: ksort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying different unexpected values for 'array' argument --
-
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
+-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
 Warning: ksort() expects parameter 1 to be array, integer given in %s on line %d

diff --git a/ext/standard/tests/array/ksort_variation10.phpt b/ext/standard/tests/array/ksort_variation10.phpt
index c749b9105e8f6c1d34f291819ecc50cf426b8735..468307a1f63b926036b5f72c71e16ca9ebcdf8ac 100644 (file)
--- a/ext/standard/tests/array/ksort_variation10.phpt
+++ b/ext/standard/tests/array/ksort_variation10.phpt
@@ -9,7 +9,7 @@ Test ksort() function : usage variations - sort octal values
 
 /*
  * testing ksort() by providing array of octal values for $array argument with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
 */
@@ -22,7 +22,7 @@ $unsorted_oct_array = array (
   077 => 06, -066 => -01, -0345 => -02, 0 => 0
 );
 
-echo "\n-- Testing ksort() by supplying octal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing ksort() by supplying octal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_oct_array;
 var_dump( ksort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -39,82 +39,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
--- Testing ksort() by supplying octal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-2)
-  [-54]=>
-  int(-1)
-  [0]=>
-  int(0)
-  [54]=>
-  int(4)
-  [63]=>
-  int(6)
-  [209]=>
-  int(2)
-  [229]=>
-  int(3)
-  [506]=>
-  int(5)
-  [669]=>
-  int(1)
-}
-
--- Testing ksort() by supplying octal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-2)
-  [-54]=>
-  int(-1)
-  [0]=>
-  int(0)
-  [54]=>
-  int(4)
-  [63]=>
-  int(6)
-  [209]=>
-  int(2)
-  [229]=>
-  int(3)
-  [506]=>
-  int(5)
-  [669]=>
-  int(1)
-}
-
--- Testing ksort() by supplying octal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [-229]=>
-  int(-2)
-  [-54]=>
-  int(-1)
-  [0]=>
-  int(0)
-  [54]=>
-  int(4)
-  [63]=>
-  int(6)
-  [209]=>
-  int(2)
-  [229]=>
-  int(3)
-  [506]=>
-  int(5)
-  [669]=>
-  int(1)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying octal value array, 'flag' value is defualt  --
+-- Testing ksort() by supplying octal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [-229]=>

diff --git a/ext/standard/tests/array/ksort_variation11.phpt b/ext/standard/tests/array/ksort_variation11.phpt
index 3124ad8c8b0ac558c1a7350e7e38ede9bb2270e8..739ffdcfa86166a55897487d1643669d040464e8 100644 (file)
--- a/ext/standard/tests/array/ksort_variation11.phpt
+++ b/ext/standard/tests/array/ksort_variation11.phpt
@@ -10,7 +10,7 @@ Test ksort() function : usage variations - sort heredoc strings
 /*
  * testing ksort() by providing array of heredoc strings for $array argument with
  * following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_STRING  - compare items as strings
 */
@@ -37,7 +37,7 @@ $array = array (
   $multiline_heredoc => "heredoc string\twith!@# and 123\nTest this!!!"
 );
 
-echo "\n-- Testing ksort() by supplying heredoc string array, 'flag' value is defualt --\n";
+echo "\n-- Testing ksort() by supplying heredoc string array, 'flag' value is default --\n";
 $temp_array = $array;
 var_dump(ksort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -54,52 +54,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
--- Testing ksort() by supplying heredoc string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-}
-
--- Testing ksort() by supplying heredoc string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-}
-
--- Testing ksort() by supplying heredoc string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  ["HEREDOC"]=>
-  string(7) "HEREDOC"
-  ["Heredoc"]=>
-  string(7) "Heredoc"
-  ["heredoc string     with!@# and 123
-Test this!!!"]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying heredoc string array, 'flag' value is defualt --
+-- Testing ksort() by supplying heredoc string array, 'flag' value is default --
 bool(true)
 array(3) {
   [u"HEREDOC"]=>
@@ -137,4 +95,4 @@ Test this!!!"]=>
   unicode(43) "heredoc string  with!@# and 123
 Test this!!!"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/ksort_variation2.phpt b/ext/standard/tests/array/ksort_variation2.phpt
index 18b07e123f5b203b54f6134d55ff054aad5cfa5f..e6dce9a9c33ea80ece48e2eec87e03a6dde90856 100644 (file)
--- a/ext/standard/tests/array/ksort_variation2.phpt
+++ b/ext/standard/tests/array/ksort_variation2.phpt
@@ -210,227 +210,6 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 14 --
-
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 15 --
-
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 16 --
-
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 17 --
-
-Warning: ksort() expects parameter 2 to be long, object given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 18 --
-
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 19 --
-
-Warning: ksort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
--- Iteration 20 --
-
-Warning: ksort() expects parameter 2 to be long, resource given in %s on line %d
-bool(false)
-array(3) {
-  [10]=>
-  int(10)
-  [2]=>
-  int(2)
-  [45]=>
-  int(45)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying different unexpected values for 'sort_flags' argument --
--- Iteration 1 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 2 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 3 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 4 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 5 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 6 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 7 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 8 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 9 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 10 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 11 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 12 --
-bool(true)
-array(3) {
-  [2]=>
-  int(2)
-  [10]=>
-  int(10)
-  [45]=>
-  int(45)
-}
--- Iteration 13 --
-
 Warning: ksort() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 array(3) {

diff --git a/ext/standard/tests/array/ksort_variation3.phpt b/ext/standard/tests/array/ksort_variation3.phpt
index 72d7b5d60c19baf5891765075375f99af2a8ca7b..f63586861a093f4c4b9df3d2c4429a3b85440e3b 100644 (file)
--- a/ext/standard/tests/array/ksort_variation3.phpt
+++ b/ext/standard/tests/array/ksort_variation3.phpt
@@ -10,7 +10,7 @@ Test ksort() function : usage variations - sort integer/float values
 /*
  * Testing ksort() by providing array of integer/float/mixed values for $array argument
  * with following flag  values:
- *  1. flag value as defualt
+ *  1. flag value as default
  *  2. SORT_REGULAR - compare items normally
  *  3. SORT_NUMERIC - compare items numerically
 */
@@ -40,7 +40,7 @@ echo "\n-- Testing ksort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n"; 
+  echo "- With default sort flag -\n"; 
   $temp_array = $array; 
   var_dump(ksort($temp_array) );
   var_dump($temp_array);
@@ -57,13 +57,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
 -- Testing ksort() by supplying various integer/float arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(9) {
   [-10]=>
@@ -131,7 +131,7 @@ array(9) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [-7]=>
@@ -181,210 +181,7 @@ array(6) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  [-10]=>
-  float(-0.106)
-  [-8]=>
-  float(-0.9)
-  [-3]=>
-  float(-0.01)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [4]=>
-  int(-1)
-  [5]=>
-  int(0)
-  [6]=>
-  float(0.09)
-  [7]=>
-  int(2)
-  [9]=>
-  float(0.106)
-  [11]=>
-  int(33)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [-10]=>
-  float(-0.106)
-  [-8]=>
-  float(-0.9)
-  [-3]=>
-  float(-0.01)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [4]=>
-  int(-1)
-  [5]=>
-  int(0)
-  [6]=>
-  float(0.09)
-  [7]=>
-  int(2)
-  [9]=>
-  float(0.106)
-  [11]=>
-  int(33)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(11) {
-  [-10]=>
-  float(-0.106)
-  [-8]=>
-  float(-0.9)
-  [-3]=>
-  float(-0.01)
-  [1]=>
-  float(0.0001)
-  [2]=>
-  float(0.0021)
-  [4]=>
-  int(-1)
-  [5]=>
-  int(0)
-  [6]=>
-  float(0.09)
-  [7]=>
-  int(2)
-  [9]=>
-  float(0.106)
-  [11]=>
-  int(33)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying various integer/float arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(9) {
-  [-10]=>
-  int(-41)
-  [-6]=>
-  int(-31)
-  [-4]=>
-  int(-21)
-  [-2]=>
-  int(-11)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [7]=>
-  int(0)
-  [8]=>
-  int(41)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(9) {
-  [-10]=>
-  int(-41)
-  [-6]=>
-  int(-31)
-  [-4]=>
-  int(-21)
-  [-2]=>
-  int(-11)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [7]=>
-  int(0)
-  [8]=>
-  int(41)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(9) {
-  [-10]=>
-  int(-41)
-  [-6]=>
-  int(-31)
-  [-4]=>
-  int(-21)
-  [-2]=>
-  int(-11)
-  [1]=>
-  int(11)
-  [3]=>
-  int(21)
-  [5]=>
-  int(31)
-  [7]=>
-  int(0)
-  [8]=>
-  int(41)
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [-7]=>
-  float(-0.1)
-  [0]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-  [4]=>
-  float(0.106)
-  [6]=>
-  float(0.0001)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [-7]=>
-  float(-0.1)
-  [0]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-  [4]=>
-  float(0.106)
-  [6]=>
-  float(0.0001)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(6) {
-  [-7]=>
-  float(-0.1)
-  [0]=>
-  float(0.5)
-  [1]=>
-  float(10.5)
-  [3]=>
-  float(1050)
-  [4]=>
-  float(0.106)
-  [6]=>
-  float(0.0001)
-}
-
--- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [-10]=>

diff --git a/ext/standard/tests/array/ksort_variation4.phpt b/ext/standard/tests/array/ksort_variation4.phpt
index d441462fb9da9a18aecf16c08d401029c8837e97..8404f030e9dace7491ce61f595c26266e502d758 100644 (file)
--- a/ext/standard/tests/array/ksort_variation4.phpt
+++ b/ext/standard/tests/array/ksort_variation4.phpt
@@ -9,7 +9,7 @@ Test ksort() function : usage variations - sort bool values
 
 /*
  * testing ksort() by providing array of boolean values for $array argument with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
 */
 
@@ -18,7 +18,7 @@ echo "*** Testing ksort() : usage variations ***\n";
 // bool value array
 $bool_values = array (true => true, false => false, TRUE => TRUE, FALSE => FALSE);
 
-echo "\n-- Testing ksort() by supplying boolean value array, 'flag' value is defualt --\n";
+echo "\n-- Testing ksort() by supplying boolean value array, 'flag' value is default --\n";
 $temp_array = $bool_values;
 var_dump(ksort($temp_array) );
 var_dump($temp_array);
@@ -40,49 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
--- Testing ksort() by supplying boolean value array, 'flag' value is defualt --
-bool(true)
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
-
--- Testing ksort() by supplying boolean value array, 'flag' value is SORT_REGULAR --
-bool(true)
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
-
--- Testing ksort() by supplying boolean value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
-
--- Testing ksort() by supplying boolean value array, 'flag' value is SORT_STRING --
-bool(true)
-array(2) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(true)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying boolean value array, 'flag' value is defualt --
+-- Testing ksort() by supplying boolean value array, 'flag' value is default --
 bool(true)
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/ksort_variation5.phpt b/ext/standard/tests/array/ksort_variation5.phpt
index 59991851189fc8a2cd0a4de04116e93226386914..52481bef42f75095c74d70904b34f86870c4747c 100644 (file)
--- a/ext/standard/tests/array/ksort_variation5.phpt
+++ b/ext/standard/tests/array/ksort_variation5.phpt
@@ -10,7 +10,7 @@ Test ksort() function : usage variations - sort strings
 /*
  * testing ksort() by providing array of string values for $array argument with
  * following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_STRING  - compare items as strings
 */
@@ -40,7 +40,7 @@ echo "\n-- Testing ksort() by supplying various string arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump(ksort($temp_array) ); // expecting : bool(true)
   var_dump($temp_array);
@@ -57,190 +57,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
 -- Testing ksort() by supplying various string arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  [""]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [""]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(11) {
-  [""]=>
-  NULL
-  ["   "]=>
-  string(1) "  "
-  ["
-"]=>
-  string(1) "
-"
-  ["\v"]=>
-  string(1) "\v"
-  ["\f"]=>
-  string(1) "\f"
-  ["
-"]=>
-  string(1) "
-"
-  ["\a"]=>
-  string(2) "\a"
-  ["\cx"]=>
-  string(3) "\cx"
-  ["\ddd"]=>
-  string(4) "\ddd"
-  ["\e"]=>
-  string(2) "\e"
-  ["\xhh"]=>
-  string(4) "\xhh"
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(11) {
-  ["Apple"]=>
-  string(5) "apple"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["T"]=>
-  string(3) "ttt"
-  ["W"]=>
-  string(2) "ww"
-  ["X"]=>
-  string(1) "x"
-  ["o"]=>
-  string(6) "Orange"
-  ["t"]=>
-  string(4) "TTTT"
-  ["te"]=>
-  string(4) "Test"
-  ["x"]=>
-  string(1) "X"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  ["Apple"]=>
-  string(5) "apple"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["T"]=>
-  string(3) "ttt"
-  ["W"]=>
-  string(2) "ww"
-  ["X"]=>
-  string(1) "x"
-  ["o"]=>
-  string(6) "Orange"
-  ["t"]=>
-  string(4) "TTTT"
-  ["te"]=>
-  string(4) "Test"
-  ["x"]=>
-  string(1) "X"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(11) {
-  ["Apple"]=>
-  string(5) "apple"
-  ["B"]=>
-  string(6) "BANANA"
-  ["Lemon"]=>
-  string(5) "lemoN"
-  ["O"]=>
-  string(6) "oraNGe"
-  ["T"]=>
-  string(3) "ttt"
-  ["W"]=>
-  string(2) "ww"
-  ["X"]=>
-  string(1) "x"
-  ["o"]=>
-  string(6) "Orange"
-  ["t"]=>
-  string(4) "TTTT"
-  ["te"]=>
-  string(4) "Test"
-  ["x"]=>
-  string(1) "X"
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying various string arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [u""]=>
@@ -332,7 +155,7 @@ array(11) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [u"Apple"]=>
@@ -410,4 +233,4 @@ array(11) {
   [u"x"]=>
   unicode(1) "X"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/ksort_variation6.phpt b/ext/standard/tests/array/ksort_variation6.phpt
index bcdb175dbdbcce946dd7a8a776179bac99512cbc..707e68f36624ca82caede574380b449132e1d6e4 100644 (file)
--- a/ext/standard/tests/array/ksort_variation6.phpt
+++ b/ext/standard/tests/array/ksort_variation6.phpt
@@ -9,7 +9,7 @@ Test ksort() function : usage variations - sort hexadecimal values
 
 /*
  * testing ksort() by providing array of hexa-decimal values for $array argument with following flag values:
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  *  3.SORT_NUMERIC - compare items numerically
 */
@@ -23,7 +23,7 @@ $unsorted_hex_array = array (
   0x1ab => 0x1ab, 0xff => 0xff, -0xff => -0xFF, 0 => 0, -0x2aa => -0x2aa
 );
 
-echo "\n-- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing ksort() by supplying hexadecimal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_hex_array;
 var_dump(ksort( $temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -40,82 +40,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
--- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-
--- Testing ksort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-
--- Testing ksort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [-682]=>
-  int(-682)
-  [-255]=>
-  int(-255)
-  [0]=>
-  int(0)
-  [15]=>
-  int(15)
-  [187]=>
-  int(187)
-  [255]=>
-  int(255)
-  [427]=>
-  int(427)
-  [682]=>
-  int(682)
-  [4095]=>
-  int(4095)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying hexadecimal value array, 'flag' value is defualt  --
+-- Testing ksort() by supplying hexadecimal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [-682]=>

diff --git a/ext/standard/tests/array/ksort_variation7.phpt b/ext/standard/tests/array/ksort_variation7.phpt
index c76a8babe76062d10405ff0154738c195b05c58c..39572718c5aab26fbc6e24f95f948f5c39955355 100644 (file)
--- a/ext/standard/tests/array/ksort_variation7.phpt
+++ b/ext/standard/tests/array/ksort_variation7.phpt
@@ -10,7 +10,7 @@ Test ksort() function : usage variations - sort array with diff. sub arrays
 /*
  * testing ksort() by providing arrays containing sub arrays for $array argument 
  * with flowing flag values:
- *  1. flag value as defualt
+ *  1. flag value as default
  *  2. SORT_REGULAR - compare items normally
 */
 
@@ -40,7 +40,7 @@ echo "\n-- Testing ksort() by supplying various arrays containing sub arrays --\
 foreach ($various_arrays as $array) {
  
   echo "\n-- Iteration $count --\n"; 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump( ksort($temp_array) );
   var_dump($temp_array);
@@ -54,13 +54,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
 -- Testing ksort() by supplying various arrays containing sub arrays --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(0) {
 }
@@ -70,7 +70,7 @@ array(0) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(1) {
   [1]=>
@@ -86,7 +86,7 @@ array(1) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [1]=>
@@ -118,128 +118,7 @@ array(3) {
 }
 
 -- Iteration 4 --
-- With defualt sort flag -
-bool(true)
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying various arrays containing sub arrays --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(0) {
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(1) {
-  [1]=>
-  array(0) {
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(1) {
-  [1]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  [1]=>
-  int(11)
-  [3]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [4]=>
-  int(44)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [1]=>
-  int(11)
-  [3]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [4]=>
-  int(44)
-}
-
--- Iteration 4 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/ksort_variation8.phpt b/ext/standard/tests/array/ksort_variation8.phpt
index 4b9032339885c82679df3c7f10aa2e873dd41945..418882c9f07df608640db85b518c0129188c1047 100644 (file)
Binary files a/ext/standard/tests/array/ksort_variation8.phpt and b/ext/standard/tests/array/ksort_variation8.phpt differ

diff --git a/ext/standard/tests/array/ksort_variation9.phpt b/ext/standard/tests/array/ksort_variation9.phpt
index 4d4b844ed1351480b57838c68be04e70957e5bae..b43b4c82414c631a75e0d6c2617249514aa8c773 100644 (file)
--- a/ext/standard/tests/array/ksort_variation9.phpt
+++ b/ext/standard/tests/array/ksort_variation9.phpt
@@ -9,7 +9,7 @@ Test ksort() function : usage variations - sorting arrays with/without keys
 
 /*
  * Testing ksort() by providing arrays  with/without key values for $array argument with following flag values: 
- *  1.flag value as defualt
+ *  1.flag value as default
  *  2.SORT_REGULAR - compare items normally
  */
 
@@ -33,7 +33,7 @@ echo "\n-- Testing ksort() by supplying various arrays with/without key values -
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump( ksort($temp_array) );
   var_dump($temp_array);
@@ -47,13 +47,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing ksort() : usage variations ***
 
 -- Testing ksort() by supplying various arrays with/without key values --
 
 -- Iteration 1 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(5) {
   [5]=>
@@ -83,214 +83,7 @@ array(5) {
 }
 
 -- Iteration 2 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  ["c"]=>
-  string(5) "apple"
-  [0]=>
-  string(6) "banana"
-  ["a"]=>
-  string(6) "orange"
-}
-
--- Iteration 3 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-}
-
--- Iteration 4 --
-- With defualt sort flag -
-bool(true)
-array(3) {
-  [0]=>
-  string(5) "first"
-  [1]=>
-  string(5) "third"
-  [5]=>
-  string(6) "second"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [0]=>
-  string(5) "first"
-  [1]=>
-  string(5) "third"
-  [5]=>
-  string(6) "second"
-}
-
--- Iteration 5 --
-- With defualt sort flag -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [3]=>
-  int(13)
-  [4]=>
-  int(1)
-  [8]=>
-  int(1)
-  [9]=>
-  int(19)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [3]=>
-  int(13)
-  [4]=>
-  int(1)
-  [8]=>
-  int(1)
-  [9]=>
-  int(19)
-}
-
--- Iteration 6 --
-- With defualt sort flag -
-bool(true)
-array(2) {
-  ["bar"]=>
-  string(3) "baz"
-  ["foo"]=>
-  int(1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(2) {
-  ["bar"]=>
-  string(3) "baz"
-  ["foo"]=>
-  int(1)
-}
-
--- Iteration 7 --
-- With defualt sort flag -
-bool(true)
-array(4) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["d"]=>
-  int(5)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  ["c"]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  ["d"]=>
-  int(5)
-}
-Done
---UEXPECTF--
-*** Testing ksort() : usage variations ***
-
--- Testing ksort() by supplying various arrays with/without key values --
-
--- Iteration 1 --
-- With defualt sort flag -
-bool(true)
-array(5) {
-  [5]=>
-  int(55)
-  [6]=>
-  int(66)
-  [7]=>
-  int(22)
-  [8]=>
-  int(33)
-  [9]=>
-  int(11)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(5) {
-  [5]=>
-  int(55)
-  [6]=>
-  int(66)
-  [7]=>
-  int(22)
-  [8]=>
-  int(33)
-  [9]=>
-  int(11)
-}
-
--- Iteration 2 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [u"c"]=>
@@ -312,7 +105,7 @@ array(3) {
 }
 
 -- Iteration 3 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [0]=>
@@ -346,7 +139,7 @@ array(6) {
 }
 
 -- Iteration 4 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [0]=>
@@ -368,7 +161,7 @@ array(3) {
 }
 
 -- Iteration 5 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [0]=>
@@ -402,7 +195,7 @@ array(6) {
 }
 
 -- Iteration 6 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(2) {
   [u"bar"]=>
@@ -420,7 +213,7 @@ array(2) {
 }
 
 -- Iteration 7 --
-- With defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [u"a"]=>

diff --git a/ext/standard/tests/array/locale_sort.phpt b/ext/standard/tests/array/locale_sort.phpt
index e12540e905bd77857d65a05a5127e041b7c66a2b..7ded0336e8e4c2d636421d70bd75fc31aa7adb3a 100644 (file)
--- a/ext/standard/tests/array/locale_sort.phpt
+++ b/ext/standard/tests/array/locale_sort.phpt
@@ -28,36 +28,7 @@ $table = array("AB" => "Alberta",
 asort($table, SORT_LOCALE_STRING);
 var_dump($table);
 ?>
---EXPECT--
-array(13) {
-  ["AB"]=>
-  string(7) "Alberta"
-  ["BC"]=>
-  string(20) "Colombie-Britannique"
-  ["PE"]=>
-  string(21) "Île-du-Prince-Édouard"
-  ["MB"]=>
-  string(8) "Manitoba"
-  ["NB"]=>
-  string(17) "Nouveau-Brunswick"
-  ["NS"]=>
-  string(15) "Nouvelle-Écosse"
-  ["NU"]=>
-  string(7) "Nunavut"
-  ["ON"]=>
-  string(7) "Ontario"
-  ["QC"]=>
-  string(6) "Québec"
-  ["SK"]=>
-  string(12) "Saskatchewan"
-  ["NL"]=>
-  string(23) "Terre-Neuve-et-Labrador"
-  ["YT"]=>
-  string(19) "Territoire du Yukon"
-  ["NT"]=>
-  string(25) "Territoires du Nord-Ouest"
-}
---UEXPECTF--
+--EXPECTF--
 Deprecated: setlocale(): deprecated in Unicode mode, please use ICU locale functions in %s on line %d
 array(13) {
   [u"AB"]=>

diff --git a/ext/standard/tests/array/max.phpt b/ext/standard/tests/array/max.phpt
index 6f9367c7b4d39418b92fbb875c485d28469a3872..a9e69c390343a1409c512b98c2995c6e1c3b822a 100644 (file)
--- a/ext/standard/tests/array/max.phpt
+++ b/ext/standard/tests/array/max.phpt
@@ -19,27 +19,7 @@ var_dump(max(0, true, false, true));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: max(): At least one value should be passed in %s on line %d
-NULL
-
-Warning: Wrong parameter count for max() in %s on line %d
-NULL
-
-Warning: max(): Array must contain at least one element in %s on line %d
-bool(false)
-
-Warning: Wrong parameter count for max() in %s on line %d
-NULL
-int(2)
-float(2.11)
-string(1) "t"
-bool(true)
-bool(true)
-int(1)
-bool(true)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: max(): At least one value should be passed in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/max_basic.phpt b/ext/standard/tests/array/max_basic.phpt
index bf26e4606d5d4aa43cff2ba641e1975f1c099c33..545e5d0250baa6724aa03385479de634979f6fa8 100644 (file)
--- a/ext/standard/tests/array/max_basic.phpt
+++ b/ext/standard/tests/array/max_basic.phpt
@@ -23,25 +23,6 @@ echo "\nDone\n";
 ?>
 --EXPECT--
 
-*** Testing sequences of numbers ***
-int(2)
-int(2)
-float(2.11)
-string(1) "t"
-bool(true)
-bool(true)
-int(1)
-bool(true)
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-
-Done
---UEXPECT--
-
 *** Testing sequences of numbers ***
 int(2)
 int(2)
@@ -58,4 +39,4 @@ array(2) {
   int(3)
 }
 
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/max_error.phpt b/ext/standard/tests/array/max_error.phpt
index 051c132fcc4bca5b3835f557972f4e5ebe1ffa61..cbc36f494697fe00f5bf5366e501e5963f78fef8 100644 (file)
--- a/ext/standard/tests/array/max_error.phpt
+++ b/ext/standard/tests/array/max_error.phpt
@@ -31,18 +31,3 @@ bool(false)
 
 Warning: Wrong parameter count for max() in %s on line %d
 NULL
---UEXPECTF--
-
-*** Testing Error Conditions ***
-
-Warning: max(): At least one %s on line %d
-NULL
-
-Warning: Wrong parameter count for max() in %s on line %d
-NULL
-
-Warning: max(): Array must contain at least one element in %s on line %d
-bool(false)
-
-Warning: Wrong parameter count for max() in %s on line %d
-NULL

diff --git a/ext/standard/tests/array/max_variation1.phpt b/ext/standard/tests/array/max_variation1.phpt
index 8f7b7438675352eaa5ecb2316f1685ae9e3cabb4..a32ceb8fc27a23b69fc99e5d391fcb78c022096f 100644 (file)
--- a/ext/standard/tests/array/max_variation1.phpt
+++ b/ext/standard/tests/array/max_variation1.phpt
@@ -35,17 +35,3 @@ int(-2147483647)
 int(21)
 
 Done
---UEXPECTF--
-
-*** Testing boundary conditions ***
-int(2147483646)
-%s(2147483648)
-%s(2147483648)
-int(-2147483646)
-int(-2147483647)
-int(-2147483647)
-
-*** Testing large number of arguments ***
-int(21)
-
-Done

diff --git a/ext/standard/tests/array/max_variation2.phpt b/ext/standard/tests/array/max_variation2.phpt
index 19ae06c813aa63617a61654b727001cd80ca11d0..7d9e48d4902c8527b27b6799bb8b9e564f033317 100644 (file)
--- a/ext/standard/tests/array/max_variation2.phpt
+++ b/ext/standard/tests/array/max_variation2.phpt
@@ -30,31 +30,6 @@ echo "\nDone\n";
 ?>
 --EXPECTF--
 
-*** Testing arrays  ***
-int(2)
-int(2)
-float(2.11)
-string(1) "t"
-bool(true)
-bool(true)
-int(1)
-bool(true)
-array(2) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(3)
-}
-int(2147483646)
-%s(2147483648)
-%s(2147483648)
-int(-2147483646)
-int(-2147483647)
-int(-2147483647)
-
-Done
---UEXPECTF--
-
 *** Testing arrays  ***
 int(2)
 int(2)

diff --git a/ext/standard/tests/array/min.phpt b/ext/standard/tests/array/min.phpt
index ae5a2b700deef1d2da3df354f94f09aac7850171..a35d2842588d44ada2043babb3bfb547d275b734 100644 (file)
--- a/ext/standard/tests/array/min.phpt
+++ b/ext/standard/tests/array/min.phpt
@@ -19,27 +19,7 @@ var_dump(min(0, true, false, true));
 
 echo "Done\n";
 ?>
---EXPECTF--    
-Warning: min(): At least one value should be passed in %s on line %d
-NULL
-
-Warning: Wrong parameter count for min() in %s on line %d
-NULL
-
-Warning: min(): Array must contain at least one element in %s on line %d
-bool(false)
-
-Warning: Wrong parameter count for min() in %s on line %d
-NULL
-int(1)
-float(2.09)
-string(0) ""
-bool(false)
-bool(false)
-bool(false)
-int(0)
-Done
---UEXPECTF--
+--EXPECTF--
 Warning: min(): At least one value should be passed in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/min_basic.phpt b/ext/standard/tests/array/min_basic.phpt
index b0b7ff9a33a0f639a2d51be0b9c36d3e28e0e2dd..56bf03200fa9cafb9790b5591f653183f534cf81 100644 (file)
--- a/ext/standard/tests/array/min_basic.phpt
+++ b/ext/standard/tests/array/min_basic.phpt
@@ -23,20 +23,6 @@ echo "\nDone\n";
 ?>
 --EXPECT--
 
-*** Testing sequences of numbers ***
-int(1)
-int(-2)
-float(2.09)
-string(0) ""
-bool(false)
-bool(false)
-bool(false)
-int(0)
-int(0)
-
-Done
---UEXPECT--
-
 *** Testing sequences of numbers ***
 int(1)
 int(-2)
@@ -48,4 +34,4 @@ bool(false)
 int(0)
 int(0)
 
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/min_error.phpt b/ext/standard/tests/array/min_error.phpt
index 07db0eecd5b4a9d15cb4501f972679c321b98b4a..f39516c686945717e2969402c7647d2e0135c12d 100644 (file)
--- a/ext/standard/tests/array/min_error.phpt
+++ b/ext/standard/tests/array/min_error.phpt
@@ -31,19 +31,3 @@ bool(false)
 
 Warning: Wrong parameter count for min() in %s on line %d
 NULL
---UEXPECTF--
-
-*** Testing Error Conditions ***
-
-Warning: min(): At least one %s on line %d
-NULL
-
-Warning: Wrong parameter count for min() in %s on line %d
-NULL
-
-Warning: min(): Array must contain at least one element in %s on line %d
-bool(false)
-
-Warning: Wrong parameter count for min() in %s on line %d
-NULL
-

diff --git a/ext/standard/tests/array/min_variation1.phpt b/ext/standard/tests/array/min_variation1.phpt
index 3d6ca2387fa00ce20e1c5df69c196438420ef6ee..9e24bd66a17648601334230117419e8c6e6eac7c 100644 (file)
--- a/ext/standard/tests/array/min_variation1.phpt
+++ b/ext/standard/tests/array/min_variation1.phpt
@@ -35,17 +35,3 @@ int(-2147483647)
 int(0)
 
 Done
---UEXPECTF--
-
-*** Testing boundary conditions ***
-int(2147483645)
-int(2147483647)
-int(2147483646)
-int(-2147483647)
-%s(-2147483648)
-%s(-2147483649)
-
-*** Testing large number of arguments ***
-int(0)
-
-Done

diff --git a/ext/standard/tests/array/min_variation2.phpt b/ext/standard/tests/array/min_variation2.phpt
index 5c8c0e93a7de3e70c72cc19bac5172dfbab3bb53..f752c63a0926de0a602f27d68ed86253f4a60170 100644 (file)
--- a/ext/standard/tests/array/min_variation2.phpt
+++ b/ext/standard/tests/array/min_variation2.phpt
@@ -30,26 +30,6 @@ echo "\nDone\n";
 ?>
 --EXPECTF--
 
-*** Testing arrays  ***
-int(1)
-int(-2)
-float(2.09)
-string(0) ""
-bool(false)
-bool(false)
-bool(false)
-int(0)
-int(0)
-int(2147483645)
-int(2147483647)
-int(2147483646)
-int(-2147483647)
-%s(-2147483648)
-%s(-2147483649)
-
-Done
---UEXPECTF--
-
 *** Testing arrays  ***
 int(1)
 int(-2)

diff --git a/ext/standard/tests/array/natcasesort_basic.phpt b/ext/standard/tests/array/natcasesort_basic.phpt
index 3586718f7eda29dca14f4bffcc825bec3bd3b7ae..06dfb6c277423f383f3f79ffd71cd676cda788e1 100644 (file)
--- a/ext/standard/tests/array/natcasesort_basic.phpt
+++ b/ext/standard/tests/array/natcasesort_basic.phpt
@@ -23,39 +23,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing natcasesort() : basic functionality ***
-
--- Before sorting: --
-array(5) {
-  [0]=>
-  string(3) "A01"
-  [1]=>
-  string(2) "a1"
-  [2]=>
-  string(3) "b10"
-  [3]=>
-  string(3) "a01"
-  [4]=>
-  string(3) "b01"
-}
-
--- After Sorting: --
-bool(true)
-array(5) {
-  [3]=>
-  string(3) "a01"
-  [0]=>
-  string(3) "A01"
-  [1]=>
-  string(2) "a1"
-  [4]=>
-  string(3) "b01"
-  [2]=>
-  string(3) "b10"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : basic functionality ***
 
 -- Before sorting: --
@@ -86,4 +54,4 @@ array(5) {
   [2]=>
   unicode(3) "b10"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_error.phpt b/ext/standard/tests/array/natcasesort_error.phpt
index b941bd1fce0d5c0ae2e82c24ea539124b92de227..377a407d72044127daed403de91cf9952c4ba58a 100644 (file)
--- a/ext/standard/tests/array/natcasesort_error.phpt
+++ b/ext/standard/tests/array/natcasesort_error.phpt
@@ -38,16 +38,3 @@ NULL
 Warning: natcasesort() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing natcasesort() : error conditions ***
-
--- Testing natcasesort() function with Zero arguments --
-
-Warning: natcasesort() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing natcasesort() function with more than expected no. of arguments --
-
-Warning: natcasesort() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/natcasesort_object1.phpt b/ext/standard/tests/array/natcasesort_object1.phpt
index 8ca4119459133138ec22ad76fd34dd0c9b21f361..f92625784c7861d72fddf73bd7fedea04b1a7abc 100644 (file)
--- a/ext/standard/tests/array/natcasesort_object1.phpt
+++ b/ext/standard/tests/array/natcasesort_object1.phpt
@@ -52,54 +52,6 @@ echo "Done";
 --EXPECTF--
 *** Testing natcasesort() : object functionality ***
 
--- Testing natcasesort() by supplying various object arrays --
-bool(true)
-array(8) {
-  [4]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  [7]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  [0]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  [6]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  [5]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  [3]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  [1]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  [2]=>
-  object(for_string_natcasesort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-Done
---UEXPECTF--
-*** Testing natcasesort() : object functionality ***
-
 -- Testing natcasesort() by supplying various object arrays --
 bool(true)
 array(8) {
@@ -144,4 +96,4 @@ array(8) {
     unicode(1) "w"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_object2.phpt b/ext/standard/tests/array/natcasesort_object2.phpt
index bd99a20b3faeedcea9d2f2b8f74da7f09b815815..0e7046298291aad4e42d400090b11ffde234b389 100644 (file)
--- a/ext/standard/tests/array/natcasesort_object2.phpt
+++ b/ext/standard/tests/array/natcasesort_object2.phpt
@@ -56,50 +56,6 @@ echo "Done";
 --EXPECTF--
 *** Testing natcasesort() : object functionality ***
 
--- Testing natcasesort() by supplying object arrays --
-bool(true)
-array(4) {
-  [0]=>
-  object(for_string_natcasesort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_natcasesort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(3) "ass"
-  }
-  [3]=>
-  object(for_string_natcasesort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "py"
-    ["private_class_value":"for_string_natcasesort":private]=>
-    string(2) "PY"
-    ["protected_class_value":protected]=>
-    string(2) "pt"
-  }
-  [1]=>
-  object(for_string_natcasesort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "t"
-    ["private_class_value":"for_string_natcasesort":private]=>
-    string(3) "eee"
-    ["protected_class_value":protected]=>
-    string(3) "abb"
-  }
-  [2]=>
-  object(for_string_natcasesort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_natcasesort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-*** Testing natcasesort() : object functionality ***
-
 -- Testing natcasesort() by supplying object arrays --
 bool(true)
 array(4) {
@@ -140,4 +96,4 @@ array(4) {
     unicode(1) "c"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_variation1.phpt b/ext/standard/tests/array/natcasesort_variation1.phpt
index 05597a552c3bf6f01d50b38c29c1c93747e52f2c..509ac99a9c6349289bf1bb54f1f457c68593a463 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation1.phpt
+++ b/ext/standard/tests/array/natcasesort_variation1.phpt
@@ -218,127 +218,3 @@ NULL
 Warning: natcasesort(): The argument should be an array in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-
--- Iteration 1 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 16 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 18 --
-bool(true)
-
--- Iteration 19 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 22 --
-bool(true)
-
--- Iteration 23 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: natcasesort(): The argument should be an array in %s on line %d
-NULL
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/natcasesort_variation10.phpt b/ext/standard/tests/array/natcasesort_variation10.phpt
index 6342624ae5f443bc57e5c248f5dda40ef6d938d6..09f69eb93db639b05c7d59194251faae21e098d4 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation10.phpt
+++ b/ext/standard/tests/array/natcasesort_variation10.phpt
@@ -28,30 +28,7 @@ echo key($array_arg) . " => " . current ($array_arg) . "\n";
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing natcasesort() : usage variations ***
-
--- Initial Position of Internal Pointer: --
-0 => img13
-
--- Call natcasesort() --
-bool(true)
-array(4) {
-  [3]=>
-  string(4) "img1"
-  [2]=>
-  string(4) "img2"
-  [0]=>
-  string(5) "img13"
-  [1]=>
-  string(5) "img20"
-}
-
--- Position of Internal Pointer in Passed Array: --
-3 => img1
-Done
-
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variations ***
 
 -- Initial Position of Internal Pointer: --

diff --git a/ext/standard/tests/array/natcasesort_variation11.phpt b/ext/standard/tests/array/natcasesort_variation11.phpt
index 7271db91192cdce688258256e198a7dec363c041..c25e6c42dab06180689488e458127f3352b3c595 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation11.phpt
+++ b/ext/standard/tests/array/natcasesort_variation11.phpt
@@ -112,125 +112,7 @@ foreach($inputs as $input) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing natcasesort() : usage variations ***
-
--- Iteration 1 --
-bool(true)
-array(4) {
-  [-2345]=>
-  string(8) "negative"
-  [1]=>
-  string(3) "one"
-  [12345]=>
-  string(8) "positive"
-  [0]=>
-  string(4) "zero"
-}
-
--- Iteration 2 --
-bool(true)
-array(3) {
-  [0]=>
-  string(4) "half"
-  [-10]=>
-  string(8) "negative"
-  [10]=>
-  string(8) "positive"
-}
-
--- Iteration 3 --
-bool(true)
-array(2) {
-  [12345678]=>
-  string(5) "large"
-  [0]=>
-  string(5) "small"
-}
-
--- Iteration 4 --
-bool(true)
-array(1) {
-  [""]=>
-  string(6) "null 1"
-}
-
--- Iteration 5 --
-bool(true)
-array(1) {
-  [""]=>
-  string(6) "null 2"
-}
-
--- Iteration 6 --
-bool(true)
-array(2) {
-  [0]=>
-  string(6) "lowerf"
-  [1]=>
-  string(6) "lowert"
-}
-
--- Iteration 7 --
-bool(true)
-array(2) {
-  [0]=>
-  string(6) "upperf"
-  [1]=>
-  string(6) "uppert"
-}
-
--- Iteration 8 --
-bool(true)
-array(1) {
-  [""]=>
-  string(6) "emptyd"
-}
-
--- Iteration 9 --
-bool(true)
-array(1) {
-  [""]=>
-  string(6) "emptys"
-}
-
--- Iteration 10 --
-bool(true)
-array(3) {
-  ["stringd"]=>
-  string(7) "stringd"
-  ["hello world"]=>
-  string(7) "stringh"
-  ["strings"]=>
-  string(7) "strings"
-}
-
--- Iteration 11 --
-bool(true)
-array(1) {
-  [""]=>
-  string(9) "undefined"
-}
-
--- Iteration 12 --
-bool(true)
-array(1) {
-  [""]=>
-  string(5) "unset"
-}
-
--- Iteration 13 --
-bool(true)
-array(3) {
-  ["foo"]=>
-  string(3) "bar"
-  ["baz"]=>
-  string(3) "bar"
-  ["hello"]=>
-  string(5) "world"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variations ***
 
 -- Iteration 1 --
@@ -347,4 +229,4 @@ array(3) {
   [u"hello"]=>
   unicode(5) "world"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_variation2.phpt b/ext/standard/tests/array/natcasesort_variation2.phpt
index 076f856be2b92344d0be26564a066773c5f7357d..eb592997d4ea6444dc94d260bc848bbce54dd7a5 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation2.phpt
+++ b/ext/standard/tests/array/natcasesort_variation2.phpt
@@ -171,113 +171,6 @@ array(4) {
   bool(true)
 }
 
--- Iteration 5 --
-bool(true)
-array(2) {
-  [1]=>
-  string(0) ""
-  [0]=>
-  string(0) ""
-}
-
--- Iteration 6 --
-bool(true)
-array(0) {
-}
-
--- Iteration 7 --
-bool(true)
-array(3) {
-  [2]=>
-  string(11) "hello world"
-  [1]=>
-  string(6) "string"
-  [0]=>
-  string(6) "string"
-}
-
--- Iteration 8 --
-bool(true)
-array(1) {
-  [0]=>
-  object(classA)#%d (0) {
-  }
-}
-
--- Iteration 9 --
-bool(true)
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 10 --
-bool(true)
-array(1) {
-  [0]=>
-  NULL
-}
-
--- Iteration 11 --
-bool(true)
-array(1) {
-  [0]=>
-  resource(%d) of type (stream)
-}
-Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-
--- Iteration 1 --
-bool(true)
-array(4) {
-  [3]=>
-  int(-2345)
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-  [2]=>
-  int(12345)
-}
-
--- Iteration 2 --
-bool(true)
-array(5) {
-  [1]=>
-  float(-10.5)
-  [4]=>
-  float(0.5)
-  [3]=>
-  float(1.23456789E-9)
-  [0]=>
-  float(10.5)
-  [2]=>
-  float(123456789000)
-}
-
--- Iteration 3 --
-bool(true)
-array(2) {
-  [1]=>
-  NULL
-  [0]=>
-  NULL
-}
-
--- Iteration 4 --
-bool(true)
-array(4) {
-  [3]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [0]=>
-  bool(true)
-  [2]=>
-  bool(true)
-}
-
 -- Iteration 5 --
 bool(true)
 array(2) {
@@ -331,4 +224,4 @@ array(1) {
   [0]=>
   resource(%d) of type (stream)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_variation3.phpt b/ext/standard/tests/array/natcasesort_variation3.phpt
index 9f28c80cb9b8d6ff07a0519019399e0c07ef1aa7..08db8749176e7b8b0659124bb4305645cdbd5311 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation3.phpt
+++ b/ext/standard/tests/array/natcasesort_variation3.phpt
@@ -42,98 +42,7 @@ foreach ($inputs as $array_arg) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing natcasesort() : usage variation ***
-
--- Iteration 1 --
-bool(true)
-array(9) {
-  [1]=>
-  int(-11)
-  [3]=>
-  int(-21)
-  [5]=>
-  int(-31)
-  [8]=>
-  int(-41)
-  [6]=>
-  int(0)
-  [0]=>
-  int(11)
-  [2]=>
-  int(21)
-  [4]=>
-  int(31)
-  [7]=>
-  int(41)
-}
-
--- Iteration 1 --
-bool(true)
-array(7) {
-  [6]=>
-  float(-0.1)
-  [1]=>
-  float(-10.5)
-  [5]=>
-  float(0.01)
-  [4]=>
-  float(0.5)
-  [3]=>
-  float(0.106)
-  [0]=>
-  float(10.5)
-  [2]=>
-  float(1050)
-}
-
--- Iteration 1 --
-bool(true)
-array(11) {
-  [2]=>
-  float(-0.01)
-  [7]=>
-  float(-0.9)
-  [9]=>
-  float(-0.106)
-  [3]=>
-  int(-1)
-  [4]=>
-  int(0)
-  [0]=>
-  float(0.0001)
-  [1]=>
-  float(0.0021)
-  [5]=>
-  float(0.09)
-  [8]=>
-  float(0.106)
-  [6]=>
-  int(2)
-  [10]=>
-  int(33)
-}
-
--- Iteration 1 --
-bool(true)
-array(7) {
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  float(-2147483648)
-  [6]=>
-  float(-2147483649)
-  [5]=>
-  int(0)
-  [4]=>
-  int(0)
-  [0]=>
-  int(2147483647)
-  [1]=>
-  float(2147483648)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variation ***
 
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/natcasesort_variation4.phpt b/ext/standard/tests/array/natcasesort_variation4.phpt
index 0896290c1b99cb18d775af6a10a0192a9b4b0fab..8c655bd0c3ff83f61c0b25b71d38bf34a747898b 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation4.phpt
+++ b/ext/standard/tests/array/natcasesort_variation4.phpt
@@ -28,63 +28,7 @@ foreach ($inputs as $array_arg) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing natcasesort() : usage variation ***
-bool(true)
-array(11) {
-  [6]=>
-  string(1) "
-"
-  [7]=>
-  string(1) "  "
-  [10]=>
-  string(1) "\v"
-  [0]=>
-  NULL
-  [5]=>
-  string(1) "\f"
-  [1]=>
-  NULL
-  [2]=>
-  string(2) "\a"
-  [3]=>
-  string(3) "\cx"
-  [9]=>
-  string(4) "\ddd"
-  [4]=>
-  string(2) "\e"
-  [8]=>
-  string(4) "\xhh"
-}
-bool(true)
-array(12) {
-  [3]=>
-  string(5) "apple"
-  [11]=>
-  string(6) "BANANA"
-  [2]=>
-  string(6) "banana"
-  [0]=>
-  string(5) "lemoN"
-  [10]=>
-  string(6) "oraNGe"
-  [1]=>
-  string(6) "Orange"
-  [4]=>
-  string(4) "Test"
-  [6]=>
-  string(3) "ttt"
-  [5]=>
-  string(4) "TTTT"
-  [7]=>
-  string(2) "ww"
-  [8]=>
-  string(1) "x"
-  [9]=>
-  string(1) "X"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variation ***
 bool(true)
 array(11) {
@@ -139,4 +83,4 @@ array(12) {
   [9]=>
   unicode(1) "X"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_variation5.phpt b/ext/standard/tests/array/natcasesort_variation5.phpt
index 70bdad1796946f7a2dd4b618a8e8589048b7ddbe..f2cbd17191150b86ef85a0a2c5b74805fe794eb7 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation5.phpt
+++ b/ext/standard/tests/array/natcasesort_variation5.phpt
@@ -19,7 +19,7 @@ var_dump($unsorted_hex_array);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variation ***
 bool(true)
 array(11) {
@@ -47,31 +47,3 @@ array(11) {
   int(4095)
 }
 Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-bool(true)
-array(11) {
-  [8]=>
-  int(-255)
-  [10]=>
-  int(-682)
-  [9]=>
-  int(0)
-  [2]=>
-  int(15)
-  [5]=>
-  int(187)
-  [3]=>
-  int(255)
-  [7]=>
-  int(255)
-  [0]=>
-  int(427)
-  [6]=>
-  int(427)
-  [4]=>
-  int(682)
-  [1]=>
-  int(4095)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/natcasesort_variation6.phpt b/ext/standard/tests/array/natcasesort_variation6.phpt
index 19a516841637c19fbc3d225841575f4e42970f69..bbbefa799e21509ae4c54ef8082e143768533966 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation6.phpt
+++ b/ext/standard/tests/array/natcasesort_variation6.phpt
@@ -29,7 +29,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variation ***
 
 -- Initial test --
@@ -54,28 +54,3 @@ array(3) {
   &int(555)
 }
 Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-
--- Initial test --
-bool(true)
-array(3) {
-  [1]=>
-  &int(33)
-  [0]=>
-  &int(100)
-  [2]=>
-  &int(555)
-}
-
--- Change $value1 --
-bool(true)
-array(3) {
-  [0]=>
-  &int(-29)
-  [1]=>
-  &int(33)
-  [2]=>
-  &int(555)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/natcasesort_variation7.phpt b/ext/standard/tests/array/natcasesort_variation7.phpt
index 05f5f3a8525a5c8e7f07168fab8fbfa0577f15d1..f4c70702de99b2a3fd8324617deaca57bb9f0520 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation7.phpt
+++ b/ext/standard/tests/array/natcasesort_variation7.phpt
@@ -22,79 +22,7 @@ var_dump($array);
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing natcasesort() : usage variations ***
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  float(3)
-  [2]=>
-  string(4) "zero"
-  [3]=>
-  string(1) "2"
-  [4]=>
-  &array(5) {
-    [0]=>
-    int(1)
-    [1]=>
-    float(3)
-    [2]=>
-    string(4) "zero"
-    [3]=>
-    string(1) "2"
-    [4]=>
-    &array(5) {
-      [0]=>
-      int(1)
-      [1]=>
-      float(3)
-      [2]=>
-      string(4) "zero"
-      [3]=>
-      string(1) "2"
-      [4]=>
-      *RECURSION*
-    }
-  }
-}
-bool(true)
-array(5) {
-  [0]=>
-  int(1)
-  [3]=>
-  string(1) "2"
-  [1]=>
-  float(3)
-  [4]=>
-  &array(5) {
-    [0]=>
-    int(1)
-    [3]=>
-    string(1) "2"
-    [1]=>
-    float(3)
-    [4]=>
-    &array(5) {
-      [0]=>
-      int(1)
-      [3]=>
-      string(1) "2"
-      [1]=>
-      float(3)
-      [4]=>
-      *RECURSION*
-      [2]=>
-      string(4) "zero"
-    }
-    [2]=>
-    string(4) "zero"
-  }
-  [2]=>
-  string(4) "zero"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variations ***
 array(5) {
   [0]=>
@@ -165,4 +93,4 @@ array(5) {
   [2]=>
   unicode(4) "zero"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/natcasesort_variation8.phpt b/ext/standard/tests/array/natcasesort_variation8.phpt
index 2dfdaf54310122c2653a4f199d59bbd2d501d1ed..b0f7cbba5079d6c9b92684def612dcc4a4bc0598 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation8.phpt
+++ b/ext/standard/tests/array/natcasesort_variation8.phpt
@@ -20,7 +20,7 @@ var_dump($unsorted_oct_array);
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing natcasesort() : usage variation ***
 bool(true)
 array(9) {
@@ -44,27 +44,3 @@ array(9) {
   int(669)
 }
 Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-bool(true)
-array(9) {
-  [6]=>
-  int(-54)
-  [7]=>
-  int(-229)
-  [8]=>
-  int(0)
-  [3]=>
-  int(54)
-  [5]=>
-  int(63)
-  [1]=>
-  int(209)
-  [2]=>
-  int(229)
-  [4]=>
-  int(506)
-  [0]=>
-  int(669)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/natcasesort_variation9.phpt b/ext/standard/tests/array/natcasesort_variation9.phpt
index c105c412a650cbc0703193f804146ffdf274ca38..156375941b1861e317e92796dc43fca66a4c1ffd 100644 (file)
--- a/ext/standard/tests/array/natcasesort_variation9.phpt
+++ b/ext/standard/tests/array/natcasesort_variation9.phpt
@@ -35,82 +35,6 @@ echo "Done";
 --EXPECTF--
 *** Testing natcasesort() : usage variation ***
 bool(true)
-array(22) {
-  [13]=>
-  NULL
-  [19]=>
-  string(0) ""
-  [21]=>
-  bool(false)
-  [12]=>
-  string(0) ""
-  [10]=>
-  string(3) "-.9"
-  [7]=>
-  int(-2)
-  [8]=>
-  float(-2)
-  [9]=>
-  float(-2.98989)
-  [2]=>
-  int(-4)
-  [16]=>
-  float(0)
-  [17]=>
-  int(0)
-  [20]=>
-  bool(true)
-  [3]=>
-  string(1) "4"
-  [4]=>
-  float(4)
-  [6]=>
-  string(1) "5"
-  [14]=>
-  string(2) "ab"
-  [15]=>
-  string(4) "abcd"
-  [18]=>
-  string(14) "%s"
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(4) {
-    [0]=>
-    array(3) {
-      [0]=>
-      int(33)
-      [1]=>
-      int(-5)
-      [2]=>
-      int(6)
-    }
-    [1]=>
-    array(1) {
-      [0]=>
-      int(11)
-    }
-    [2]=>
-    array(2) {
-      [0]=>
-      int(22)
-      [1]=>
-      int(-55)
-    }
-    [3]=>
-    array(0) {
-    }
-  }
-  [5]=>
-  string(1) "b"
-  [11]=>
-  string(4) "True"
-}
-Done
---UEXPECTF--
-*** Testing natcasesort() : usage variation ***
-bool(true)
 array(22) {
   [13]=>
   NULL
@@ -183,4 +107,4 @@ array(22) {
   [11]=>
   unicode(4) "True"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/next_basic.phpt b/ext/standard/tests/array/next_basic.phpt
index c58e15492532982aa294ae0d65e41ec5b6c69429..358e396e5f4b057f202a9b60e0763afc1525353b 100644 (file)
--- a/ext/standard/tests/array/next_basic.phpt
+++ b/ext/standard/tests/array/next_basic.phpt
@@ -24,16 +24,7 @@ echo key($array) . " => " . current($array) . "\n";
 var_dump(next($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing next() : basic functionality ***
-0 => zero
-string(3) "one"
-1 => one
-string(3) "two"
-2 => two
-bool(false)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing next() : basic functionality ***
 0 => zero
 unicode(3) "one"

diff --git a/ext/standard/tests/array/next_error.phpt b/ext/standard/tests/array/next_error.phpt
index f89fa4ccade5c02b41b36b62034700017ffe1f11..f7b78357cb718c48cac93d0d8dd5008a1f3da54d 100644 (file)
--- a/ext/standard/tests/array/next_error.phpt
+++ b/ext/standard/tests/array/next_error.phpt
@@ -37,16 +37,3 @@ NULL
 Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 ===DONE===
---UEXPECTF--
-*** Testing next() : error conditions ***
-
--- Testing next() function with Zero arguments --
-
-Warning: next() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing next() function with more than expected no. of arguments --
-
-Warning: next() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===

diff --git a/ext/standard/tests/array/next_variation1.phpt b/ext/standard/tests/array/next_variation1.phpt
index 0948dc2f803e9c3a6f9a45b7802959bb1ae46487..959b3b6ee08937e2e6c34a602332d22359238dff 100644 (file)
--- a/ext/standard/tests/array/next_variation1.phpt
+++ b/ext/standard/tests/array/next_variation1.phpt
@@ -173,132 +173,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-bool(false)
-
--- Iteration 19 --
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: next() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: next() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: next() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-===DONE===
---UEXPECTF--
-*** Testing next() : variation ***
-
--- Iteration 1 --
-
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: next() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: next() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: next() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: next() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: next() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/next_variation2.phpt b/ext/standard/tests/array/next_variation2.phpt
index c846881a005d64491cee1ad480fb51567ae1ba45..1ecde7efce448b0dc59f89e548221aed9cd61137 100644 (file)
--- a/ext/standard/tests/array/next_variation2.phpt
+++ b/ext/standard/tests/array/next_variation2.phpt
@@ -26,24 +26,7 @@ echo "\n-- Pass a sub-array as \$array_arg --\n";
 var_dump(next($array_arg[0]));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing next() : usage variations ***
-
--- Pass a two-dimensional array as $array_arg --
-array(3) {
-  [0]=>
-  int(9)
-  [1]=>
-  int(8)
-  [2]=>
-  int(7)
-}
-bool(false)
-
--- Pass a sub-array as $array_arg --
-int(8)
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing next() : usage variations ***
 
 -- Pass a two-dimensional array as $array_arg --

diff --git a/ext/standard/tests/array/range.phpt b/ext/standard/tests/array/range.phpt
index 3bda860deb767f9e407c7e134fea0fbc7b9c3e5b..cf2e185ffb439ecba762baa23eee4bb68274d172 100644 (file)
--- a/ext/standard/tests/array/range.phpt
+++ b/ext/standard/tests/array/range.phpt
@@ -48,405 +48,7 @@ var_dump( range("abcd", "mnop", 2) );
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing range() function on basic operations ***
-
--- Integers as Low and High --
--- An array of elements from low to high --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-
--- An array of elements from high to low --
-array(10) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(9)
-  [2]=>
-  int(8)
-  [3]=>
-  int(7)
-  [4]=>
-  int(6)
-  [5]=>
-  int(5)
-  [6]=>
-  int(4)
-  [7]=>
-  int(3)
-  [8]=>
-  int(2)
-  [9]=>
-  int(1)
-}
-
--- Numeric Strings as Low and High --
--- An array of elements from low to high --
-array(10) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [7]=>
-  int(8)
-  [8]=>
-  int(9)
-  [9]=>
-  int(10)
-}
-
--- An array of elements from high to low --
-array(10) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(9)
-  [2]=>
-  int(8)
-  [3]=>
-  int(7)
-  [4]=>
-  int(6)
-  [5]=>
-  int(5)
-  [6]=>
-  int(4)
-  [7]=>
-  int(3)
-  [8]=>
-  int(2)
-  [9]=>
-  int(1)
-}
-
--- Chars as Low and High --
--- An array of elements from low to high --
-array(26) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "b"
-  [2]=>
-  string(1) "c"
-  [3]=>
-  string(1) "d"
-  [4]=>
-  string(1) "e"
-  [5]=>
-  string(1) "f"
-  [6]=>
-  string(1) "g"
-  [7]=>
-  string(1) "h"
-  [8]=>
-  string(1) "i"
-  [9]=>
-  string(1) "j"
-  [10]=>
-  string(1) "k"
-  [11]=>
-  string(1) "l"
-  [12]=>
-  string(1) "m"
-  [13]=>
-  string(1) "n"
-  [14]=>
-  string(1) "o"
-  [15]=>
-  string(1) "p"
-  [16]=>
-  string(1) "q"
-  [17]=>
-  string(1) "r"
-  [18]=>
-  string(1) "s"
-  [19]=>
-  string(1) "t"
-  [20]=>
-  string(1) "u"
-  [21]=>
-  string(1) "v"
-  [22]=>
-  string(1) "w"
-  [23]=>
-  string(1) "x"
-  [24]=>
-  string(1) "y"
-  [25]=>
-  string(1) "z"
-}
-
--- An array of elements from high to low --
-array(26) {
-  [0]=>
-  string(1) "z"
-  [1]=>
-  string(1) "y"
-  [2]=>
-  string(1) "x"
-  [3]=>
-  string(1) "w"
-  [4]=>
-  string(1) "v"
-  [5]=>
-  string(1) "u"
-  [6]=>
-  string(1) "t"
-  [7]=>
-  string(1) "s"
-  [8]=>
-  string(1) "r"
-  [9]=>
-  string(1) "q"
-  [10]=>
-  string(1) "p"
-  [11]=>
-  string(1) "o"
-  [12]=>
-  string(1) "n"
-  [13]=>
-  string(1) "m"
-  [14]=>
-  string(1) "l"
-  [15]=>
-  string(1) "k"
-  [16]=>
-  string(1) "j"
-  [17]=>
-  string(1) "i"
-  [18]=>
-  string(1) "h"
-  [19]=>
-  string(1) "g"
-  [20]=>
-  string(1) "f"
-  [21]=>
-  string(1) "e"
-  [22]=>
-  string(1) "d"
-  [23]=>
-  string(1) "c"
-  [24]=>
-  string(1) "b"
-  [25]=>
-  string(1) "a"
-}
-
--- Low and High are equal --
-array(1) {
-  [0]=>
-  int(5)
-}
-array(1) {
-  [0]=>
-  string(1) "q"
-}
-
--- floats as Low and High --
-array(6) {
-  [0]=>
-  float(5.1)
-  [1]=>
-  float(6.1)
-  [2]=>
-  float(7.1)
-  [3]=>
-  float(8.1)
-  [4]=>
-  float(9.1)
-  [5]=>
-  float(10.1)
-}
-array(6) {
-  [0]=>
-  float(10.1)
-  [1]=>
-  float(9.1)
-  [2]=>
-  float(8.1)
-  [3]=>
-  float(7.1)
-  [4]=>
-  float(6.1)
-  [5]=>
-  float(5.1)
-}
-array(6) {
-  [0]=>
-  float(5.1)
-  [1]=>
-  float(6.1)
-  [2]=>
-  float(7.1)
-  [3]=>
-  float(8.1)
-  [4]=>
-  float(9.1)
-  [5]=>
-  float(10.1)
-}
-array(6) {
-  [0]=>
-  float(10.1)
-  [1]=>
-  float(9.1)
-  [2]=>
-  float(8.1)
-  [3]=>
-  float(7.1)
-  [4]=>
-  float(6.1)
-  [5]=>
-  float(5.1)
-}
-
--- Passing step with Low and High --
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-array(11) {
-  [0]=>
-  float(2)
-  [1]=>
-  float(1.9)
-  [2]=>
-  float(1.8)
-  [3]=>
-  float(1.7)
-  [4]=>
-  float(1.6)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.4)
-  [7]=>
-  float(1.3)
-  [8]=>
-  float(1.2)
-  [9]=>
-  float(1.1)
-  [10]=>
-  float(1)
-}
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-array(11) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(1.1)
-  [2]=>
-  float(1.2)
-  [3]=>
-  float(1.3)
-  [4]=>
-  float(1.4)
-  [5]=>
-  float(1.5)
-  [6]=>
-  float(1.6)
-  [7]=>
-  float(1.7)
-  [8]=>
-  float(1.8)
-  [9]=>
-  float(1.9)
-  [10]=>
-  float(2)
-}
-
--- Testing basic string with step --
-array(7) {
-  [0]=>
-  string(1) "a"
-  [1]=>
-  string(1) "c"
-  [2]=>
-  string(1) "e"
-  [3]=>
-  string(1) "g"
-  [4]=>
-  string(1) "i"
-  [5]=>
-  string(1) "k"
-  [6]=>
-  string(1) "m"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing range() function on basic operations ***
 
 -- Integers as Low and High --

diff --git a/ext/standard/tests/array/range_variation.phpt b/ext/standard/tests/array/range_variation.phpt
index 97b2c1df723c575cadbc65bdac1e1363a69aa19f..6f58c2ced5c4875b2fac90b47d82612daa84f698 100644 (file)
--- a/ext/standard/tests/array/range_variation.phpt
+++ b/ext/standard/tests/array/range_variation.phpt
@@ -25,636 +25,6 @@ echo "Done\n";
 --EXPECTF--
 *** Testing range() with various low and high values ***
 -- creating an array with low = 'ABCD' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  string(1) "A"
-}
-
--- creating an array with low = 'ABCD' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = 'ABCD' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = 'ABCD' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'ABCD' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '-10.5555' and high = 'ABCD' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-}
-
--- creating an array with low = '-10.5555' and high = '-10.5555' --
-array(1) {
-  [0]=>
-  float(-10.5555)
-}
-
--- creating an array with low = '-10.5555' and high = '1' --
-array(12) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-  [11]=>
-  float(0.4445)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-}
-
--- creating an array with low = '-10.5555' and high = '' --
-array(11) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = '-10.5555' and high = 'Array' --
-array(12) {
-  [0]=>
-  float(-10.5555)
-  [1]=>
-  float(-9.5555)
-  [2]=>
-  float(-8.5555)
-  [3]=>
-  float(-7.5555)
-  [4]=>
-  float(-6.5555)
-  [5]=>
-  float(-5.5555)
-  [6]=>
-  float(-4.5555)
-  [7]=>
-  float(-3.5555)
-  [8]=>
-  float(-2.5555)
-  [9]=>
-  float(-1.5555)
-  [10]=>
-  float(-0.5555)
-  [11]=>
-  float(0.4445)
-}
-
--- creating an array with low = '1' and high = 'ABCD' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '-10.5555' --
-array(12) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(0)
-  [2]=>
-  float(-1)
-  [3]=>
-  float(-2)
-  [4]=>
-  float(-3)
-  [5]=>
-  float(-4)
-  [6]=>
-  float(-5)
-  [7]=>
-  float(-6)
-  [8]=>
-  float(-7)
-  [9]=>
-  float(-8)
-  [10]=>
-  float(-9)
-  [11]=>
-  float(-10)
-}
-
--- creating an array with low = '1' and high = '1' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
--- creating an array with low = '1' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = '1' and high = 'Array' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = 'ABCD' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '-10.5555' --
-array(11) {
-  [0]=>
-  float(0)
-  [1]=>
-  float(-1)
-  [2]=>
-  float(-2)
-  [3]=>
-  float(-3)
-  [4]=>
-  float(-4)
-  [5]=>
-  float(-5)
-  [6]=>
-  float(-6)
-  [7]=>
-  float(-7)
-  [8]=>
-  float(-8)
-  [9]=>
-  float(-9)
-  [10]=>
-  float(-10)
-}
-
--- creating an array with low = '' and high = '1' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
--- creating an array with low = '' and high = '' --
-array(1) {
-  [0]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = '' and high = 'Array' --
-array(2) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(1)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = 'ABCD' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = '-10.5555' --
-array(12) {
-  [0]=>
-  float(1)
-  [1]=>
-  float(0)
-  [2]=>
-  float(-1)
-  [3]=>
-  float(-2)
-  [4]=>
-  float(-3)
-  [5]=>
-  float(-4)
-  [6]=>
-  float(-5)
-  [7]=>
-  float(-6)
-  [8]=>
-  float(-7)
-  [9]=>
-  float(-8)
-  [10]=>
-  float(-9)
-  [11]=>
-  float(-10)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = '1' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = '' --
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(0)
-}
-
-Notice: Array to string conversion in %s on line %d
-
-Notice: Array to string conversion in %s on line %d
-
--- creating an array with low = 'Array' and high = 'Array' --
-array(1) {
-  [0]=>
-  int(1)
-}
-
-*** Possible variatins with steps ***
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(4)
-  [4]=>
-  int(5)
-}
-Done
---UEXPECTF--
-*** Testing range() with various low and high values ***
--- creating an array with low = 'ABCD' and high = 'ABCD' --
 array(1) {
   [0]=>
   unicode(1) "A"

diff --git a/ext/standard/tests/array/range_variation1.phpt b/ext/standard/tests/array/range_variation1.phpt
index 6e57f731274568f4091bfad2ec6712454e009deb..0747fab3363c2b3ba91d80918d3a411b7d32e38d 100644 (file)
--- a/ext/standard/tests/array/range_variation1.phpt
+++ b/ext/standard/tests/array/range_variation1.phpt
@@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) );
 
 echo "\nDone";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing max/outof range values ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/range_variation1_64bit.phpt b/ext/standard/tests/array/range_variation1_64bit.phpt
index a14dae987f1e63e1247ba34dbbc43b58b102701d..555dbc2e1a26ea2fda92c1ea5aed7cc0e75aa7d0 100644 (file)
--- a/ext/standard/tests/array/range_variation1_64bit.phpt
+++ b/ext/standard/tests/array/range_variation1_64bit.phpt
@@ -20,7 +20,7 @@ var_dump( range(-2147483649, -2147483647) );
 
 echo "\nDone";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing max/outof range values ***
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/reset_basic.phpt b/ext/standard/tests/array/reset_basic.phpt
index 5085614807e9e9bfb49af7ed18cbed66d4e37bf0..b18f6ff64bdb35f832354718ee9fd2b8cf4eb3d1 100644 (file)
--- a/ext/standard/tests/array/reset_basic.phpt
+++ b/ext/standard/tests/array/reset_basic.phpt
@@ -28,22 +28,7 @@ echo "\n-- Call to reset() --\n";
 var_dump(reset($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing reset() : basic functionality ***
-
--- Initial Position: --
-0 => zero
-
--- Call to next() --
-string(3) "one"
-
--- Current Position: --
-1 => one
-
--- Call to reset() --
-string(4) "zero"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing reset() : basic functionality ***
 
 -- Initial Position: --

diff --git a/ext/standard/tests/array/reset_error.phpt b/ext/standard/tests/array/reset_error.phpt
index 472b81d4cf35db6e6f7686f48645cca5182e3037..c71608112c3a07e4ea252545d4f4ee3a26859f70 100644 (file)
--- a/ext/standard/tests/array/reset_error.phpt
+++ b/ext/standard/tests/array/reset_error.phpt
@@ -37,16 +37,3 @@ NULL
 Warning: reset() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 ===DONE===
---UEXPECTF--
-*** Testing reset() : error conditions ***
-
--- Testing reset() function with Zero arguments --
-
-Warning: reset() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing reset() function with more than expected no. of arguments --
-
-Warning: reset() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-===DONE===

diff --git a/ext/standard/tests/array/reset_variation1.phpt b/ext/standard/tests/array/reset_variation1.phpt
index 149d8876602889045d8fd9a3c50eeac294698577..1637789eb8d49419a19de00e101b0d9c2576e6f1 100644 (file)
--- a/ext/standard/tests/array/reset_variation1.phpt
+++ b/ext/standard/tests/array/reset_variation1.phpt
@@ -173,132 +173,6 @@ NULL
 
 -- Iteration 16 --
 
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 17 --
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 18 --
-bool(false)
-
--- Iteration 19 --
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 20 --
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 21 --
-
-Warning: reset() expects parameter 1 to be array, string given in %s on line %d
-NULL
-
--- Iteration 22 --
-
-Warning: reset() expects parameter 1 to be array, object given in %s on line %d
-NULL
-
--- Iteration 23 --
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 24 --
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 25 --
-
-Warning: reset() expects parameter 1 to be array, resource given in %s on line %d
-NULL
-===DONE===
---UEXPECTF--
-*** Testing reset() : usage variations ***
-
--- Iteration 1 --
-
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 2 --
-
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 3 --
-
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 4 --
-
-Warning: reset() expects parameter 1 to be array, integer given in %s on line %d
-NULL
-
--- Iteration 5 --
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 6 --
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 7 --
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 8 --
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 9 --
-
-Warning: reset() expects parameter 1 to be array, double given in %s on line %d
-NULL
-
--- Iteration 10 --
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 11 --
-
-Warning: reset() expects parameter 1 to be array, null given in %s on line %d
-NULL
-
--- Iteration 12 --
-
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 13 --
-
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 14 --
-
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 15 --
-
-Warning: reset() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
-
--- Iteration 16 --
-
 Warning: reset() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 

diff --git a/ext/standard/tests/array/reset_variation2.phpt b/ext/standard/tests/array/reset_variation2.phpt
index 6fd21fd4ae635541a21c97633d29b08dcc610e86..713c88adde6c8a4e2af152c0e5428a999930da81 100644 (file)
--- a/ext/standard/tests/array/reset_variation2.phpt
+++ b/ext/standard/tests/array/reset_variation2.phpt
@@ -23,16 +23,7 @@ unset($array[0]);
 var_dump(reset($array));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing reset() : usage variations ***
-
--- Initial Position: --
-a => 0
-
--- Unset First element in array and check reset() --
-string(1) "b"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing reset() : usage variations ***
 
 -- Initial Position: --

diff --git a/ext/standard/tests/array/reset_variation3.phpt b/ext/standard/tests/array/reset_variation3.phpt
index c7ebd6b10339a774395a2b543fed9691a03fcbbf..eaccecc7bc02f5a1312dd6b40a77ba619e163790 100644 (file)
--- a/ext/standard/tests/array/reset_variation3.phpt
+++ b/ext/standard/tests/array/reset_variation3.phpt
@@ -39,22 +39,7 @@ echo "\$array2: ";
 var_dump(current($array2));
 ?>
 ===DONE===
---EXPECTF--
-*** Testing reset() : usage variations ***
-
--- Initial position of internal pointer --
-string(4) "zero"
-
--- Position after calling next() --
-$array1: string(3) "one"
-$array2: string(3) "one"
-
--- Position after calling reset() --
-string(4) "zero"
-$array1: string(4) "zero"
-$array2: string(4) "zero"
-===DONE===
---UEXPECTF--
+--EXPECT--
 *** Testing reset() : usage variations ***
 
 -- Initial position of internal pointer --

diff --git a/ext/standard/tests/array/rsort_basic.phpt b/ext/standard/tests/array/rsort_basic.phpt
index 74da415a3afc6d643c6147bb133d9a23bc01a67c..4fe4673f83e19233b7b808a39094c02dc64a1815 100644 (file)
--- a/ext/standard/tests/array/rsort_basic.phpt
+++ b/ext/standard/tests/array/rsort_basic.phpt
@@ -19,12 +19,12 @@ $unsorted_strings =   array( "l" => "lemon", "o" => "orange", "b" => "banana" );
 // array with default keys containing unsorted numeric values
 $unsorted_numerics =  array( 100, 33, 555, 22 );
 
-echo "\n-- Testing rsort() by supplying string array, 'flag' value is defualt --\n";
+echo "\n-- Testing rsort() by supplying string array, 'flag' value is default --\n";
 $temp_array = $unsorted_strings;
 var_dump( rsort($temp_array) );
 var_dump( $temp_array);
 
-echo "\n-- Testing rsort() by supplying numeric array, 'flag' value is defualt --\n";
+echo "\n-- Testing rsort() by supplying numeric array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( rsort($temp_array) );
 var_dump( $temp_array);
@@ -52,85 +52,10 @@ var_dump( $temp_array);
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : basic functionality ***
 
--- Testing rsort() by supplying string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "orange"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "banana"
-}
-
--- Testing rsort() by supplying numeric array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [0]=>
-  int(555)
-  [1]=>
-  int(100)
-  [2]=>
-  int(33)
-  [3]=>
-  int(22)
-}
-
--- Testing rsort() by supplying string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "orange"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "banana"
-}
-
--- Testing rsort() by supplying numeric array, 'flag' = SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  int(555)
-  [1]=>
-  int(100)
-  [2]=>
-  int(33)
-  [3]=>
-  int(22)
-}
-
--- Testing rsort() by supplying string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "orange"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "banana"
-}
-
--- Testing rsort() by supplying numeric array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(4) {
-  [0]=>
-  int(555)
-  [1]=>
-  int(100)
-  [2]=>
-  int(33)
-  [3]=>
-  int(22)
-}
-Done
---UEXPECTF--
-*** Testing rsort() : basic functionality ***
-
--- Testing rsort() by supplying string array, 'flag' value is defualt --
+-- Testing rsort() by supplying string array, 'flag' value is default --
 bool(true)
 array(3) {
   [0]=>
@@ -141,7 +66,7 @@ array(3) {
   unicode(6) "banana"
 }
 
--- Testing rsort() by supplying numeric array, 'flag' value is defualt --
+-- Testing rsort() by supplying numeric array, 'flag' value is default --
 bool(true)
 array(4) {
   [0]=>
@@ -201,4 +126,4 @@ array(4) {
   [3]=>
   int(22)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_error.phpt b/ext/standard/tests/array/rsort_error.phpt
index 5123efb5f82fce305577320d2131cc9b0c14dfb5..47dbf4c0bf3df3892e2ba4abf476edd54368ec6c 100644 (file)
--- a/ext/standard/tests/array/rsort_error.phpt
+++ b/ext/standard/tests/array/rsort_error.phpt
@@ -49,22 +49,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing rsort() : error conditions ***
-
--- Testing rsort() function with Zero arguments --
-
-Warning: rsort() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing rsort() function with more than expected no. of arguments --
-
-Warning: rsort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_object1.phpt b/ext/standard/tests/array/rsort_object1.phpt
index 997992dd4c26774a6d7c42573bbdb83d75917ca6..a4999c33cacd04e434ae9a5570e22b9b58c62e09 100644 (file)
--- a/ext/standard/tests/array/rsort_object1.phpt
+++ b/ext/standard/tests/array/rsort_object1.phpt
@@ -58,12 +58,12 @@ $unsorted_str_obj = array (
 
 echo "\n-- Sort flag = default --\n";
 
-// testing rsort() function by supplying integer object array, flag value is defualt
+// testing rsort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
 
-// testing rsort() function by supplying string object array, flag value is defualt
+// testing rsort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
@@ -85,165 +85,6 @@ echo "Done";
 --EXPECTF--
 *** Testing rsort() : object functionality ***
 
--- Sort flag = default --
-bool(true)
-array(6) {
-  [0]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-  [1]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [2]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [3]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [4]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [5]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-}
-bool(true)
-array(8) {
-  [0]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-  [1]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  [2]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  [3]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  [4]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  [5]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  [6]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  [7]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-}
-
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(6) {
-  [0]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-  [1]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [2]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [3]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [4]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [5]=>
-  object(for_integer_rsort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-}
-bool(true)
-array(8) {
-  [0]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-  [1]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  [2]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  [3]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  [4]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  [5]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  [6]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  [7]=>
-  object(for_string_rsort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-}
-Done
---UEXPECTF--
-*** Testing rsort() : object functionality ***
-
 -- Sort flag = default --
 bool(true)
 array(6) {
@@ -399,4 +240,4 @@ array(8) {
     unicode(5) "Lemon"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_object2.phpt b/ext/standard/tests/array/rsort_object2.phpt
index 323547d9e3459b8c8fa1363ad4fc01bb23a3e749..fc3683e0b3579f9ebe950e02866b8ec5ecd203e2 100644 (file)
--- a/ext/standard/tests/array/rsort_object2.phpt
+++ b/ext/standard/tests/array/rsort_object2.phpt
@@ -69,12 +69,12 @@ $unsorted_str_obj = array (
 
 echo "\n-- Sort flag = default --\n";
 
-// testing rsort() function by supplying integer object array, flag value is defualt
+// testing rsort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
 
-// testing rsort() function by supplying string object array, flag value is defualt
+// testing rsort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
@@ -96,169 +96,6 @@ echo "Done";
 --EXPECTF--
 *** Testing rsort() : object functionality ***
 
--- Sort flag = default --
-bool(true)
-array(4) {
-  [0]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(66)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(44)
-    ["protected_class_value":protected]=>
-    int(4)
-  }
-  [1]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(30)
-  }
-  [2]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    float(0.001)
-    ["private_class_value":"for_integer_rsort":private]=>
-    float(99.5)
-    ["protected_class_value":protected]=>
-    float(0.1)
-  }
-  [3]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(5)
-  }
-}
-bool(true)
-array(4) {
-  [0]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-  [1]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "t"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(3) "eee"
-    ["protected_class_value":protected]=>
-    string(3) "abb"
-  }
-  [2]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "py"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(2) "PY"
-    ["protected_class_value":protected]=>
-    string(2) "pt"
-  }
-  [3]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(3) "ass"
-  }
-}
-
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(66)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(44)
-    ["protected_class_value":protected]=>
-    int(4)
-  }
-  [1]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(30)
-  }
-  [2]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    float(0.001)
-    ["private_class_value":"for_integer_rsort":private]=>
-    float(99.5)
-    ["protected_class_value":protected]=>
-    float(0.1)
-  }
-  [3]=>
-  object(for_integer_rsort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_rsort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(5)
-  }
-}
-bool(true)
-array(4) {
-  [0]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-  [1]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "t"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(3) "eee"
-    ["protected_class_value":protected]=>
-    string(3) "abb"
-  }
-  [2]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "py"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(2) "PY"
-    ["protected_class_value":protected]=>
-    string(2) "pt"
-  }
-  [3]=>
-  object(for_string_rsort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_rsort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(3) "ass"
-  }
-}
-Done
---UEXPECTF--
-*** Testing rsort() : object functionality ***
-
 -- Sort flag = default --
 bool(true)
 array(4) {
@@ -418,4 +255,4 @@ array(4) {
     unicode(3) "ass"
   }
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_variation1.phpt b/ext/standard/tests/array/rsort_variation1.phpt
index e343dc9b175be756289a5621a91be3dde779f543..0abfde64a7568c3c6f37c45b7702a9bc345ce802 100644 (file)
--- a/ext/standard/tests/array/rsort_variation1.phpt
+++ b/ext/standard/tests/array/rsort_variation1.phpt
@@ -361,417 +361,6 @@ bool(false)
 -- Iteration 16 --
 Flag = default:
 
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 17 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 18 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 19 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 20 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 21 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
--- Iteration 22 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 23 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 24 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing rsort() : variation ***
--- Iteration 1 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 2 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 3 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 4 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 5 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 6 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 7 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 8 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 9 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 10 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 11 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 12 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 13 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 14 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 15 --
-Flag = default:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_REGULAR:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_NUMERIC:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-Flag = SORT_STRING:
-
-Warning: rsort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 16 --
-Flag = default:
-
 Warning: rsort() expects parameter 1 to be array, Unicode string given in %s on line %d
 bool(false)
 Flag = SORT_REGULAR:
@@ -922,4 +511,4 @@ Flag = SORT_STRING:
 
 Warning: rsort() expects parameter 1 to be array, resource given in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_variation10.phpt b/ext/standard/tests/array/rsort_variation10.phpt
index a65b4405b58c9965cea5d8eee9f0b13bb7a380d7..2e4a96adba9aed347c6d7279e608789d8ae27aa4 100644 (file)
--- a/ext/standard/tests/array/rsort_variation10.phpt
+++ b/ext/standard/tests/array/rsort_variation10.phpt
@@ -34,7 +34,7 @@ var_dump($temp_array);
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
 -- Sort flag = default  --
@@ -106,75 +106,3 @@ array(9) {
   int(-229)
 }
 Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- Sort flag = default  --
-bool(true)
-array(9) {
-  [0]=>
-  int(669)
-  [1]=>
-  int(506)
-  [2]=>
-  int(229)
-  [3]=>
-  int(209)
-  [4]=>
-  int(63)
-  [5]=>
-  int(54)
-  [6]=>
-  int(0)
-  [7]=>
-  int(-54)
-  [8]=>
-  int(-229)
-}
-
--- Sort flag = SORT_REGULAR  --
-bool(true)
-array(9) {
-  [0]=>
-  int(669)
-  [1]=>
-  int(506)
-  [2]=>
-  int(229)
-  [3]=>
-  int(209)
-  [4]=>
-  int(63)
-  [5]=>
-  int(54)
-  [6]=>
-  int(0)
-  [7]=>
-  int(-54)
-  [8]=>
-  int(-229)
-}
-
--- Sort flag = SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [0]=>
-  int(669)
-  [1]=>
-  int(506)
-  [2]=>
-  int(229)
-  [3]=>
-  int(209)
-  [4]=>
-  int(63)
-  [5]=>
-  int(54)
-  [6]=>
-  int(0)
-  [7]=>
-  int(-54)
-  [8]=>
-  int(-229)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_variation11.phpt b/ext/standard/tests/array/rsort_variation11.phpt
index d2620eb658975a43a07b4a27cacd2b57bb654a62..408c37bd6eb48a329c01d99d09998627ed52ecaa 100644 (file)
Binary files a/ext/standard/tests/array/rsort_variation11.phpt and b/ext/standard/tests/array/rsort_variation11.phpt differ

diff --git a/ext/standard/tests/array/rsort_variation2.phpt b/ext/standard/tests/array/rsort_variation2.phpt
index fd0581070237bfe074b42d190189b3e8bd1480b7..e546b3f619ba0ad5ba33b2e33055c3831d64ab5f 100644 (file)
--- a/ext/standard/tests/array/rsort_variation2.phpt
+++ b/ext/standard/tests/array/rsort_variation2.phpt
@@ -335,383 +335,6 @@ array(5) {
 
 -- Iteration 16 --
 
-Warning: rsort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 17 --
-
-Warning: rsort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 18 --
-
-Warning: rsort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 19 --
-
-Warning: rsort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 20 --
-
-Warning: rsort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 21 --
-
-Warning: rsort() expects parameter 2 to be long, object given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-
--- Iteration 22 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 23 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 24 --
-
-Warning: rsort() expects parameter 2 to be long, resource given in %s on line %d
-bool(false)
-array(5) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  int(2)
-  [3]=>
-  int(3)
-  [4]=>
-  int(1)
-}
-Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- Iteration 1 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 2 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 3 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 4 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 5 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 6 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 7 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 8 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 9 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 10 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 11 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 12 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 13 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 14 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 15 --
-bool(true)
-array(5) {
-  [0]=>
-  int(5)
-  [1]=>
-  int(3)
-  [2]=>
-  int(2)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-}
-
--- Iteration 16 --
-
 Warning: rsort() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 array(5) {
@@ -858,4 +481,4 @@ array(5) {
   [4]=>
   int(1)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_variation3.phpt b/ext/standard/tests/array/rsort_variation3.phpt
index 293bec588088066591196367cc7acab44b0dfe72..ef1fb1085c0523fc7373fa402649c027c4767909 100644 (file)
--- a/ext/standard/tests/array/rsort_variation3.phpt
+++ b/ext/standard/tests/array/rsort_variation3.phpt
@@ -38,7 +38,7 @@ $count = 1;
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With Defualt sort flag -\n"; 
+  echo "- With default sort flag -\n"; 
   $temp_array = $array; 
   var_dump(rsort($temp_array) );
   var_dump($temp_array);
@@ -56,11 +56,11 @@ foreach ($various_arrays as $array) {
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
 -- Iteration 1 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(9) {
   [0]=>
@@ -128,7 +128,7 @@ array(9) {
 }
 
 -- Iteration 2 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(7) {
   [0]=>
@@ -184,7 +184,7 @@ array(7) {
 }
 
 -- Iteration 3 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [0]=>
@@ -264,7 +264,7 @@ array(11) {
 }
 
 -- Iteration 4 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(7) {
   [0]=>
@@ -319,266 +319,3 @@ array(7) {
   float(-2147483649)
 }
 Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- Iteration 1 --
-- With Defualt sort flag -
-bool(true)
-array(9) {
-  [0]=>
-  int(41)
-  [1]=>
-  int(31)
-  [2]=>
-  int(21)
-  [3]=>
-  int(11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(-11)
-  [6]=>
-  int(-21)
-  [7]=>
-  int(-31)
-  [8]=>
-  int(-41)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(9) {
-  [0]=>
-  int(41)
-  [1]=>
-  int(31)
-  [2]=>
-  int(21)
-  [3]=>
-  int(11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(-11)
-  [6]=>
-  int(-21)
-  [7]=>
-  int(-31)
-  [8]=>
-  int(-41)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(9) {
-  [0]=>
-  int(41)
-  [1]=>
-  int(31)
-  [2]=>
-  int(21)
-  [3]=>
-  int(11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(-11)
-  [6]=>
-  int(-21)
-  [7]=>
-  int(-31)
-  [8]=>
-  int(-41)
-}
-
--- Iteration 2 --
-- With Defualt sort flag -
-bool(true)
-array(7) {
-  [0]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [2]=>
-  float(0.5)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.01)
-  [5]=>
-  float(-0.1)
-  [6]=>
-  float(-10.5)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [0]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [2]=>
-  float(0.5)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.01)
-  [5]=>
-  float(-0.1)
-  [6]=>
-  float(-10.5)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [0]=>
-  float(1050)
-  [1]=>
-  float(10.5)
-  [2]=>
-  float(0.5)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.01)
-  [5]=>
-  float(-0.1)
-  [6]=>
-  float(-10.5)
-}
-
--- Iteration 3 --
-- With Defualt sort flag -
-bool(true)
-array(11) {
-  [0]=>
-  int(33)
-  [1]=>
-  int(2)
-  [2]=>
-  float(0.106)
-  [3]=>
-  float(0.09)
-  [4]=>
-  float(0.0021)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  int(0)
-  [7]=>
-  float(-0.01)
-  [8]=>
-  float(-0.106)
-  [9]=>
-  float(-0.9)
-  [10]=>
-  int(-1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [0]=>
-  int(33)
-  [1]=>
-  int(2)
-  [2]=>
-  float(0.106)
-  [3]=>
-  float(0.09)
-  [4]=>
-  float(0.0021)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  int(0)
-  [7]=>
-  float(-0.01)
-  [8]=>
-  float(-0.106)
-  [9]=>
-  float(-0.9)
-  [10]=>
-  int(-1)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(11) {
-  [0]=>
-  int(33)
-  [1]=>
-  int(2)
-  [2]=>
-  float(0.106)
-  [3]=>
-  float(0.09)
-  [4]=>
-  float(0.0021)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  int(0)
-  [7]=>
-  float(-0.01)
-  [8]=>
-  float(-0.106)
-  [9]=>
-  float(-0.9)
-  [10]=>
-  int(-1)
-}
-
--- Iteration 4 --
-- With Defualt sort flag -
-bool(true)
-array(7) {
-  [0]=>
-  float(2147483648)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  int(0)
-  [3]=>
-  int(0)
-  [4]=>
-  int(-2147483647)
-  [5]=>
-  float(-2147483648)
-  [6]=>
-  float(-2147483649)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [0]=>
-  float(2147483648)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  int(0)
-  [3]=>
-  int(0)
-  [4]=>
-  int(-2147483647)
-  [5]=>
-  float(-2147483648)
-  [6]=>
-  float(-2147483649)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [0]=>
-  float(2147483648)
-  [1]=>
-  int(2147483647)
-  [2]=>
-  int(0)
-  [3]=>
-  int(0)
-  [4]=>
-  int(-2147483647)
-  [5]=>
-  float(-2147483648)
-  [6]=>
-  float(-2147483649)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_variation4.phpt b/ext/standard/tests/array/rsort_variation4.phpt
index e6297d830998988fb8c97c33259fcc9225783160..1eac39eeff957b7637b2f016a191289ead016070 100644 (file)
--- a/ext/standard/tests/array/rsort_variation4.phpt
+++ b/ext/standard/tests/array/rsort_variation4.phpt
@@ -23,7 +23,7 @@ $value3 = 555;
 // an array containing integer references 
 $unsorted_numerics =  array( &$value1 , &$value2, &$value3);
 
-echo "\n-- 'flag' value is defualt --\n";
+echo "\n-- 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( rsort($temp_array) );
 var_dump( $temp_array);
@@ -44,44 +44,7 @@ echo "Done";
 Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
 *** Testing rsort() : variation ***
 
--- 'flag' value is defualt --
-bool(true)
-array(3) {
-  [0]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-
--- 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-
--- 'flag' = SORT_NUMERIC --
-bool(true)
-array(3) {
-  [0]=>
-  &int(555)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(33)
-}
-Done
---UEXPECTF--
-Deprecated: Call-time pass-by-reference has been deprecated in %s on line %d
-*** Testing rsort() : variation ***
-
--- 'flag' value is defualt --
+-- 'flag' value is default --
 bool(true)
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/rsort_variation5.phpt b/ext/standard/tests/array/rsort_variation5.phpt
index 9a9ec6f47391f95225a3705905ac64e489388a5a..b74037fc8c310634405379e125be931aff19ec7e 100644 (file)
--- a/ext/standard/tests/array/rsort_variation5.phpt
+++ b/ext/standard/tests/array/rsort_variation5.phpt
@@ -47,179 +47,7 @@ foreach ($various_arrays as $array) {
 echo "Done";
 ?>
 
---EXPECTF--
-*** Testing rsort() : variation ***
-
--- Iteration 1 --
-- With Default sort flag -
-bool(true)
-array(11) {
-  [0]=>
-  string(4) "\xhh"
-  [1]=>
-  string(2) "\e"
-  [2]=>
-  string(4) "\ddd"
-  [3]=>
-  string(3) "\cx"
-  [4]=>
-  string(2) "\a"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "\v"
-  [7]=>
-  string(1) "
-"
-  [8]=>
-  string(1) "  "
-  [9]=>
-  NULL
-  [10]=>
-  NULL
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [0]=>
-  string(4) "\xhh"
-  [1]=>
-  string(2) "\e"
-  [2]=>
-  string(4) "\ddd"
-  [3]=>
-  string(3) "\cx"
-  [4]=>
-  string(2) "\a"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "\v"
-  [7]=>
-  string(1) "
-"
-  [8]=>
-  string(1) "  "
-  [9]=>
-  NULL
-  [10]=>
-  NULL
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(11) {
-  [0]=>
-  string(4) "\xhh"
-  [1]=>
-  string(2) "\e"
-  [2]=>
-  string(4) "\ddd"
-  [3]=>
-  string(3) "\cx"
-  [4]=>
-  string(2) "\a"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "\v"
-  [7]=>
-  string(1) "
-"
-  [8]=>
-  string(1) "  "
-  [9]=>
-  NULL
-  [10]=>
-  NULL
-}
-
--- Iteration 2 --
-- With Default sort flag -
-bool(true)
-array(12) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "ww"
-  [2]=>
-  string(3) "ttt"
-  [3]=>
-  string(6) "oraNGe"
-  [4]=>
-  string(5) "lemoN"
-  [5]=>
-  string(6) "banana"
-  [6]=>
-  string(5) "apple"
-  [7]=>
-  string(1) "X"
-  [8]=>
-  string(4) "Test"
-  [9]=>
-  string(4) "TTTT"
-  [10]=>
-  string(6) "Orange"
-  [11]=>
-  string(6) "BANANA"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "ww"
-  [2]=>
-  string(3) "ttt"
-  [3]=>
-  string(6) "oraNGe"
-  [4]=>
-  string(5) "lemoN"
-  [5]=>
-  string(6) "banana"
-  [6]=>
-  string(5) "apple"
-  [7]=>
-  string(1) "X"
-  [8]=>
-  string(4) "Test"
-  [9]=>
-  string(4) "TTTT"
-  [10]=>
-  string(6) "Orange"
-  [11]=>
-  string(6) "BANANA"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(12) {
-  [0]=>
-  string(1) "x"
-  [1]=>
-  string(2) "ww"
-  [2]=>
-  string(3) "ttt"
-  [3]=>
-  string(6) "oraNGe"
-  [4]=>
-  string(5) "lemoN"
-  [5]=>
-  string(6) "banana"
-  [6]=>
-  string(5) "apple"
-  [7]=>
-  string(1) "X"
-  [8]=>
-  string(4) "Test"
-  [9]=>
-  string(4) "TTTT"
-  [10]=>
-  string(6) "Orange"
-  [11]=>
-  string(6) "BANANA"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
 -- Iteration 1 --
@@ -390,4 +218,4 @@ array(12) {
   [11]=>
   unicode(6) "BANANA"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/rsort_variation6.phpt b/ext/standard/tests/array/rsort_variation6.phpt
index 42f2b1d40a45ebc5888d0704562fd3c1fb03e884..4c27bca1e79fadb9eb0edb23925ab967b21f7183 100644 (file)
--- a/ext/standard/tests/array/rsort_variation6.phpt
+++ b/ext/standard/tests/array/rsort_variation6.phpt
@@ -16,7 +16,7 @@ echo "*** Testing rsort() : variation ***\n";
 // an array contains unsorted hexadecimal values  
 $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa);
 
-echo "\n-- 'flag' value is defualt  --\n";
+echo "\n-- 'flag' value is default  --\n";
 $temp_array = $unsorted_hex_array;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
@@ -34,10 +34,10 @@ var_dump($temp_array);
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
--- 'flag' value is defualt  --
+-- 'flag' value is default  --
 bool(true)
 array(11) {
   [0]=>
@@ -118,87 +118,3 @@ array(11) {
   int(-682)
 }
 Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- 'flag' value is defualt  --
-bool(true)
-array(11) {
-  [0]=>
-  int(4095)
-  [1]=>
-  int(682)
-  [2]=>
-  int(427)
-  [3]=>
-  int(427)
-  [4]=>
-  int(255)
-  [5]=>
-  int(255)
-  [6]=>
-  int(187)
-  [7]=>
-  int(15)
-  [8]=>
-  int(0)
-  [9]=>
-  int(-255)
-  [10]=>
-  int(-682)
-}
-
--- 'flag' value is SORT_REGULAR  --
-bool(true)
-array(11) {
-  [0]=>
-  int(4095)
-  [1]=>
-  int(682)
-  [2]=>
-  int(427)
-  [3]=>
-  int(427)
-  [4]=>
-  int(255)
-  [5]=>
-  int(255)
-  [6]=>
-  int(187)
-  [7]=>
-  int(15)
-  [8]=>
-  int(0)
-  [9]=>
-  int(-255)
-  [10]=>
-  int(-682)
-}
-
--- 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(11) {
-  [0]=>
-  int(4095)
-  [1]=>
-  int(682)
-  [2]=>
-  int(427)
-  [3]=>
-  int(427)
-  [4]=>
-  int(255)
-  [5]=>
-  int(255)
-  [6]=>
-  int(187)
-  [7]=>
-  int(15)
-  [8]=>
-  int(0)
-  [9]=>
-  int(-255)
-  [10]=>
-  int(-682)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_variation7.phpt b/ext/standard/tests/array/rsort_variation7.phpt
index ee36eb5fd97e53127cb5185211e3c70c30d52deb..033eedcf9baff750611220c76591030dbab3cba9 100644 (file)
--- a/ext/standard/tests/array/rsort_variation7.phpt
+++ b/ext/standard/tests/array/rsort_variation7.phpt
@@ -16,7 +16,7 @@ echo "*** Testing rsort() : variation ***\n";
 // bool value array
 $bool_values = array (true, false, TRUE, FALSE);
 
-echo "\n-- 'flag' value is defualt --\n";
+echo "\n-- 'flag' value is default --\n";
 $temp_array = $bool_values;
 var_dump(rsort($temp_array) );
 var_dump($temp_array);
@@ -39,10 +39,10 @@ var_dump($temp_array);
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
--- 'flag' value is defualt --
+-- 'flag' value is default --
 bool(true)
 array(4) {
   [0]=>
@@ -94,58 +94,3 @@ array(4) {
   bool(false)
 }
 Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- 'flag' value is defualt --
-bool(true)
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-
--- 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-
--- 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-
--- 'flag' value is SORT_STRING --
-bool(true)
-array(4) {
-  [0]=>
-  bool(true)
-  [1]=>
-  bool(true)
-  [2]=>
-  bool(false)
-  [3]=>
-  bool(false)
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_variation8.phpt b/ext/standard/tests/array/rsort_variation8.phpt
index a9b53cb675279c3f3d16242de3a4ee3f06be5082..923127d98093d8f9fb122534d385291d283cc0e2 100644 (file)
--- a/ext/standard/tests/array/rsort_variation8.phpt
+++ b/ext/standard/tests/array/rsort_variation8.phpt
@@ -51,7 +51,7 @@ foreach ($various_arrays as $array) {
 echo "Done";
 ?>
 
---EXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
 -- Iteration 1 --
@@ -178,130 +178,3 @@ array(4) {
   }
 }
 Done
---UEXPECTF--
-*** Testing rsort() : variation ***
-
--- Iteration 1 --
-
--- 'flag' value is default --
-bool(true)
-array(0) {
-}
-
--- 'flag' value is SORT_REGULAR --
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-
--- 'flag' value is default --
-bool(true)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-
--- 'flag' value is SORT_REGULAR --
-bool(true)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-
--- 'flag' value is default --
-bool(true)
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [1]=>
-  int(44)
-  [2]=>
-  int(11)
-}
-
--- 'flag' value is SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-  [1]=>
-  int(44)
-  [2]=>
-  int(11)
-}
-
--- Iteration 4 --
-
--- 'flag' value is default --
-bool(true)
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [3]=>
-  array(0) {
-  }
-}
-
--- 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-  [1]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [2]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [3]=>
-  array(0) {
-  }
-}
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/rsort_variation9.phpt b/ext/standard/tests/array/rsort_variation9.phpt
index 5dc7ab8ee8a2de671d64758cd66afdca9329f550..a78c43758e60ac52142a93561abb9d6c328ebe05 100644 (file)
--- a/ext/standard/tests/array/rsort_variation9.phpt
+++ b/ext/standard/tests/array/rsort_variation9.phpt
@@ -54,210 +54,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing rsort() : variation ***
-
--- Iteration 1 --
--- Sort flag = default --
-bool(true)
-array(5) {
-  [0]=>
-  int(66)
-  [1]=>
-  int(55)
-  [2]=>
-  int(33)
-  [3]=>
-  int(22)
-  [4]=>
-  int(11)
-}
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(5) {
-  [0]=>
-  int(66)
-  [1]=>
-  int(55)
-  [2]=>
-  int(33)
-  [3]=>
-  int(22)
-  [4]=>
-  int(11)
-}
-
--- Iteration 2 --
--- Sort flag = default --
-bool(true)
-array(3) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(5) "first"
-    [5]=>
-    string(6) "second"
-    [6]=>
-    string(5) "third"
-  }
-  [2]=>
-  array(3) {
-    ["a"]=>
-    string(6) "orange"
-    ["b"]=>
-    string(6) "banana"
-    ["c"]=>
-    string(5) "apple"
-  }
-}
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    string(5) "first"
-    [5]=>
-    string(6) "second"
-    [6]=>
-    string(5) "third"
-  }
-  [2]=>
-  array(3) {
-    ["a"]=>
-    string(6) "orange"
-    ["b"]=>
-    string(6) "banana"
-    ["c"]=>
-    string(5) "apple"
-  }
-}
-
--- Iteration 3 --
--- Sort flag = default --
-bool(true)
-array(6) {
-  [0]=>
-  int(19)
-  [1]=>
-  int(13)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-}
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(6) {
-  [0]=>
-  int(19)
-  [1]=>
-  int(13)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-}
-
--- Iteration 4 --
--- Sort flag = default --
-bool(true)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(3) "baz"
-}
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  string(3) "baz"
-}
-
--- Iteration 5 --
--- Sort flag = default --
-bool(true)
-array(4) {
-  [0]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  [2]=>
-  int(5)
-  [3]=>
-  int(1)
-}
--- Sort flag = SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-  [1]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  [2]=>
-  int(5)
-  [3]=>
-  int(1)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing rsort() : variation ***
 
 -- Iteration 1 --
@@ -459,4 +256,4 @@ array(4) {
   [3]=>
   int(1)
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/standard/tests/array/shuffle_basic1.phpt b/ext/standard/tests/array/shuffle_basic1.phpt
index 4aa3802831493b80b4f2bcecf77c2073f99af1dd..2f7856b66ba54bb8dbf008334fa37a8218bf6455 100644 (file)
--- a/ext/standard/tests/array/shuffle_basic1.phpt
+++ b/ext/standard/tests/array/shuffle_basic1.phpt
@@ -100,104 +100,6 @@ array(9) {
   int(%d)
 }
 
--- input array of strings before shuffle() function is applied --
-array(9) {
-  [0]=>
-  string(3) "one"
-  [1]=>
-  string(3) "two"
-  [2]=>
-  string(5) "three"
-  [3]=>
-  string(4) "four"
-  [4]=>
-  string(4) "five"
-  [5]=>
-  string(1) " "
-  [6]=>
-  string(3) "six"
-  [7]=>
-  string(1) " "
-  [8]=>
-  string(5) "seven"
-}
-
--- return value from shuffle() function --
-bool(true)
-
--- resultant array after shuffle() function is applied --
-array(9) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-  [2]=>
-  string(%d) "%s"
-  [3]=>
-  string(%d) "%s"
-  [4]=>
-  string(%d) "%s"
-  [5]=>
-  string(%d) "%s"
-  [6]=>
-  string(%d) "%s"
-  [7]=>
-  string(%d) "%s"
-  [8]=>
-  string(%d) "%s"
-}
-Done
-
---UEXPECTF--
-*** Testing shuffle() : with arrays having default keys ***
-
--- input array of integers before shuffle() function is applied --
-array(9) {
-  [0]=>
-  int(0)
-  [1]=>
-  int(10)
-  [2]=>
-  int(20)
-  [3]=>
-  int(30)
-  [4]=>
-  int(40)
-  [5]=>
-  int(50)
-  [6]=>
-  int(60)
-  [7]=>
-  int(70)
-  [8]=>
-  int(80)
-}
-
--- return value from shuffle() function --
-bool(true)
-
--- resultant array after shuffle() function is applied --
-array(9) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-  [4]=>
-  int(%d)
-  [5]=>
-  int(%d)
-  [6]=>
-  int(%d)
-  [7]=>
-  int(%d)
-  [8]=>
-  int(%d)
-}
-
 -- input array of strings before shuffle() function is applied --
 array(9) {
   [0]=>

diff --git a/ext/standard/tests/array/shuffle_basic2.phpt b/ext/standard/tests/array/shuffle_basic2.phpt
index 72914057dbf23c870b8b2c23af80f88fdf858df6..1fe1d6914788ce2126a63c3e5f0a108f04d649f4 100644 (file)
--- a/ext/standard/tests/array/shuffle_basic2.phpt
+++ b/ext/standard/tests/array/shuffle_basic2.phpt
@@ -39,57 +39,6 @@ echo "Done";
 --EXPECTF--
 *** Testing shuffle() : with associative array ***
 
--- input array before shuffle() function is applied --
-array(9) {
-  ["one"]=>
-  int(1)
-  [2]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  [4]=>
-  int(4)
-  ["#5"]=>
-  int(5)
-  ["SIX"]=>
-  int(6)
-  ["seven"]=>
-  int(7)
-  ["#8"]=>
-  int(10)
-  ["nine"]=>
-  int(9)
-}
-
--- return value from shuffle() function --
-bool(true)
-
--- resultant array after shuffle() function is applied --
-array(9) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-  [4]=>
-  int(%d)
-  [5]=>
-  int(%d)
-  [6]=>
-  int(%d)
-  [7]=>
-  int(%d)
-  [8]=>
-  int(%d)
-}
-Done
-
---UEXPECTF--
-*** Testing shuffle() : with associative array ***
-
 -- input array before shuffle() function is applied --
 array(9) {
   [u"one"]=>

diff --git a/ext/standard/tests/array/shuffle_error.phpt b/ext/standard/tests/array/shuffle_error.phpt
index ab255357fae477aac47ef7740d2e2faf360c876c..3ede44a1be7f074e97fd33d335be242084a667fc 100644 (file)
--- a/ext/standard/tests/array/shuffle_error.phpt
+++ b/ext/standard/tests/array/shuffle_error.phpt
@@ -43,28 +43,6 @@ bool(false)
 Warning: shuffle() expects exactly 1 parameter, 2 given in %s on line %d
 bool(false)
 
--- original input array --
-array(2) {
-  [0]=>
-  int(1)
-  ["two"]=>
-  int(2)
-}
-Done
-
---UEXPECTF--
-*** Testing shuffle() : error conditions ***
-
--- Testing shuffle() function with Zero arguments --
-
-Warning: shuffle() expects exactly 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing shuffle() function with more than expected no. of arguments --
-
-Warning: shuffle() expects exactly 1 parameter, 2 given in %s on line %d
-bool(false)
-
 -- original input array --
 array(2) {
   [0]=>

diff --git a/ext/standard/tests/array/shuffle_variation1.phpt b/ext/standard/tests/array/shuffle_variation1.phpt
index d2745274fa7417edd113603499216783771154a9..fe33748d4ed3f4165dfcee7af23d117e914ae120 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation1.phpt
+++ b/ext/standard/tests/array/shuffle_variation1.phpt
@@ -173,125 +173,6 @@ bool(false)
 
 -- Iteration 16 --
 
-Warning: shuffle() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
--- Iteration 17 --
-
-Warning: shuffle() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
--- Iteration 18 --
-
-Warning: shuffle() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
--- Iteration 19 --
-
-Warning: shuffle() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
--- Iteration 20 --
-
-Warning: shuffle() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
--- Iteration 21 --
-
-Warning: shuffle() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
--- Iteration 22 --
-
-Warning: shuffle() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
--- Iteration 23 --
-
-Warning: shuffle() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
-
---UEXPECTF--
-*** Testing shuffle() : with unexpected values for 'array_arg' argument ***
-
--- Iteration 1 --
-
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
--- Iteration 2 --
-
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
--- Iteration 3 --
-
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
--- Iteration 4 --
-
-Warning: shuffle() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
--- Iteration 5 --
-
-Warning: shuffle() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
--- Iteration 6 --
-
-Warning: shuffle() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
--- Iteration 7 --
-
-Warning: shuffle() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
--- Iteration 8 --
-
-Warning: shuffle() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
--- Iteration 9 --
-
-Warning: shuffle() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
--- Iteration 10 --
-
-Warning: shuffle() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
--- Iteration 11 --
-
-Warning: shuffle() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
--- Iteration 12 --
-
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
--- Iteration 13 --
-
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
--- Iteration 14 --
-
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
--- Iteration 15 --
-
-Warning: shuffle() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
--- Iteration 16 --
-
 Warning: shuffle() expects parameter 1 to be array, Unicode string given in %s on line %d
 bool(false)
 

diff --git a/ext/standard/tests/array/shuffle_variation2.phpt b/ext/standard/tests/array/shuffle_variation2.phpt
index ef34e5ef33d6db9a28842abf8b6c868fb52c1661..f9fdccbd78772be7fda15113bd08acf11b9d7f62 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation2.phpt
+++ b/ext/standard/tests/array/shuffle_variation2.phpt
@@ -209,168 +209,3 @@ array(3) {
   int(%d)
 }
 Done
-
---UEXPECTF--
-*** Testing shuffle() : with multi-dimensional array ***
-bool(true)
-
-The output array is:
-array(7) {
-  [0]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [1]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [2]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [4]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [5]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-  [6]=>
-  array(3) {
-    [0]=>
-    int(%d)
-    [1]=>
-    int(%d)
-    [2]=>
-    int(%d)
-  }
-}
-
-*** Testing shuffle() with arrays having different types of values ***
-
--- Iteration 1 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 2 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 3 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 4 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 5 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 6 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-
--- Iteration 7 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-}
-Done

diff --git a/ext/standard/tests/array/shuffle_variation3.phpt b/ext/standard/tests/array/shuffle_variation3.phpt
index e3e7fe4124cf2e0ebbbd990b31066c9f0978da13..b07b64418db910f5f59154d9d5089246686b21e4 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation3.phpt
+++ b/ext/standard/tests/array/shuffle_variation3.phpt
@@ -137,176 +137,6 @@ array(6) {
 -- Iteration 5 --
 bool(true)
 
-The output array is:
-array(5) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-  [2]=>
-  string(%d) "%s"
-  [3]=>
-  string(%d) "%s"
-  [4]=>
-  string(%d) "%s"
-}
-
--- Iteration 6 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  bool(%s)
-  [1]=>
-  bool(%s)
-  [2]=>
-  bool(%s)
-  [3]=>
-  bool(%s)
-}
-
--- Iteration 7 --
-bool(true)
-
-The output array is:
-array(6) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-  [4]=>
-  int(%d)
-  [5]=>
-  int(%d)
-}
-
--- Iteration 8 --
-bool(true)
-
-The output array is:
-array(5) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-  [3]=>
-  int(-%d)
-  [4]=>
-  int(-%d)
-}
-
--- Iteration 9 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-}
-
--- Iteration 10 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-}
-Done
-
---UEXPECTF--
-*** Testing shuffle() : arrays with diff types of values ***
-
-*** Testing shuffle() with arrays having different types of values ***
-
--- Iteration 1 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-}
-
--- Iteration 2 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-}
-
--- Iteration 3 --
-bool(true)
-
-The output array is:
-array(7) {
-  [0]=>
-  float(%f)
-  [1]=>
-  float(%f)
-  [2]=>
-  float(%f)
-  [3]=>
-  float(%f)
-  [4]=>
-  float(%f)
-  [5]=>
-  float(%f)
-  [6]=>
-  float(%f)
-}
-
--- Iteration 4 --
-bool(true)
-
-The output array is:
-array(6) {
-  [0]=>
-  float(-%f)
-  [1]=>
-  float(-%f)
-  [2]=>
-  float(-%f)
-  [3]=>
-  float(-%f)
-  [4]=>
-  float(-%f)
-  [5]=>
-  float(-%f)
-}
-
--- Iteration 5 --
-bool(true)
-
 The output array is:
 array(5) {
   [0]=>

diff --git a/ext/standard/tests/array/shuffle_variation4.phpt b/ext/standard/tests/array/shuffle_variation4.phpt
index 34c957519c73236e6f96a408efc7cdb26ca5e45a..512f0ef1976e3a5a82426e7eae789ed3d2398666 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation4.phpt
+++ b/ext/standard/tests/array/shuffle_variation4.phpt
@@ -134,171 +134,6 @@ array(5) {
 -- Iteration 5 --
 bool(true)
 
-The output array is:
-array(4) {
-  [0]=>
-  string(%d) "%s"
-  [1]=>
-  string(%d) "%s"
-  [2]=>
-  string(%d) "%s"
-  [3]=>
-  string(%d) "%s"
-}
-
--- Iteration 6 --
-bool(true)
-
-The output array is:
-array(2) {
-  [0]=>
-  bool(%s)
-  [1]=>
-  bool(%s)
-}
-
--- Iteration 7 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-}
-
--- Iteration 8 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-  [3]=>
-  int(-%d)
-}
-
--- Iteration 9 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-}
-
--- Iteration 10 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-}
-
--- Iteration 11 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  NULL
-}
-Done
-
---UEXPECTF--
-*** Testing shuffle() : associative arrays with diff types of values ***
-
-*** Testing shuffle() with arrays having different types of values ***
-
--- Iteration 1 --
-bool(true)
-
-The output array is:
-array(4) {
-  [0]=>
-  int(%d)
-  [1]=>
-  int(%d)
-  [2]=>
-  int(%d)
-  [3]=>
-  int(%d)
-}
-
--- Iteration 2 --
-bool(true)
-
-The output array is:
-array(3) {
-  [0]=>
-  int(-%d)
-  [1]=>
-  int(-%d)
-  [2]=>
-  int(-%d)
-}
-
--- Iteration 3 --
-bool(true)
-
-The output array is:
-array(5) {
-  [0]=>
-  float(%f)
-  [1]=>
-  float(%f)
-  [2]=>
-  float(%f)
-  [3]=>
-  float(%f)
-  [4]=>
-  float(%f)
-}
-
--- Iteration 4 --
-bool(true)
-
-The output array is:
-array(5) {
-  [0]=>
-  float(-%f)
-  [1]=>
-  float(-%f)
-  [2]=>
-  float(-%f)
-  [3]=>
-  float(-%f)
-  [4]=>
-  float(-%f)
-}
-
--- Iteration 5 --
-bool(true)
-
 The output array is:
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/shuffle_variation5.phpt b/ext/standard/tests/array/shuffle_variation5.phpt
index cc8d75cc6b37cab6093d414ea26971e578c244cd..69eb5466b3d764aa49b68e34fb4f7af3398a9eb2 100644 (file)
--- a/ext/standard/tests/array/shuffle_variation5.phpt
+++ b/ext/standard/tests/array/shuffle_variation5.phpt
@@ -82,48 +82,6 @@ echo "Done";
 -- with array of heredoc strings --
 bool\(true\)
 
-The output array is:
-array\(6\) {
-  \[0\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-  \[1\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-  \[2\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-  \[3\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-  \[4\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-  \[5\]=>
-  string\([0-9]*\) "[0-9 a-z \n \0 \t]*"
-}
-
--- with array having heredoc strings as keys --
-bool\(true\)
-
-The output array is:
-array\(6\) {
-  \[0\]=>
-  string\(8\) "[heredoc 1-5]*"
-  \[1\]=>
-  string\(8\) "[heredoc 1-5]*"
-  \[2\]=>
-  string\(8\) "[heredoc 1-5]*"
-  \[3\]=>
-  string\(8\) "[heredoc 1-5]*"
-  \[4\]=>
-  string\(8\) "[heredoc 1-5]*"
-  \[5\]=>
-  string\(8\) "[heredoc 1-5]*"
-}
-Done
-
---UEXPECTREGEX--
-\*\*\* Testing shuffle\(\) : with array containing heredoc strings \*\*\*
-
--- with array of heredoc strings --
-bool\(true\)
-
 The output array is:
 array\(6\) {
   \[0\]=>

diff --git a/ext/standard/tests/array/sizeof_basic1.phpt b/ext/standard/tests/array/sizeof_basic1.phpt
index 34b22f2f85330e0a5455b3c4195a47de8c486343..6d1bcfda40161b653aaa68695a4ce8837f437989 100644 (file)
--- a/ext/standard/tests/array/sizeof_basic1.phpt
+++ b/ext/standard/tests/array/sizeof_basic1.phpt
@@ -42,7 +42,7 @@ var_dump( sizeof($floatval, COUNT_RECURSIVE) );
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sizeof() : basic functionality ***
 -- Testing sizeof() for integer type in default, COUNT_NORMAL and COUNT_RECURSIVE modes --
 default mode: int(1)
@@ -58,19 +58,3 @@ COUNT_NORMAL mode: int(1)
 
 COUNT_RECURSIVE mode: int(1)
 Done
---UEXPECTF--
-*** Testing sizeof() : basic functionality ***
--- Testing sizeof() for integer type in default, COUNT_NORMAL and COUNT_RECURSIVE modes --
-default mode: int(1)
-
-COUNT_NORMAL mode: int(1)
-
-COUNT_RECURSIVE mode: int(1)
-
--- Testing sizeof() for float  type in default, COUNT_NORMAL and COUNT_RECURSIVE modes --
-default mode: int(1)
-
-COUNT_NORMAL mode: int(1)
-
-COUNT_RECURSIVE mode: int(1)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/sizeof_basic2.phpt b/ext/standard/tests/array/sizeof_basic2.phpt
index 043114ae9365f8a5e50e8289668517c7d28c8a15..c4a489083875282bdfdb982428d7f7492032c0bf 100644 (file)
--- a/ext/standard/tests/array/sizeof_basic2.phpt
+++ b/ext/standard/tests/array/sizeof_basic2.phpt
@@ -67,7 +67,7 @@ var_dump( sizeof($mixed_array, COUNT_RECURSIVE) );
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sizeof() : basic functionality ***
 -- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --
 default mode: int(4)
@@ -97,33 +97,3 @@ COUNT_NORMAL mode: int(5)
 
 COUNT_RECURSIVE mode: int(5)
 Done
---UEXPECTF--
-*** Testing sizeof() : basic functionality ***
--- Testing sizeof() with integer array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --
-default mode: int(4)
-
-COUNT_NORMAL mode: int(4)
-
-COUNT_RECURSIVE mode: int(4)
-
--- Testing sizeof() with string array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --
-default mode: int(3)
-
-COUNT_NORMAL mode: int(3)
-
-COUNT_RECURSIVE mode: int(3)
-
--- Testing sizeof() with indexed array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --
-default mode: int(3)
-
-COUNT_NORMAL mode: int(3)
-
-COUNT_RECURSIVE mode: int(3)
-
--- Testing sizeof() with mixed array in default, COUNT_NORMAL, COUNT_RECURSIVE modes --
-default mode: int(5)
-
-COUNT_NORMAL mode: int(5)
-
-COUNT_RECURSIVE mode: int(5)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/sizeof_error.phpt b/ext/standard/tests/array/sizeof_error.phpt
index 94d6ed4c1fbcff50e9284849be1e56edbdb2817b..79a75f3153bb45abb2e98d6b516c8acdfefbfb14 100644 (file)
--- a/ext/standard/tests/array/sizeof_error.phpt
+++ b/ext/standard/tests/array/sizeof_error.phpt
@@ -39,18 +39,3 @@ NULL
 Warning: sizeof() expects at most 2 parameters, 3 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing sizeof() : error conditions ***
--- Testing sizeof() with zero arguments --
-
-Warning: sizeof() expects at least 1 parameter, 0 given in %s on line %d
-NULL
--- Testing sizeof() function with more than two arguments under COUNT_NORMAL mode --
-
-Warning: sizeof() expects at most 2 parameters, 3 given in %s on line %d
-NULL
--- Testing sizeof() function with more than two arguments under COUNT_RECURSIVE mode --
-
-Warning: sizeof() expects at most 2 parameters, 3 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/sizeof_object1.phpt b/ext/standard/tests/array/sizeof_object1.phpt
index cd0eb92600ea97213f2cfd420f2c2d2c123ba3d8..596b895967f58eba8f897b38a07f36a9d7fd1aaa 100644 (file)
--- a/ext/standard/tests/array/sizeof_object1.phpt
+++ b/ext/standard/tests/array/sizeof_object1.phpt
@@ -43,17 +43,7 @@ var_dump( sizeof($obj, COUNT_RECURSIVE) );
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing sizeof() with object functionality ***
--- Testing sizeof() with an object which implements Countable interface --
--- Testing sizeof() in default mode --
-int(3)
--- Testing sizeof() in COUNT_NORMAL mode --
-int(3)
--- Testing sizeof() in COUNT_RECURSIVE mode --
-int(3)
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing sizeof() with object functionality ***
 -- Testing sizeof() with an object which implements Countable interface --
 -- Testing sizeof() in default mode --

diff --git a/ext/standard/tests/array/sizeof_object2.phpt b/ext/standard/tests/array/sizeof_object2.phpt
index 723d710c411a7bda29e270c48359f34ff0bec400..bd8edcc38682621db5230125f02f7541d72338c4 100644 (file)
--- a/ext/standard/tests/array/sizeof_object2.phpt
+++ b/ext/standard/tests/array/sizeof_object2.phpt
@@ -97,46 +97,7 @@ for($i = 0; $i < count($objects); $i++)
 
 echo "Done";
 ?>
---EXPECTF--
-*** Testing sizeof() : object functionality ***
---- Testing sizeof() with objects which doesn't implement Countable interface ---
--- Iteration 1 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 2 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 3 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 4 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 5 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing sizeof() : object functionality ***
 --- Testing sizeof() with objects which doesn't implement Countable interface ---
 -- Iteration 1 --

diff --git a/ext/standard/tests/array/sizeof_variation1.phpt b/ext/standard/tests/array/sizeof_variation1.phpt
index af00acac752cbbd0cbe0e90635bb2053cebb410d..11911fe6a9d870323d864c95936aed154d3eadc2 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation1.phpt
+++ b/ext/standard/tests/array/sizeof_variation1.phpt
@@ -76,7 +76,7 @@ for($i = 0; $i < count($values); $i++)
       
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sizeof() : usage variations ***
 --- Testing sizeof() for all scalar types in default,COUNT_NORMAL and COUNT_RECURSIVE mode ---
 -- Iteration 1 --
@@ -213,140 +213,3 @@ COUNT_NORMAL Mode: int(1)
 COUNT_RECURSIVE Mode: int(1)
 
 Done
---UEXPECTF--
-*** Testing sizeof() : usage variations ***
---- Testing sizeof() for all scalar types in default,COUNT_NORMAL and COUNT_RECURSIVE mode ---
--- Iteration 1 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 2 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 3 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 4 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 5 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 6 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 7 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 8 --
-Default Mode: int(0)
-
-COUNT_NORMAL Mode: int(0)
-
-COUNT_RECURSIVE Mode: int(0)
-
--- Iteration 9 --
-Default Mode: int(0)
-
-COUNT_NORMAL Mode: int(0)
-
-COUNT_RECURSIVE Mode: int(0)
-
--- Iteration 10 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 11 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 12 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 13 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 14 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 15 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 16 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 17 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
--- Iteration 18 --
-Default Mode: int(0)
-
-COUNT_NORMAL Mode: int(0)
-
-COUNT_RECURSIVE Mode: int(0)
-
--- Iteration 19 --
-Default Mode: int(1)
-
-COUNT_NORMAL Mode: int(1)
-
-COUNT_RECURSIVE Mode: int(1)
-
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/sizeof_variation2.phpt b/ext/standard/tests/array/sizeof_variation2.phpt
index 6febf4d5831b1ce36517df124600e7d46e18ad50..8bd74a0207663df88933b44b91a796d099c25272 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation2.phpt
+++ b/ext/standard/tests/array/sizeof_variation2.phpt
@@ -59,7 +59,7 @@ for($i = 0; $i < count($values); $i++)
          
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sizeof() : usage variations ***
 --- Testing sizeof() with different array values for 'var' argument ---
 -- Iteration 1 --
@@ -161,105 +161,3 @@ COUNT_NORMAL Mode: int(4)
 COUNT_RECURSIVE Mode: int(6)
 
 Done
---UEXPECTF--
-*** Testing sizeof() : usage variations ***
---- Testing sizeof() with different array values for 'var' argument ---
--- Iteration 1 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 2 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(8)
-
--- Iteration 3 --
-Default Mode: int(3)
-
-COUNT_NORMAL Mode: int(3)
-
-COUNT_RECURSIVE Mode: int(6)
-
--- Iteration 4 --
-Default Mode: int(0)
-
-COUNT_NORMAL Mode: int(0)
-
-COUNT_RECURSIVE Mode: int(0)
-
--- Iteration 5 --
-Default Mode: int(4)
-
-COUNT_NORMAL Mode: int(4)
-
-COUNT_RECURSIVE Mode: int(4)
-
--- Iteration 6 --
-Default Mode: int(3)
-
-COUNT_NORMAL Mode: int(3)
-
-COUNT_RECURSIVE Mode: int(3)
-
--- Iteration 7 --
-Default Mode: int(3)
-
-COUNT_NORMAL Mode: int(3)
-
-COUNT_RECURSIVE Mode: int(3)
-
--- Iteration 8 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 9 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 10 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 11 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 12 --
-Default Mode: int(2)
-
-COUNT_NORMAL Mode: int(2)
-
-COUNT_RECURSIVE Mode: int(2)
-
--- Iteration 13 --
-Default Mode: int(4)
-
-COUNT_NORMAL Mode: int(4)
-
-COUNT_RECURSIVE Mode: int(4)
-
--- Iteration 14 --
-Default Mode: int(4)
-
-COUNT_NORMAL Mode: int(4)
-
-COUNT_RECURSIVE Mode: int(6)
-
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/sizeof_variation3.phpt b/ext/standard/tests/array/sizeof_variation3.phpt
index f8bc84b6e6df0c278c60cfd4d70808045b5f6cd5..b78b620d7d02950a4a587b9ea8250c45d9238fbf 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation3.phpt
+++ b/ext/standard/tests/array/sizeof_variation3.phpt
@@ -25,17 +25,10 @@ var_dump( sizeof($array4, COUNT_RECURSIVE) );
 
 echo "Done";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sizeof() : usage variations ***
 -- Testing sizeof() for infinite recursion with arrays as argument in COUNT_RECURSIVE mode --
 int(13)
 
 int(2)
 Done
---UEXPECTF--
-*** Testing sizeof() : usage variations ***
--- Testing sizeof() for infinite recursion with arrays as argument in COUNT_RECURSIVE mode --
-int(13)
-
-int(2)
-Done
\ No newline at end of file

diff --git a/ext/standard/tests/array/sizeof_variation4.phpt b/ext/standard/tests/array/sizeof_variation4.phpt
index f460712e973f6125c86e6db20128add58195b103..a2462757d6d7df4645c6d7e0348ce6d3ddded2f1 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation4.phpt
+++ b/ext/standard/tests/array/sizeof_variation4.phpt
@@ -348,267 +348,3 @@ Notice: Undefined variable: value in %s on line %d
 int(0)
 
 Done
---UEXPECTF--
-*** Testing sizeof() : usage variations ***
---- Testing sizeof() for all kinds of unset variables in default, Normal and Recursive Modes ---
--- Iteration 1 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 2 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 3 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 4 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 5 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 6 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 7 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 8 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 9 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 10 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 11 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 12 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 13 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 14 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 15 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 16 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 17 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 18 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 19 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
--- Iteration 20 --
-Default Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_NORMAL Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-COUNT_RECURSIVE Mode: 
-Notice: Undefined variable: value in %s on line %d
-int(0)
-
-Done

diff --git a/ext/standard/tests/array/sizeof_variation5.phpt b/ext/standard/tests/array/sizeof_variation5.phpt
index cd8f73cc3074918febbc576cfd3c9626d2c0c5b3..2ddc9fdc565fb8d9d80841081c91960de9db5b79 100644 (file)
--- a/ext/standard/tests/array/sizeof_variation5.phpt
+++ b/ext/standard/tests/array/sizeof_variation5.phpt
@@ -105,66 +105,6 @@ int(6)
 int(6)
 -- Iteration 16 --
 
-Warning: sizeof() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: sizeof() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: sizeof() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: sizeof() expects parameter 2 to be long, string given in %s on line %d
-NULL
--- Iteration 20 --
-int(6)
--- Iteration 21 --
-
-Warning: sizeof() expects parameter 2 to be long, object given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: sizeof() expects parameter 2 to be long, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing sizeof() : usage variations ***
---- Testing sizeof() with different values for 'mode' argument ---
--- Iteration 1 --
-int(6)
--- Iteration 2 --
-int(9)
--- Iteration 3 --
-int(6)
--- Iteration 4 --
-int(9)
--- Iteration 5 --
-int(9)
--- Iteration 6 --
-int(9)
--- Iteration 7 --
-int(6)
--- Iteration 8 --
-int(6)
--- Iteration 9 --
-int(6)
--- Iteration 10 --
-int(6)
--- Iteration 11 --
-int(6)
--- Iteration 12 --
-int(6)
--- Iteration 13 --
-int(6)
--- Iteration 14 --
-int(6)
--- Iteration 15 --
-int(6)
--- Iteration 16 --
-
 Warning: sizeof() expects parameter 2 to be long, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/sort_basic.phpt b/ext/standard/tests/array/sort_basic.phpt
index 3e36dbd07296e156c61c84cb33ca49916f108f0e..2075b807182f18225a8f5b5e421e32a671d2d46d 100644 (file)
--- a/ext/standard/tests/array/sort_basic.phpt
+++ b/ext/standard/tests/array/sort_basic.phpt
@@ -11,7 +11,7 @@ Test sort() function : basic functionality
 /*
  * Testing sort() by providing arrays with default keys and assoc arrays 
  * to check the basic functionality with following flag values.
- *  flag value as defualt
+ *  flag value as default
  *  SORT_REGULAR - compare items normally
  *  SORT_NUMERIC - compare items numerically
  *  SORT_STRING - compare items as strings
@@ -25,12 +25,12 @@ $unsorted_strings =   array( "l" => "lemon", "o" => "orange", "b" => "banana" );
 // array with default keys containing unsorted numeric values
 $unsorted_numerics =  array( 100, 33, 555, 22 );
 
-echo "\n-- Testing sort() by supplying string array, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying string array, 'flag' value is default --\n";
 $temp_array = $unsorted_strings;
 var_dump( sort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
 
-echo "\n-- Testing sort() by supplying numeric array, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying numeric array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( sort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
@@ -57,85 +57,10 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : basic functionality ***
 
--- Testing sort() by supplying string array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "banana"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "orange"
-}
-
--- Testing sort() by supplying numeric array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [0]=>
-  int(22)
-  [1]=>
-  int(33)
-  [2]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-
--- Testing sort() by supplying string array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "banana"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "orange"
-}
-
--- Testing sort() by supplying numeric array, 'flag' = SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  int(22)
-  [1]=>
-  int(33)
-  [2]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-
--- Testing sort() by supplying string array, 'flag' = SORT_STRING --
-bool(true)
-array(3) {
-  [0]=>
-  string(6) "banana"
-  [1]=>
-  string(5) "lemon"
-  [2]=>
-  string(6) "orange"
-}
-
--- Testing sort() by supplying numeric array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(4) {
-  [0]=>
-  int(22)
-  [1]=>
-  int(33)
-  [2]=>
-  int(100)
-  [3]=>
-  int(555)
-}
-Done
---UEXPECTF--
-*** Testing sort() : basic functionality ***
-
--- Testing sort() by supplying string array, 'flag' value is defualt --
+-- Testing sort() by supplying string array, 'flag' value is default --
 bool(true)
 array(3) {
   [0]=>
@@ -146,7 +71,7 @@ array(3) {
   unicode(6) "orange"
 }
 
--- Testing sort() by supplying numeric array, 'flag' value is defualt --
+-- Testing sort() by supplying numeric array, 'flag' value is default --
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_error.phpt b/ext/standard/tests/array/sort_error.phpt
index f3ea722c8b4412a5ac28c181d781f3680ffdc365..996be71cdccf3fcc89eaed923ef0d28e8fe8a951 100644 (file)
--- a/ext/standard/tests/array/sort_error.phpt
+++ b/ext/standard/tests/array/sort_error.phpt
@@ -77,46 +77,3 @@ array(2) {
   int(2)
 }
 Done
---UEXPECTF--
-*** Testing sort() : error conditions ***
-
--- Testing sort() function with Zero arguments --
-
-Warning: sort() expects at least 1 parameter, 0 given in %s on line %d
-bool(false)
-
--- Testing sort() function with more than expected no. of arguments --
-
-Sort flag = SORT_REGULAR
-
-Warning: sort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_STRING
-
-Warning: sort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-
-Sort flag = SORT_NUMERIC
-
-Warning: sort() expects at most 2 parameters, 3 given in %s on line %d
-bool(false)
-array(2) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-}
-Done

diff --git a/ext/standard/tests/array/sort_object1.phpt b/ext/standard/tests/array/sort_object1.phpt
index 6a22ebe9e37709963984dbfb36edb8fb279523b0..72f70f1a85e19b1fbaf6847c610a3b179ba41366 100644 (file)
--- a/ext/standard/tests/array/sort_object1.phpt
+++ b/ext/standard/tests/array/sort_object1.phpt
@@ -8,7 +8,7 @@ Test sort() function : object functionality - sorting objects, 'sort_flags' as d
  * Source code: ext/standard/array.c
 */
 /*
- * testing sort() by providing integer/string object arrays with flag values are defualt, SORT_REGULAR
+ * testing sort() by providing integer/string object arrays with flag values are default, SORT_REGULAR
 */
 
 echo "*** Testing sort() : object functionality ***\n";
@@ -55,14 +55,14 @@ $unsorted_str_obj = array (
 );
 
 
-echo "\n-- Testing sort() by supplying various object arrays, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying various object arrays, 'flag' value is default --\n";
 
-// testing sort() function by supplying integer object array, flag value is defualt
+// testing sort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(sort($temp_array) );
 var_dump($temp_array);
 
-// testing sort() function by supplying string object array, flag value is defualt
+// testing sort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(sort($temp_array) );
 var_dump($temp_array);
@@ -83,166 +83,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing sort() : object functionality ***
 
--- Testing sort() by supplying various object arrays, 'flag' value is defualt --
-bool(true)
-array(6) {
-  [0]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [1]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [2]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [3]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [4]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [5]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  [0]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  [1]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  [2]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  [3]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  [4]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  [5]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  [6]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  [7]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-
--- Testing sort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(6) {
-  [0]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(-5)
-  }
-  [1]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(0)
-  }
-  [2]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    float(0.001)
-  }
-  [3]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(11)
-  }
-  [4]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(23)
-  }
-  [5]=>
-  object(for_integer_sort)#%d (1) {
-    ["class_value"]=>
-    int(66)
-  }
-}
-bool(true)
-array(8) {
-  [0]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "Lemon"
-  }
-  [1]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(6) "Orange"
-  }
-  [2]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "aPPle"
-  }
-  [3]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(5) "apple"
-  }
-  [4]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(3) "axx"
-  }
-  [5]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(2) "py"
-  }
-  [6]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(1) "t"
-  }
-  [7]=>
-  object(for_string_sort)#%d (1) {
-    ["class_value"]=>
-    string(1) "w"
-  }
-}
-Done
---UEXPECTF--
-*** Testing sort() : object functionality ***
-
--- Testing sort() by supplying various object arrays, 'flag' value is defualt --
+-- Testing sort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(6) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_object2.phpt b/ext/standard/tests/array/sort_object2.phpt
index 9ccc9496cf3398855c06c7fb062a724846984f55..22dc307ed9ac0e82cee7ef6ad9df56f8913e88cd 100644 (file)
--- a/ext/standard/tests/array/sort_object2.phpt
+++ b/ext/standard/tests/array/sort_object2.phpt
@@ -9,7 +9,7 @@ Test sort() function : object functionality - sorting objects with diff. accessi
 */
 
 /*
- * testing sort() by providing integer/string object arrays with flag values are defualt, SORT_REGULAR
+ * testing sort() by providing integer/string object arrays with flag values are default, SORT_REGULAR
 */
 
 echo "*** Testing sort() : object functionality ***\n";
@@ -66,14 +66,14 @@ $unsorted_str_obj = array (
 );
 
 
-echo "\n-- Testing sort() by supplying various object arrays, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying various object arrays, 'flag' value is default --\n";
 
-// testing sort() function by supplying integer object array, flag value is defualt
+// testing sort() function by supplying integer object array, flag value is default
 $temp_array = $unsorted_int_obj;
 var_dump(sort($temp_array) );
 var_dump($temp_array);
 
-// testing sort() function by supplying string object array, flag value is defualt
+// testing sort() function by supplying string object array, flag value is default
 $temp_array = $unsorted_str_obj;
 var_dump(sort($temp_array) );
 var_dump($temp_array);
@@ -94,170 +94,7 @@ echo "Done\n";
 --EXPECTF--
 *** Testing sort() : object functionality ***
 
--- Testing sort() by supplying various object arrays, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [0]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(5)
-  }
-  [1]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    float(0.001)
-    ["private_class_value":"for_integer_sort":private]=>
-    float(99.5)
-    ["protected_class_value":protected]=>
-    float(0.1)
-  }
-  [2]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(30)
-  }
-  [3]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(66)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(44)
-    ["protected_class_value":protected]=>
-    int(4)
-  }
-}
-bool(true)
-array(4) {
-  [0]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_sort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(3) "ass"
-  }
-  [1]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "py"
-    ["private_class_value":"for_string_sort":private]=>
-    string(2) "PY"
-    ["protected_class_value":protected]=>
-    string(2) "pt"
-  }
-  [2]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "t"
-    ["private_class_value":"for_string_sort":private]=>
-    string(3) "eee"
-    ["protected_class_value":protected]=>
-    string(3) "abb"
-  }
-  [3]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_sort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-}
-
--- Testing sort() by supplying various object arrays, 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(-88)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(-5)
-    ["protected_class_value":protected]=>
-    int(5)
-  }
-  [1]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    float(0.001)
-    ["private_class_value":"for_integer_sort":private]=>
-    float(99.5)
-    ["protected_class_value":protected]=>
-    float(0.1)
-  }
-  [2]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(11)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(33)
-    ["protected_class_value":protected]=>
-    int(30)
-  }
-  [3]=>
-  object(for_integer_sort)#%d (3) {
-    ["public_class_value"]=>
-    int(66)
-    ["private_class_value":"for_integer_sort":private]=>
-    int(44)
-    ["protected_class_value":protected]=>
-    int(4)
-  }
-}
-bool(true)
-array(4) {
-  [0]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(3) "axx"
-    ["private_class_value":"for_string_sort":private]=>
-    string(3) "AXX"
-    ["protected_class_value":protected]=>
-    string(3) "ass"
-  }
-  [1]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(2) "py"
-    ["private_class_value":"for_string_sort":private]=>
-    string(2) "PY"
-    ["protected_class_value":protected]=>
-    string(2) "pt"
-  }
-  [2]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "t"
-    ["private_class_value":"for_string_sort":private]=>
-    string(3) "eee"
-    ["protected_class_value":protected]=>
-    string(3) "abb"
-  }
-  [3]=>
-  object(for_string_sort)#%d (3) {
-    ["public_class_value"]=>
-    string(1) "w"
-    ["private_class_value":"for_string_sort":private]=>
-    string(1) "W"
-    ["protected_class_value":protected]=>
-    string(1) "c"
-  }
-}
-Done
---UEXPECTF--
-*** Testing sort() : object functionality ***
-
--- Testing sort() by supplying various object arrays, 'flag' value is defualt --
+-- Testing sort() by supplying various object arrays, 'flag' value is default --
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation1.phpt b/ext/standard/tests/array/sort_variation1.phpt
index 669099372d14226a515e2a5807c6a1436b55d652..a67ea26bf1fd14349edf4bf0f493e7855eb06711 100644 (file)
--- a/ext/standard/tests/array/sort_variation1.phpt
+++ b/ext/standard/tests/array/sort_variation1.phpt
@@ -10,7 +10,7 @@ Test sort() function : usage variations - unexpected values for 'array' argument
 /*
  * testing sort() by providing different unexpected values for array argument
  * with following flag values.
- * 1. flag value as defualt
+ * 1. flag value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
  * 4. SORT_STRING - compare items as strings
@@ -75,7 +75,7 @@ $unexpected_values = array (
 // loop though each element of the array and check the working of sort()
 // when $array arugment is supplied with different values from $unexpected_values
 echo "\n-- Testing sort() by supplying different unexpected values for 'array' argument --\n";
-echo "\n-- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
+echo "\n-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --\n"; 
 
 $counter = 1;
 for($index = 0; $index < count($unexpected_values); $index ++) {
@@ -95,313 +95,7 @@ echo "Done";
 
 -- Testing sort() by supplying different unexpected values for 'array' argument --
 
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
--- Iteration 1 --
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 2 --
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 3 --
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 4 --
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, integer given in %s on line %d
-bool(false)
--- Iteration 5 --
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 6 --
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 7 --
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 8 --
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 9 --
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, double given in %s on line %d
-bool(false)
--- Iteration 10 --
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 11 --
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, null given in %s on line %d
-bool(false)
--- Iteration 12 --
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 13 --
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 14 --
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 15 --
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, boolean given in %s on line %d
-bool(false)
--- Iteration 16 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 17 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 18 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 19 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 20 --
-
-Warning: sort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, object given in %s on line %d
-bool(false)
--- Iteration 21 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 22 --
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, string given in %s on line %d
-bool(false)
--- Iteration 23 --
-
-Warning: sort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-
-Warning: sort() expects parameter 1 to be array, resource given in %s on line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying different unexpected values for 'array' argument --
-
--- Flag values are defualt, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
+-- Flag values are default, SORT_REGULAR, SORT_NUMERIC, SORT_STRING --
 -- Iteration 1 --
 
 Warning: sort() expects parameter 1 to be array, integer given in %s on line %d

diff --git a/ext/standard/tests/array/sort_variation10.phpt b/ext/standard/tests/array/sort_variation10.phpt
index b9d07e92c7cb896bb29cefacb3bc99b1f1c9a4ba..fb7d883c0d68535bbc52791e8e11497b8e66b1c1 100644 (file)
--- a/ext/standard/tests/array/sort_variation10.phpt
+++ b/ext/standard/tests/array/sort_variation10.phpt
@@ -11,7 +11,7 @@ Test sort() function : usage variations - sort octal values
 /*
  * testing sort() by providing different octal array for $array argument
  * with following flag values
- * 1.flag value as defualt
+ * 1.flag value as default
  * 2.SORT_REGULAR - compare items normally
  * 3.SORT_NUMERIC - compare items numerically
 */
@@ -21,7 +21,7 @@ echo "*** Testing sort() : usage variations ***\n";
 // an array containing unsorted octal values
 $unsorted_oct_array = array(01235, 0321, 0345, 066, 0772, 077, -066, -0345, 0);
 
-echo "\n-- Testing sort() by supplying octal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing sort() by supplying octal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_oct_array;
 var_dump(sort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -38,82 +38,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
--- Testing sort() by supplying octal value array, 'flag' value is defualt  --
-bool(true)
-array(9) {
-  [0]=>
-  int(-229)
-  [1]=>
-  int(-54)
-  [2]=>
-  int(0)
-  [3]=>
-  int(54)
-  [4]=>
-  int(63)
-  [5]=>
-  int(209)
-  [6]=>
-  int(229)
-  [7]=>
-  int(506)
-  [8]=>
-  int(669)
-}
-
--- Testing sort() by supplying octal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(9) {
-  [0]=>
-  int(-229)
-  [1]=>
-  int(-54)
-  [2]=>
-  int(0)
-  [3]=>
-  int(54)
-  [4]=>
-  int(63)
-  [5]=>
-  int(209)
-  [6]=>
-  int(229)
-  [7]=>
-  int(506)
-  [8]=>
-  int(669)
-}
-
--- Testing sort() by supplying octal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(9) {
-  [0]=>
-  int(-229)
-  [1]=>
-  int(-54)
-  [2]=>
-  int(0)
-  [3]=>
-  int(54)
-  [4]=>
-  int(63)
-  [5]=>
-  int(209)
-  [6]=>
-  int(229)
-  [7]=>
-  int(506)
-  [8]=>
-  int(669)
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying octal value array, 'flag' value is defualt  --
+-- Testing sort() by supplying octal value array, 'flag' value is default  --
 bool(true)
 array(9) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation11.phpt b/ext/standard/tests/array/sort_variation11.phpt
index 66f8f05cd3735c5af1a7d5913b2bef1ff6ea6f48..82e210b09bdd07caa3b8b930f2c330ff7ee62db2 100644 (file)
Binary files a/ext/standard/tests/array/sort_variation11.phpt and b/ext/standard/tests/array/sort_variation11.phpt differ

diff --git a/ext/standard/tests/array/sort_variation2.phpt b/ext/standard/tests/array/sort_variation2.phpt
index 0f8c3f96a73c36b94eadfb0be4b2516581016483..cf19f6a3a5580d908354ab6ff385943884c4ff86 100644 (file)
--- a/ext/standard/tests/array/sort_variation2.phpt
+++ b/ext/standard/tests/array/sort_variation2.phpt
@@ -214,227 +214,6 @@ array(3) {
 }
 -- Iteration 13 --
 
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 14 --
-
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 15 --
-
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 16 --
-
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 17 --
-
-Warning: sort() expects parameter 2 to be long, object given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 18 --
-
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 19 --
-
-Warning: sort() expects parameter 2 to be long, string given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
--- Iteration 20 --
-
-Warning: sort() expects parameter 2 to be long, resource given in %s on line %d
-bool(false)
-array(3) {
-  [0]=>
-  int(10)
-  [1]=>
-  int(2)
-  [2]=>
-  int(45)
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying different unexpected values for 'flag' argument --
--- Iteration 1 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 2 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 3 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 4 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 5 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 6 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 7 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 8 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 9 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 10 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 11 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 12 --
-bool(true)
-array(3) {
-  [0]=>
-  int(2)
-  [1]=>
-  int(10)
-  [2]=>
-  int(45)
-}
--- Iteration 13 --
-
 Warning: sort() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 array(3) {

diff --git a/ext/standard/tests/array/sort_variation3.phpt b/ext/standard/tests/array/sort_variation3.phpt
index fa7ba9ac921bab4c906876222ad2d2966d9c3998..925980f3b75811ff4442d0a0fa6f3d35eec6b82b 100644 (file)
--- a/ext/standard/tests/array/sort_variation3.phpt
+++ b/ext/standard/tests/array/sort_variation3.phpt
@@ -11,7 +11,7 @@ Test sort() function : usage variations - sort integer/float values
 /*
  * Testing sort() by providing different integer/float value arrays for $array argument
  * with following flag values
- * 1. flag  value as defualt
+ * 1. flag  value as default
  * 2. SORT_REGULAR - compare items normally
  * 3. SORT_NUMERIC - compare items numerically
  * 4. SORT_STRING - compare items as strings
@@ -44,7 +44,7 @@ echo "\n-- Testing sort() by supplying various integer/float arrays --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With Defualt sort flag -\n"; 
+  echo "- With default sort flag -\n"; 
   $temp_array = $array; 
   var_dump(sort($temp_array) );
   var_dump($temp_array);
@@ -67,7 +67,7 @@ echo "Done\n";
 -- Testing sort() by supplying various integer/float arrays --
 
 -- Iteration 1 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(9) {
   [0]=>
@@ -135,7 +135,7 @@ array(9) {
 }
 
 -- Iteration 2 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(7) {
   [0]=>
@@ -191,7 +191,7 @@ array(7) {
 }
 
 -- Iteration 3 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(11) {
   [0]=>
@@ -271,272 +271,7 @@ array(11) {
 }
 
 -- Iteration 4 --
-- With Defualt sort flag -
-bool(true)
-array(7) {
-  [0]=>
-  %s(-2147483649)
-  [1]=>
-  %s(-2147483648)
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  int(0)
-  [4]=>
-  int(0)
-  [5]=>
-  int(2147483647)
-  [6]=>
-  %s(2147483648)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [0]=>
-  %s(-2147483649)
-  [1]=>
-  %s(-2147483648)
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  int(0)
-  [4]=>
-  int(0)
-  [5]=>
-  int(2147483647)
-  [6]=>
-  %s(2147483648)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [0]=>
-  %s(-2147483649)
-  [1]=>
-  %s(-2147483648)
-  [2]=>
-  int(-2147483647)
-  [3]=>
-  int(0)
-  [4]=>
-  int(0)
-  [5]=>
-  int(2147483647)
-  [6]=>
-  %s(2147483648)
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying various integer/float arrays --
-
--- Iteration 1 --
-- With Defualt sort flag -
-bool(true)
-array(9) {
-  [0]=>
-  int(-41)
-  [1]=>
-  int(-31)
-  [2]=>
-  int(-21)
-  [3]=>
-  int(-11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(11)
-  [6]=>
-  int(21)
-  [7]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(9) {
-  [0]=>
-  int(-41)
-  [1]=>
-  int(-31)
-  [2]=>
-  int(-21)
-  [3]=>
-  int(-11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(11)
-  [6]=>
-  int(21)
-  [7]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(9) {
-  [0]=>
-  int(-41)
-  [1]=>
-  int(-31)
-  [2]=>
-  int(-21)
-  [3]=>
-  int(-11)
-  [4]=>
-  int(0)
-  [5]=>
-  int(11)
-  [6]=>
-  int(21)
-  [7]=>
-  int(31)
-  [8]=>
-  int(41)
-}
-
--- Iteration 2 --
-- With Defualt sort flag -
-bool(true)
-array(7) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  float(-0.1)
-  [2]=>
-  float(0.01)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.5)
-  [5]=>
-  float(10.5)
-  [6]=>
-  float(1050)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(7) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  float(-0.1)
-  [2]=>
-  float(0.01)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.5)
-  [5]=>
-  float(10.5)
-  [6]=>
-  float(1050)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(7) {
-  [0]=>
-  float(-10.5)
-  [1]=>
-  float(-0.1)
-  [2]=>
-  float(0.01)
-  [3]=>
-  float(0.106)
-  [4]=>
-  float(0.5)
-  [5]=>
-  float(10.5)
-  [6]=>
-  float(1050)
-}
-
--- Iteration 3 --
-- With Defualt sort flag -
-bool(true)
-array(11) {
-  [0]=>
-  int(-1)
-  [1]=>
-  float(-0.9)
-  [2]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [4]=>
-  int(0)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  float(0.0021)
-  [7]=>
-  float(0.09)
-  [8]=>
-  float(0.106)
-  [9]=>
-  int(2)
-  [10]=>
-  int(33)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(11) {
-  [0]=>
-  int(-1)
-  [1]=>
-  float(-0.9)
-  [2]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [4]=>
-  int(0)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  float(0.0021)
-  [7]=>
-  float(0.09)
-  [8]=>
-  float(0.106)
-  [9]=>
-  int(2)
-  [10]=>
-  int(33)
-}
-- Sort flag = SORT_NUMERIC -
-bool(true)
-array(11) {
-  [0]=>
-  int(-1)
-  [1]=>
-  float(-0.9)
-  [2]=>
-  float(-0.106)
-  [3]=>
-  float(-0.01)
-  [4]=>
-  int(0)
-  [5]=>
-  float(0.0001)
-  [6]=>
-  float(0.0021)
-  [7]=>
-  float(0.09)
-  [8]=>
-  float(0.106)
-  [9]=>
-  int(2)
-  [10]=>
-  int(33)
-}
-
--- Iteration 4 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(7) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation4.phpt b/ext/standard/tests/array/sort_variation4.phpt
index b0656363df9e57c9453ec794840a900c5b5d34ca..1d78821583dbf45b46f42f1373e4582067cf3081 100644 (file)
--- a/ext/standard/tests/array/sort_variation4.phpt
+++ b/ext/standard/tests/array/sort_variation4.phpt
@@ -10,7 +10,7 @@ Test sort() function : usage variations - sort reference values
 
 /*
  * Testing sort() by providing reference variable array with following flag values
- *  flag value as defualt
+ *  flag value as default
  *  SORT_REGULAR - compare items normally
  *  SORT_NUMERIC - compare items numerically
 */
@@ -24,7 +24,7 @@ $value3 = 555;
 // an array containing integer references 
 $unsorted_numerics =  array( &$value1 , &$value2, &$value3);
 
-echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying reference variable array, 'flag' value is default --\n";
 $temp_array = $unsorted_numerics;
 var_dump( sort($temp_array) ); // expecting : bool(true)
 var_dump( $temp_array);
@@ -41,46 +41,10 @@ var_dump( $temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() :usage variations  ***
 
--- Testing sort() by supplying reference variable array, 'flag' value is defualt --
-bool(true)
-array(3) {
-  [0]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(555)
-}
-
--- Testing sort() by supplying reference variable array, 'flag' = SORT_REGULAR --
-bool(true)
-array(3) {
-  [0]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(555)
-}
-
--- Testing sort() by supplying reference variable array, 'flag' = SORT_NUMERIC --
-bool(true)
-array(3) {
-  [0]=>
-  &int(33)
-  [1]=>
-  &int(100)
-  [2]=>
-  &int(555)
-}
-Done
---UEXPECTF--
-*** Testing sort() :usage variations  ***
-
--- Testing sort() by supplying reference variable array, 'flag' value is defualt --
+-- Testing sort() by supplying reference variable array, 'flag' value is default --
 bool(true)
 array(3) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation5.phpt b/ext/standard/tests/array/sort_variation5.phpt
index fa21cfb22ca91628b1f92b99e1a46a3ff968529a..d3a025609f7ece9f98542901fad91cfba000d28d 100644 (file)
--- a/ext/standard/tests/array/sort_variation5.phpt
+++ b/ext/standard/tests/array/sort_variation5.phpt
@@ -11,7 +11,7 @@ Test sort() function : usage variations - sort strings
 /*
  * testing sort() by providing different string arrays for $array argument with
  * following flag values
- *  flag value as defualt
+ *  flag value as default
  *  SORT_REGULAR - compare items normally
  *  SORT_STRING  - compare items as strings
 */
@@ -52,190 +52,7 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying various string arrays --
-
--- Iteration 1 --
-- With Default sort flag -
-bool(true)
-array(12) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  string(1) "  "
-  [3]=>
-  string(1) "
-"
-  [4]=>
-  string(1) "\v"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "
-"
-  [7]=>
-  string(2) "\a"
-  [8]=>
-  string(3) "\cx"
-  [9]=>
-  string(4) "\ddd"
-  [10]=>
-  string(2) "\e"
-  [11]=>
-  string(4) "\xhh"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  string(1) "  "
-  [3]=>
-  string(1) "
-"
-  [4]=>
-  string(1) "\v"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "
-"
-  [7]=>
-  string(2) "\a"
-  [8]=>
-  string(3) "\cx"
-  [9]=>
-  string(4) "\ddd"
-  [10]=>
-  string(2) "\e"
-  [11]=>
-  string(4) "\xhh"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(12) {
-  [0]=>
-  NULL
-  [1]=>
-  NULL
-  [2]=>
-  string(1) "  "
-  [3]=>
-  string(1) "
-"
-  [4]=>
-  string(1) "\v"
-  [5]=>
-  string(1) "\f"
-  [6]=>
-  string(1) "
-"
-  [7]=>
-  string(2) "\a"
-  [8]=>
-  string(3) "\cx"
-  [9]=>
-  string(4) "\ddd"
-  [10]=>
-  string(2) "\e"
-  [11]=>
-  string(4) "\xhh"
-}
-
--- Iteration 2 --
-- With Default sort flag -
-bool(true)
-array(12) {
-  [0]=>
-  string(6) "BANANA"
-  [1]=>
-  string(6) "Orange"
-  [2]=>
-  string(4) "TTTT"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(1) "X"
-  [5]=>
-  string(5) "apple"
-  [6]=>
-  string(6) "banana"
-  [7]=>
-  string(5) "lemoN"
-  [8]=>
-  string(6) "oraNGe"
-  [9]=>
-  string(3) "ttt"
-  [10]=>
-  string(2) "ww"
-  [11]=>
-  string(1) "x"
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(12) {
-  [0]=>
-  string(6) "BANANA"
-  [1]=>
-  string(6) "Orange"
-  [2]=>
-  string(4) "TTTT"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(1) "X"
-  [5]=>
-  string(5) "apple"
-  [6]=>
-  string(6) "banana"
-  [7]=>
-  string(5) "lemoN"
-  [8]=>
-  string(6) "oraNGe"
-  [9]=>
-  string(3) "ttt"
-  [10]=>
-  string(2) "ww"
-  [11]=>
-  string(1) "x"
-}
-- Sort flag = SORT_STRING -
-bool(true)
-array(12) {
-  [0]=>
-  string(6) "BANANA"
-  [1]=>
-  string(6) "Orange"
-  [2]=>
-  string(4) "TTTT"
-  [3]=>
-  string(4) "Test"
-  [4]=>
-  string(1) "X"
-  [5]=>
-  string(5) "apple"
-  [6]=>
-  string(6) "banana"
-  [7]=>
-  string(5) "lemoN"
-  [8]=>
-  string(6) "oraNGe"
-  [9]=>
-  string(3) "ttt"
-  [10]=>
-  string(2) "ww"
-  [11]=>
-  string(1) "x"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
 -- Testing sort() by supplying various string arrays --

diff --git a/ext/standard/tests/array/sort_variation6.phpt b/ext/standard/tests/array/sort_variation6.phpt
index e2bc86b7c8dee35a9e7ac7bbd9827772135d243a..321b1fc1e2985ff24e3d9698048f6da0e3aa332c 100644 (file)
--- a/ext/standard/tests/array/sort_variation6.phpt
+++ b/ext/standard/tests/array/sort_variation6.phpt
@@ -11,7 +11,7 @@ Test sort() function : usage variations - sort hexadecimals values
 /*
  * testing sort() by providing different hexa-decimal array for $array argument
  * with following flag values
- * flag value as defualt
+ * flag value as default
  * SORT_REGULAR - compare items normally
  * SORT_NUMERIC - compare items numerically
 */
@@ -21,7 +21,7 @@ echo "*** Testing sort() : usage variations ***\n";
 // an array contains unsorted hexadecimal values  
 $unsorted_hex_array = array(0x1AB, 0xFFF, 0xF, 0xFF, 0x2AA, 0xBB, 0x1ab, 0xff, -0xFF, 0, -0x2aa);
 
-echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt  --\n";
+echo "\n-- Testing sort() by supplying hexadecimal value array, 'flag' value is default  --\n";
 $temp_array = $unsorted_hex_array;
 var_dump(sort($temp_array) ); // expecting : bool(true)
 var_dump($temp_array);
@@ -38,94 +38,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
--- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt  --
-bool(true)
-array(11) {
-  [0]=>
-  int(-682)
-  [1]=>
-  int(-255)
-  [2]=>
-  int(0)
-  [3]=>
-  int(15)
-  [4]=>
-  int(187)
-  [5]=>
-  int(255)
-  [6]=>
-  int(255)
-  [7]=>
-  int(427)
-  [8]=>
-  int(427)
-  [9]=>
-  int(682)
-  [10]=>
-  int(4095)
-}
-
--- Testing sort() by supplying hexadecimal value array, 'flag' value is SORT_REGULAR  --
-bool(true)
-array(11) {
-  [0]=>
-  int(-682)
-  [1]=>
-  int(-255)
-  [2]=>
-  int(0)
-  [3]=>
-  int(15)
-  [4]=>
-  int(187)
-  [5]=>
-  int(255)
-  [6]=>
-  int(255)
-  [7]=>
-  int(427)
-  [8]=>
-  int(427)
-  [9]=>
-  int(682)
-  [10]=>
-  int(4095)
-}
-
--- Testing sort() by supplying hexadecimal value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(11) {
-  [0]=>
-  int(-682)
-  [1]=>
-  int(-255)
-  [2]=>
-  int(0)
-  [3]=>
-  int(15)
-  [4]=>
-  int(187)
-  [5]=>
-  int(255)
-  [6]=>
-  int(255)
-  [7]=>
-  int(427)
-  [8]=>
-  int(427)
-  [9]=>
-  int(682)
-  [10]=>
-  int(4095)
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying hexadecimal value array, 'flag' value is defualt  --
+-- Testing sort() by supplying hexadecimal value array, 'flag' value is default  --
 bool(true)
 array(11) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation7.phpt b/ext/standard/tests/array/sort_variation7.phpt
index 5ed578e55293469aaf507fa8c674117b4b16980f..3fe5db1796381b5a2cb3d63306da90e980f59e56 100644 (file)
--- a/ext/standard/tests/array/sort_variation7.phpt
+++ b/ext/standard/tests/array/sort_variation7.phpt
@@ -10,7 +10,7 @@ Test sort() function : usage variations - sort boolean values
 
 /*
  * testing sort() by providing bool value array for $array argument with following flag values.
- * flag value as defualt
+ * flag value as default
  * SORT_REGULAR - compare items normally
 */
 
@@ -19,7 +19,7 @@ echo "*** Testing sort() : usage variations ***\n";
 // bool value array
 $bool_values = array (true, false, TRUE, FALSE);
 
-echo "\n-- Testing sort() by supplying bool value array, 'flag' value is defualt --\n";
+echo "\n-- Testing sort() by supplying bool value array, 'flag' value is default --\n";
 $temp_array = $bool_values;
 var_dump(sort($temp_array) );
 var_dump($temp_array);
@@ -41,65 +41,10 @@ var_dump($temp_array);
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
--- Testing sort() by supplying bool value array, 'flag' value is defualt --
-bool(true)
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing sort() by supplying bool value array, 'flag' value is SORT_REGULAR --
-bool(true)
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing sort() by supplying bool value array, 'flag' value is SORT_NUMERIC  --
-bool(true)
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-
--- Testing sort() by supplying bool value array, 'flag' value is SORT_STRING --
-bool(true)
-array(4) {
-  [0]=>
-  bool(false)
-  [1]=>
-  bool(false)
-  [2]=>
-  bool(true)
-  [3]=>
-  bool(true)
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying bool value array, 'flag' value is defualt --
+-- Testing sort() by supplying bool value array, 'flag' value is default --
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation8.phpt b/ext/standard/tests/array/sort_variation8.phpt
index 3a4f4cf5cc440b88135b124445bb6e9c973b6977..39390636053666851b795ebe84ab417f66e56e22 100644 (file)
--- a/ext/standard/tests/array/sort_variation8.phpt
+++ b/ext/standard/tests/array/sort_variation8.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as defualt/SORT_REGULAR 
+Test sort() function : usage variations - sort array with diff. sub arrays, 'sort_flags' as default/SORT_REGULAR 
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
@@ -10,7 +10,7 @@ Test sort() function : usage variations - sort array with diff. sub arrays, 'sor
 
 /*
  * testing sort() by providing arrays contains sub arrays for $array argument with flowing flag values
- * flag value as defualt
+ * flag value as default
  * SORT_REGULAR - compare items normally
 */
 
@@ -39,8 +39,8 @@ echo "\n-- Testing sort() by supplying various arrays containing sub arrays --\n
 foreach ($various_arrays as $array) {
  
   echo "\n-- Iteration $count --\n"; 
-  // testing sort() function by supplying different arrays, flag value is defualt
-  echo "- With Defualt sort flag -\n";
+  // testing sort() function by supplying different arrays, flag value is default
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump(sort($temp_array) );
   var_dump($temp_array);
@@ -55,13 +55,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
 -- Testing sort() by supplying various arrays containing sub arrays --
 
 -- Iteration 1 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(0) {
 }
@@ -71,7 +71,7 @@ array(0) {
 }
 
 -- Iteration 2 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(1) {
   [0]=>
@@ -87,7 +87,7 @@ array(1) {
 }
 
 -- Iteration 3 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [0]=>
@@ -119,128 +119,7 @@ array(3) {
 }
 
 -- Iteration 4 --
-- With Defualt sort flag -
-bool(true)
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  [0]=>
-  array(0) {
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(11)
-  }
-  [2]=>
-  array(2) {
-    [0]=>
-    int(22)
-    [1]=>
-    int(-55)
-  }
-  [3]=>
-  array(3) {
-    [0]=>
-    int(33)
-    [1]=>
-    int(-5)
-    [2]=>
-    int(6)
-  }
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying various arrays containing sub arrays --
-
--- Iteration 1 --
-- With Defualt sort flag -
-bool(true)
-array(0) {
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(0) {
-}
-
--- Iteration 2 --
-- With Defualt sort flag -
-bool(true)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(1) {
-  [0]=>
-  array(0) {
-  }
-}
-
--- Iteration 3 --
-- With Defualt sort flag -
-bool(true)
-array(3) {
-  [0]=>
-  int(11)
-  [1]=>
-  int(44)
-  [2]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [0]=>
-  int(11)
-  [1]=>
-  int(44)
-  [2]=>
-  array(2) {
-    [0]=>
-    int(64)
-    [1]=>
-    int(61)
-  }
-}
-
--- Iteration 4 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/sort_variation9.phpt b/ext/standard/tests/array/sort_variation9.phpt
index 1fc120544608027e86dd0a18d2213bc69a5539df..ce91dd9d2b2da976d653ade9fd95a4dc66fefd0f 100644 (file)
--- a/ext/standard/tests/array/sort_variation9.phpt
+++ b/ext/standard/tests/array/sort_variation9.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test sort() function : usage variations - sort diff. associative arrays, 'sort_flags' as defualt/SORT_REGULAR
+Test sort() function : usage variations - sort diff. associative arrays, 'sort_flags' as default/SORT_REGULAR
 --FILE--
 <?php
 /* Prototype  : bool sort ( array &$array [, int $sort_flags] )
@@ -11,7 +11,7 @@ Test sort() function : usage variations - sort diff. associative arrays, 'sort_f
 /*
  * Testing sort() by providing arrays  with key values for $array argument
  * with following flag values.
- * 1.flag value as defualt
+ * 1.flag value as default
  * 2.SORT_REGULAR - compare items normally
  * To test the new keys for the elements in the sorted array.
  */
@@ -38,7 +38,7 @@ echo "\n-- Testing sort() by supplying various arrays with key values --\n";
 foreach ($various_arrays as $array) {
   echo "\n-- Iteration $count --\n";
 
-  echo "- With Defualt sort flag -\n";
+  echo "- With default sort flag -\n";
   $temp_array = $array;
   var_dump(sort($temp_array) );
   var_dump($temp_array);
@@ -52,13 +52,13 @@ foreach ($various_arrays as $array) {
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
 *** Testing sort() : usage variations ***
 
 -- Testing sort() by supplying various arrays with key values --
 
 -- Iteration 1 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(5) {
   [0]=>
@@ -88,212 +88,7 @@ array(5) {
 }
 
 -- Iteration 2 --
-- With Defualt sort flag -
-bool(true)
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(5) "first"
-    [5]=>
-    string(6) "second"
-    [6]=>
-    string(5) "third"
-  }
-  [1]=>
-  array(3) {
-    ["a"]=>
-    string(6) "orange"
-    ["b"]=>
-    string(6) "banana"
-    ["c"]=>
-    string(5) "apple"
-  }
-  [2]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(3) {
-  [0]=>
-  array(3) {
-    [0]=>
-    string(5) "first"
-    [5]=>
-    string(6) "second"
-    [6]=>
-    string(5) "third"
-  }
-  [1]=>
-  array(3) {
-    ["a"]=>
-    string(6) "orange"
-    ["b"]=>
-    string(6) "banana"
-    ["c"]=>
-    string(5) "apple"
-  }
-  [2]=>
-  array(6) {
-    [0]=>
-    int(1)
-    [1]=>
-    int(2)
-    [2]=>
-    int(3)
-    [3]=>
-    int(4)
-    [4]=>
-    int(5)
-    [5]=>
-    int(6)
-  }
-}
-
--- Iteration 3 --
-- With Defualt sort flag -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(13)
-  [5]=>
-  int(19)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [2]=>
-  int(1)
-  [3]=>
-  int(1)
-  [4]=>
-  int(13)
-  [5]=>
-  int(19)
-}
-
--- Iteration 4 --
-- With Defualt sort flag -
-bool(true)
-array(2) {
-  [0]=>
-  string(3) "baz"
-  [1]=>
-  int(1)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(2) {
-  [0]=>
-  string(3) "baz"
-  [1]=>
-  int(1)
-}
-
--- Iteration 5 --
-- With Defualt sort flag -
-bool(true)
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  [3]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(4) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(5)
-  [2]=>
-  array(1) {
-    ["g"]=>
-    int(4)
-  }
-  [3]=>
-  array(2) {
-    ["e"]=>
-    int(2)
-    ["f"]=>
-    int(3)
-  }
-}
-Done
---UEXPECTF--
-*** Testing sort() : usage variations ***
-
--- Testing sort() by supplying various arrays with key values --
-
--- Iteration 1 --
-- With Defualt sort flag -
-bool(true)
-array(5) {
-  [0]=>
-  int(11)
-  [1]=>
-  int(22)
-  [2]=>
-  int(33)
-  [3]=>
-  int(55)
-  [4]=>
-  int(66)
-}
-- Sort flag = SORT_REGULAR -
-bool(true)
-array(5) {
-  [0]=>
-  int(11)
-  [1]=>
-  int(22)
-  [2]=>
-  int(33)
-  [3]=>
-  int(55)
-  [4]=>
-  int(66)
-}
-
--- Iteration 2 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(3) {
   [0]=>
@@ -369,7 +164,7 @@ array(3) {
 }
 
 -- Iteration 3 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(6) {
   [0]=>
@@ -403,7 +198,7 @@ array(6) {
 }
 
 -- Iteration 4 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(2) {
   [0]=>
@@ -421,7 +216,7 @@ array(2) {
 }
 
 -- Iteration 5 --
-- With Defualt sort flag -
+- With default sort flag -
 bool(true)
 array(4) {
   [0]=>

diff --git a/ext/standard/tests/array/uasort_basic1.phpt b/ext/standard/tests/array/uasort_basic1.phpt
index 4fdd7a71471accce9e902a7a5f7d3ad222aa88e8..523e69db7600944cc9d80b4464aa2d0fe666cece 100644 (file)
--- a/ext/standard/tests/array/uasort_basic1.phpt
+++ b/ext/standard/tests/array/uasort_basic1.phpt
@@ -55,66 +55,7 @@ var_dump($string_key_arg);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : basic functionality ***
--- Numeric array with default keys --
-bool(true)
-array(7) {
-  [0]=>
-  int(1)
-  [4]=>
-  int(2)
-  [3]=>
-  int(3)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [1]=>
-  int(8)
-  [2]=>
-  int(9)
-}
--- String array with default keys --
-bool(true)
-array(4) {
-  [0]=>
-  string(4) "This"
-  [2]=>
-  string(1) "a"
-  [1]=>
-  string(2) "is"
-  [3]=>
-  string(4) "test"
-}
--- Associative array with numeric keys --
-bool(true)
-array(5) {
-  [1]=>
-  int(1)
-  [2]=>
-  int(2)
-  [5]=>
-  int(4)
-  [3]=>
-  int(7)
-  [4]=>
-  int(9)
-}
--- Associative array with string keys --
-bool(true)
-array(4) {
-  ["three"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["one"]=>
-  int(4)
-  ["four"]=>
-  int(10)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : basic functionality ***
 -- Numeric array with default keys --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_basic2.phpt b/ext/standard/tests/array/uasort_basic2.phpt
index 9c42b1f9e74ab4626f994e0eed29566290b31c5d..2d16c12f6dd45aa2918aabc896bab965002701b0 100644 (file)
--- a/ext/standard/tests/array/uasort_basic2.phpt
+++ b/ext/standard/tests/array/uasort_basic2.phpt
@@ -49,58 +49,7 @@ var_dump($int_values3);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : basic functionality with duplicate values ***
--- Numeric array with increasing values --
-bool(true)
-array(6) {
-  [0]=>
-  int(1)
-  [1]=>
-  int(1)
-  [3]=>
-  int(2)
-  [2]=>
-  int(2)
-  [5]=>
-  int(3)
-  [4]=>
-  int(3)
-}
--- Numeric array with decreasing values --
-bool(true)
-array(6) {
-  [4]=>
-  int(1)
-  [5]=>
-  int(1)
-  [3]=>
-  int(2)
-  [2]=>
-  int(2)
-  [1]=>
-  int(3)
-  [0]=>
-  int(3)
-}
--- Numeric array with increasing and decreasing values --
-bool(true)
-array(6) {
-  [5]=>
-  int(1)
-  [0]=>
-  int(1)
-  [1]=>
-  int(2)
-  [4]=>
-  int(2)
-  [2]=>
-  int(3)
-  [3]=>
-  int(3)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : basic functionality with duplicate values ***
 -- Numeric array with increasing values --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_error.phpt b/ext/standard/tests/array/uasort_error.phpt
index 318a8a08b711299a9e348fe3af764170b21938ca..820ab58478faa15503dd3c174a19988e935dd6e5 100644 (file)
--- a/ext/standard/tests/array/uasort_error.phpt
+++ b/ext/standard/tests/array/uasort_error.phpt
@@ -79,26 +79,3 @@ NULL
 Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing uasort() : error conditions ***
--- Testing uasort() function with Zero argument --
-
-Warning: uasort() expects exactly 2 parameters, 0 given in %s on line %d
-NULL
--- Testing uasort() function with more than expected no. of arguments --
-
-Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
--- Testing uasort() function with less than expected no. of arguments --
-
-Warning: uasort() expects exactly 2 parameters, 1 given in %s on line %d
-NULL
--- Testing uasort() function with non-existent compare function --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function 'non_existent' not found or invalid function name in %s on line %d
-NULL
--- Testing uasort() function with non-existent compare function and extra argument --
-
-Warning: uasort() expects exactly 2 parameters, 3 given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/uasort_object1.phpt b/ext/standard/tests/array/uasort_object1.phpt
index 9ebd495c50e54cdd18fcb9e6f6ddc637cbb1142f..0a690541e44a2df38d97fba3e913855515c7ddb3 100644 (file)
--- a/ext/standard/tests/array/uasort_object1.phpt
+++ b/ext/standard/tests/array/uasort_object1.phpt
@@ -92,63 +92,7 @@ var_dump($array_arg);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : object functionality ***
-bool(true)
-array(4) {
-  [1]=>
-  object(SimpleClass1)#2 (1) {
-    ["int_value":"SimpleClass1":private]=>
-    int(1)
-  }
-  [0]=>
-  object(SimpleClass1)#1 (1) {
-    ["int_value":"SimpleClass1":private]=>
-    int(10)
-  }
-  [3]=>
-  object(SimpleClass1)#4 (1) {
-    ["int_value":"SimpleClass1":private]=>
-    int(50)
-  }
-  [2]=>
-  object(SimpleClass1)#3 (1) {
-    ["int_value":"SimpleClass1":private]=>
-    int(100)
-  }
-}
-bool(true)
-array(3) {
-  [0]=>
-  object(SimpleClass2)#5 (3) {
-    ["int_value":"SimpleClass2":private]=>
-    int(2)
-    ["float_value":protected]=>
-    float(3.4)
-    ["string_value"]=>
-    string(5) "mango"
-  }
-  [2]=>
-  object(SimpleClass2)#7 (3) {
-    ["int_value":"SimpleClass2":private]=>
-    int(5)
-    ["float_value":protected]=>
-    float(2.5)
-    ["string_value"]=>
-    string(6) "orange"
-  }
-  [1]=>
-  object(SimpleClass2)#6 (3) {
-    ["int_value":"SimpleClass2":private]=>
-    int(10)
-    ["float_value":protected]=>
-    float(1.2)
-    ["string_value"]=>
-    string(5) "apple"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : object functionality ***
 bool(true)
 array(4) {

diff --git a/ext/standard/tests/array/uasort_object2.phpt b/ext/standard/tests/array/uasort_object2.phpt
index 704129e0ed8a2e42ab9677939dd6e32266737f8e..ee617ecec1a0f32cfdbbd415a96f4c7518dbcbd7 100644 (file)
--- a/ext/standard/tests/array/uasort_object2.phpt
+++ b/ext/standard/tests/array/uasort_object2.phpt
@@ -122,73 +122,6 @@ echo "Done"
 *** Testing uasort() : object functionality ***
 -- Testing uasort() with StaticClass objects --
 bool(true)
-array(4) {
-  [3]=>
-  object(StaticClass)#%d (0) {
-  }
-  [2]=>
-  object(StaticClass)#%d (0) {
-  }
-  [1]=>
-  object(StaticClass)#%d (0) {
-  }
-  [0]=>
-  object(StaticClass)#%d (0) {
-  }
-}
--- Testing uasort() with EmptyClass objects --
-bool(true)
-array(4) {
-  [3]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [2]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [1]=>
-  object(EmptyClass)#%d (0) {
-  }
-  [0]=>
-  object(EmptyClass)#%d (0) {
-  }
-}
--- Testing uasort() with ChildClass objects --
-bool(true)
-array(4) {
-  [2]=>
-  object(ChildClass)#%d (2) {
-    ["child_value"]=>
-    int(15)
-    ["pub_value"]=>
-    NULL
-  }
-  [0]=>
-  object(ChildClass)#%d (2) {
-    ["child_value"]=>
-    int(20)
-    ["pub_value"]=>
-    NULL
-  }
-  [1]=>
-  object(ChildClass)#%d (2) {
-    ["child_value"]=>
-    int(500)
-    ["pub_value"]=>
-    NULL
-  }
-  [3]=>
-  object(ChildClass)#%d (2) {
-    ["child_value"]=>
-    int(700)
-    ["pub_value"]=>
-    NULL
-  }
-}
-Done
---UEXPECTF--
-*** Testing uasort() : object functionality ***
--- Testing uasort() with StaticClass objects --
-bool(true)
 array(4) {
   [3]=>
   object(StaticClass)#4 (0) {

diff --git a/ext/standard/tests/array/uasort_variation1.phpt b/ext/standard/tests/array/uasort_variation1.phpt
index f2a6ea9d71006b0620f2b34fe8257b346b02deff..e0fa2eeccdcaa87c8ec6faef10fdf12796f63e07 100644 (file)
--- a/ext/standard/tests/array/uasort_variation1.phpt
+++ b/ext/standard/tests/array/uasort_variation1.phpt
@@ -159,97 +159,6 @@ Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %
 NULL
 -- Iteration 16 --
 
-Warning: uasort() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: uasort() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: uasort() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: uasort() expects parameter 1 to be array, string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: uasort() expects parameter 1 to be array, resource given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: uasort() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: uasort() expects parameter 1 to be array, null given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing uasort() : unexpected values for 'array_arg' ***
--- Iteration 1 --
-
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: uasort() expects parameter 1 to be array, integer given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: uasort() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: uasort() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: uasort() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: uasort() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: uasort() expects parameter 1 to be array, double given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: uasort() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: uasort() expects parameter 1 to be array, null given in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: uasort() expects parameter 1 to be array, boolean given in %s on line %d
-NULL
--- Iteration 16 --
-
 Warning: uasort() expects parameter 1 to be array, Unicode string given in %s on line %d
 NULL
 -- Iteration 17 --

diff --git a/ext/standard/tests/array/uasort_variation10.phpt b/ext/standard/tests/array/uasort_variation10.phpt
index 0c6bebac63e3a208258401c7a40a40bb4103129b..033b257c90cbe633f0ba2cea7a9166acb8db0000 100644 (file)
--- a/ext/standard/tests/array/uasort_variation10.phpt
+++ b/ext/standard/tests/array/uasort_variation10.phpt
@@ -55,24 +55,7 @@ var_dump($array_arg);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : 'array_arg' with elements as reference ***
--- Sorting 'array_arg' containing different references --
-bool(true)
-array(5) {
-  [1]=>
-  &int(-5)
-  [4]=>
-  &int(0)
-  [0]=>
-  int(10)
-  [2]=>
-  &int(100)
-  [3]=>
-  int(200)
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : 'array_arg' with elements as reference ***
 -- Sorting 'array_arg' containing different references --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_variation11.phpt b/ext/standard/tests/array/uasort_variation11.phpt
index 1fbe5b8eb7fc5112543f376d2c0bf9fbafc5a4b1..fa7946c927cd44b390fa06f833930ee79319e26c 100644 (file)
--- a/ext/standard/tests/array/uasort_variation11.phpt
+++ b/ext/standard/tests/array/uasort_variation11.phpt
@@ -47,40 +47,7 @@ var_dump($array_arg);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : Sorting different associative arrays ***
--- Array with duplicate keys --
-bool(true)
-array(7) {
-  [0]=>
-  int(1)
-  [5]=>
-  int(2)
-  ["z"]=>
-  int(3)
-  [3]=>
-  int(3)
-  ["o"]=>
-  int(6)
-  ["a"]=>
-  int(8)
-  ["d"]=>
-  int(9)
-}
--- Array with default/assigned keys --
-bool(true)
-array(4) {
-  [2]=>
-  string(5) "Apple"
-  [0]=>
-  string(6) "Banana"
-  [1]=>
-  string(5) "Mango"
-  [3]=>
-  string(9) "Pineapple"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : Sorting different associative arrays ***
 -- Array with duplicate keys --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_variation2.phpt b/ext/standard/tests/array/uasort_variation2.phpt
index 97cf8144d82ff006b7d79568e082af885b7adecc..6e1b89e251fc802d5bbcccb227430fd09787ee9e 100644 (file)
--- a/ext/standard/tests/array/uasort_variation2.phpt
+++ b/ext/standard/tests/array/uasort_variation2.phpt
@@ -211,118 +211,3 @@ NULL
 Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
 NULL
 Done
---UEXPECTF--
-*** Testing uasort() : Unexpected values in place of comparison function ***
--- Iteration 1 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 2 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 3 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 4 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 5 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 6 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 7 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 8 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 9 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 10 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 11 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 12 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, array must have exactly two members in %s on line %d
-NULL
--- Iteration 13 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 14 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, first array member is not a valid class name or object in %s on line %d
-NULL
--- Iteration 15 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 16 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 17 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 18 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 19 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 20 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 21 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 22 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function '' not found or invalid function name in %s on line %d
-NULL
--- Iteration 23 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
-NULL
--- Iteration 24 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function 'string' not found or invalid function name in %s on line %d
-NULL
--- Iteration 25 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 26 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 27 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
--- Iteration 28 --
-
-Warning: uasort() expects parameter 2 to be a valid callback, no array or string given in %s on line %d
-NULL
-Done

diff --git a/ext/standard/tests/array/uasort_variation3.phpt b/ext/standard/tests/array/uasort_variation3.phpt
index 93724fb0dfd670276664411644013384542bd4bd..bf27cfa4a6fa0c2f01dc13e243b83c624a4fcfd4 100644 (file)
Binary files a/ext/standard/tests/array/uasort_variation3.phpt and b/ext/standard/tests/array/uasort_variation3.phpt differ

diff --git a/ext/standard/tests/array/uasort_variation4.phpt b/ext/standard/tests/array/uasort_variation4.phpt
index 93f53b25a6249b39b83e6926734ed3d9daa63b44..bb0e1013ee72e1117d39b58ec5c2e31daacfbe02 100644 (file)
--- a/ext/standard/tests/array/uasort_variation4.phpt
+++ b/ext/standard/tests/array/uasort_variation4.phpt
@@ -67,88 +67,7 @@ var_dump($empty_array);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : different numeric arrays as 'array_arg' ***
--- Sorting Integer array --
-bool(true)
-array(9) {
-  [9]=>
-  int(-1200)
-  [8]=>
-  int(-3)
-  [7]=>
-  int(0)
-  [1]=>
-  int(2)
-  [0]=>
-  int(3)
-  [5]=>
-  int(25)
-  [3]=>
-  int(100)
-  [4]=>
-  int(150)
-  [6]=>
-  int(350)
-}
--- Sorting Octal array --
-bool(true)
-array(7) {
-  [4]=>
-  int(-37)
-  [6]=>
-  int(-7)
-  [2]=>
-  int(0)
-  [5]=>
-  int(1)
-  [3]=>
-  int(13)
-  [1]=>
-  int(19)
-  [0]=>
-  int(46)
-}
--- Sorting Hex array --
-bool(true)
-array(6) {
-  [5]=>
-  int(-242)
-  [3]=>
-  int(-207)
-  [2]=>
-  int(16)
-  [4]=>
-  int(18)
-  [1]=>
-  int(43)
-  [0]=>
-  int(174)
-}
--- Sorting Float array --
-bool(true)
-array(7) {
-  [2]=>
-  float(-3.4)
-  [6]=>
-  float(-0.0934)
-  [3]=>
-  int(0)
-  [4]=>
-  float(0.5)
-  [1]=>
-  float(2.4)
-  [0]=>
-  float(10.2)
-  [5]=>
-  float(7300)
-}
--- Sorting empty array --
-bool(true)
-array(0) {
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : different numeric arrays as 'array_arg' ***
 -- Sorting Integer array --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_variation5.phpt b/ext/standard/tests/array/uasort_variation5.phpt
index ed5e0c40f964165990429904647297cf2a63fce2..df9fb26d17fc3e1b501d981820a5cfa5f7c42eb6 100644 (file)
--- a/ext/standard/tests/array/uasort_variation5.phpt
+++ b/ext/standard/tests/array/uasort_variation5.phpt
@@ -79,71 +79,7 @@ var_dump($heredoc_values);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : different string arrays as 'array_arg' ***
--- Sorting Single Quoted String values --
-bool(true)
-array(10) {
-  [5]=>
-  string(0) ""
-  [0]=>
-  string(1) " "
-  [9]=>
-  string(1) "'"
-  [7]=>
-  string(1) "0"
-  [8]=>
-  string(8) "123Hello"
-  [10]=>
-  string(4) "@#$%"
-  [4]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "Hello"
-  [6]=>
-  string(2) "\t"
-  [1]=>
-  string(4) "test"
-}
--- Sorting Double Quoted String values --
-bool(true)
-array(10) {
-  [5]=>
-  string(0) ""
-  [6]=>
-  string(1) "  "
-  [0]=>
-  string(1) " "
-  [9]=>
-  string(1) """
-  [7]=>
-  string(1) "0"
-  [8]=>
-  string(8) "123Hello"
-  [10]=>
-  string(4) "@#$%"
-  [4]=>
-  string(5) "HELLO"
-  [3]=>
-  string(5) "Hello"
-  [1]=>
-  string(4) "test"
-}
--- Sorting Heredoc String values --
-bool(true)
-array(4) {
-  [0]=>
-  string(0) ""
-  [2]=>
-  string(7) "HEREDOC"
-  [1]=>
-  string(7) "Heredoc"
-  [3]=>
-  string(43) "heredoc string   with!@# and 123
-Test this!!!"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : different string arrays as 'array_arg' ***
 -- Sorting Single Quoted String values --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_variation6.phpt b/ext/standard/tests/array/uasort_variation6.phpt
index 22b8179c5667b4983a813fc53b4597af1d9388d6..edd5da08c584dd32f7fd923ea2bcd7ca8865a4a8 100644 (file)
--- a/ext/standard/tests/array/uasort_variation6.phpt
+++ b/ext/standard/tests/array/uasort_variation6.phpt
@@ -51,71 +51,7 @@ var_dump($temp_array);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : Array with different subarrays ***
-bool(true)
-array(8) {
-  [2]=>
-  array(0) {
-  }
-  [4]=>
-  array(1) {
-    [0]=>
-    int(-1)
-  }
-  [6]=>
-  array(1) {
-    [0]=>
-    string(0) ""
-  }
-  [3]=>
-  array(1) {
-    [0]=>
-    int(0)
-  }
-  [1]=>
-  array(1) {
-    [0]=>
-    int(100)
-  }
-  [0]=>
-  array(3) {
-    [0]=>
-    int(2)
-    [1]=>
-    int(10)
-    [2]=>
-    int(-1)
-  }
-  [5]=>
-  array(5) {
-    [0]=>
-    int(-9)
-    [1]=>
-    int(34)
-    [2]=>
-    int(54)
-    [3]=>
-    int(0)
-    [4]=>
-    int(20)
-  }
-  [7]=>
-  array(5) {
-    [0]=>
-    string(5) "apple"
-    [1]=>
-    string(5) "Apple"
-    [2]=>
-    string(5) "APPLE"
-    [3]=>
-    string(5) "aPPle"
-    [4]=>
-    string(5) "aPpLe"
-  }
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : Array with different subarrays ***
 bool(true)
 array(8) {

diff --git a/ext/standard/tests/array/uasort_variation7.phpt b/ext/standard/tests/array/uasort_variation7.phpt
index f4a46603372834e05303eb41297131a7b1db3635..fa20197ea363b876b2b07d9d6d99f543a75e45e2 100644 (file)
--- a/ext/standard/tests/array/uasort_variation7.phpt
+++ b/ext/standard/tests/array/uasort_variation7.phpt
@@ -30,36 +30,7 @@ var_dump($array_arg);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : anonymous function as 'cmp_function' ***
--- Anonymous 'cmp_function' with parameters passed by value --
-bool(true)
-array(5) {
-  [2]=>
-  int(-70)
-  [1]=>
-  int(3)
-  [3]=>
-  int(24)
-  [4]=>
-  int(90)
-  [0]=>
-  int(100)
-}
--- Anonymous 'cmp_function' with parameters passed by reference --
-bool(true)
-array(4) {
-  ["a"]=>
-  string(5) "Apple"
-  ["b"]=>
-  string(6) "Banana"
-  ["m"]=>
-  string(5) "Mango"
-  ["p"]=>
-  string(9) "Pineapple"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : anonymous function as 'cmp_function' ***
 -- Anonymous 'cmp_function' with parameters passed by value --
 bool(true)

diff --git a/ext/standard/tests/array/uasort_variation8.phpt b/ext/standard/tests/array/uasort_variation8.phpt
index bca6855fe0ada288c99a6a35aca33444ebf42354..a5323282f5f76ff7d1b8ff71b3e8c155d3ee9f58 100644 (file)
--- a/ext/standard/tests/array/uasort_variation8.phpt
+++ b/ext/standard/tests/array/uasort_variation8.phpt
@@ -41,45 +41,6 @@ echo "Done"
 *** Testing uasort() : built in function as 'cmp_function' ***
 -- Testing uasort() with built-in 'cmp_function': strcasecmp() --
 bool(true)
-array(5) {
-  ["a"]=>
-  string(5) "apple"
-  ["b"]=>
-  string(6) "Banana"
-  ["m"]=>
-  string(5) "Mango"
-  ["o"]=>
-  string(6) "orange"
-  ["p"]=>
-  string(9) "Pineapple"
-}
--- Testing uasort() with built-in 'cmp_function': strcmp() --
-bool(true)
-array(5) {
-  ["b"]=>
-  string(6) "Banana"
-  ["m"]=>
-  string(5) "Mango"
-  ["p"]=>
-  string(9) "Pineapple"
-  ["a"]=>
-  string(5) "apple"
-  ["o"]=>
-  string(6) "orange"
-}
--- Testing uasort() with language construct as 'cmp_function' --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function 'echo' not found or invalid function name in %s on line %d
-NULL
--- Testing uasort() with language construct as 'cmp_function' --
-
-Warning: uasort() expects parameter 2 to be a valid callback, function 'exit' not found or invalid function name in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing uasort() : built in function as 'cmp_function' ***
--- Testing uasort() with built-in 'cmp_function': strcasecmp() --
-bool(true)
 array(5) {
   [u"a"]=>
   unicode(5) "apple"

diff --git a/ext/standard/tests/array/uasort_variation9.phpt b/ext/standard/tests/array/uasort_variation9.phpt
index 70e518365f47905fce153702b57f879d1e4860b3..0231f1b5fd922b9afff833abc0d342ef70bb1254 100644 (file)
--- a/ext/standard/tests/array/uasort_variation9.phpt
+++ b/ext/standard/tests/array/uasort_variation9.phpt
@@ -47,40 +47,7 @@ var_dump($string_values);
 
 echo "Done"
 ?>
---EXPECTF--
-*** Testing uasort() : 'cmp_function' with reference arguments ***
--- Passing integer values to 'cmp_function' --
-bool(true)
-array(7) {
-  [0]=>
-  int(1)
-  [4]=>
-  int(2)
-  [3]=>
-  int(3)
-  [5]=>
-  int(6)
-  [6]=>
-  int(7)
-  [1]=>
-  int(8)
-  [2]=>
-  int(9)
-}
--- Passing string values to 'cmp_function' --
-bool(true)
-array(4) {
-  [1]=>
-  string(5) "Apple"
-  [3]=>
-  string(6) "Banana"
-  [0]=>
-  string(5) "Mango"
-  [2]=>
-  string(6) "Orange"
-}
-Done
---UEXPECTF--
+--EXPECT--
 *** Testing uasort() : 'cmp_function' with reference arguments ***
 -- Passing integer values to 'cmp_function' --
 bool(true)