Remove more PHP 6 leftovers from tests

18 files changed, 35 insertions, 35 deletions

diff --git a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
index ef13520237..ce754d398d 100644
--- a/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
+++ b/ext/spl/tests/DirectoryIterator_getBasename_pass_array.phpt
@@ -20,4 +20,4 @@ PHPNW Testfest 2009 - Adrian Hardy
    rmdir($targetDir);
 ?>
 --EXPECTF--
-Warning: DirectoryIterator::getBasename() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: DirectoryIterator::getBasename() expects parameter 1 to be string, array given in %s on line %d
diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
index 4dce4db8de..3e09df8487 100644
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
+++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_first.phpt
@@ -13,9 +13,9 @@ var_dump($list);
 ?>
 --EXPECTF--
 object(SplDoublyLinkedList)#1 (2) {
-  [%u|b%"flags":%u|b%"SplDoublyLinkedList":private]=>
+  ["flags":"SplDoublyLinkedList":private]=>
   int(0)
-  [%u|b%"dllist":%u|b%"SplDoublyLinkedList":private]=>
+  ["dllist":"SplDoublyLinkedList":private]=>
   array(2) {
     [0]=>
     %string|unicode%(3) "hai"
diff --git a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
index 0f5dac19f9..a3482b319b 100644
--- a/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
+++ b/ext/spl/tests/SplDoublylinkedlist_offsetunset_last.phpt
@@ -13,9 +13,9 @@ var_dump($list);
 ?>
 --EXPECTF--
 object(SplDoublyLinkedList)#1 (2) {
-  [%u|b%"flags":%u|b%"SplDoublyLinkedList":private]=>
+  ["flags":"SplDoublyLinkedList":private]=>
   int(0)
-  [%u|b%"dllist":%u|b%"SplDoublyLinkedList":private]=>
+  ["dllist":"SplDoublyLinkedList":private]=>
   array(2) {
     [0]=>
     %string|unicode%(2) "oh"
diff --git a/ext/spl/tests/SplFixedArray__construct_param_string.phpt b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
index d30fc691c6..744a9cf775 100644
--- a/ext/spl/tests/SplFixedArray__construct_param_string.phpt
+++ b/ext/spl/tests/SplFixedArray__construct_param_string.phpt
@@ -13,4 +13,4 @@ try {
 
 ?>
 --EXPECTF--
-Ok - SplFixedArray::__construct() expects parameter 1 to be integer, %unicode_string_optional% given
+Ok - SplFixedArray::__construct() expects parameter 1 to be integer, string given
diff --git a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
index ba81428aff..a0747451a0 100644
--- a/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
+++ b/ext/spl/tests/SplFixedArray_fromArray_invalid_parameter_002.phpt
@@ -7,4 +7,4 @@ PHPNW Testfest 2009 - Lorna Mitchell
 echo SplFixedArray::fromArray('hello');
 ?>
 --EXPECTF--
-Warning: SplFixedArray::fromArray() expects parameter 1 to be array, %unicode_string_optional% given in %s on line %d
+Warning: SplFixedArray::fromArray() expects parameter 1 to be array, string given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
index c3f73c4bd1..25d472c30f 100644
--- a/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_addAll_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::addAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
index 7e065952b8..9942ff3fd1 100644
--- a/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_contains_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::contains() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::contains() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::contains() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
index 0841dfc1c9..fa75a07368 100644
--- a/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_detach_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::detach() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::detach() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::detach() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
index 4b495a0c44..374d3d11fd 100644
--- a/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_offsetGet_invalid_parameter.phpt
@@ -31,7 +31,7 @@ NULL
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::offsetGet() expects parameter 1 to be object, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
index 8ffb0e6721..69d35a1a22 100644
--- a/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAllExcept_invalid_parameter.phpt
@@ -30,7 +30,7 @@ NULL
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAllExcept() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
index a0c48aac75..2a66f1eae8 100644
--- a/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
+++ b/ext/spl/tests/SplObjectStorage_removeAll_invalid_parameter.phpt
@@ -29,7 +29,7 @@ NULL
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, boolean given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, %unicode_string_optional% given in %s on line %d
+Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, string given in %s on line %d
 NULL
 
 Warning: SplObjectStorage::removeAll() expects parameter 1 to be SplObjectStorage, integer given in %s on line %d
diff --git a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
index dcf43e21f2..c8254e74c6 100644
--- a/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
+++ b/ext/spl/tests/SplObjectStorage_unserialize_invalid_parameter1.phpt
@@ -19,9 +19,9 @@ foreach($data_provider as $input) {
 
 ?>
 --EXPECTF--
-Warning: SplObjectStorage::unserialize() expects parameter 1 to be %binary_string_optional%, array given in %s on line %d
+Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, array given in %s on line %d
 NULL
 
-Warning: SplObjectStorage::unserialize() expects parameter 1 to be %binary_string_optional%, object given in %s on line %d
+Warning: SplObjectStorage::unserialize() expects parameter 1 to be string, object given in %s on line %d
 NULL
 
diff --git a/ext/spl/tests/bug45622.phpt b/ext/spl/tests/bug45622.phpt
index a8fe2c4641..c8d16804c0 100644
--- a/ext/spl/tests/bug45622.phpt
+++ b/ext/spl/tests/bug45622.phpt
@@ -33,11 +33,11 @@ var_dump($ao->p);
 
 --> Access the real property:
 bool(true)
-%unicode|string%(15) "object property"
+string(15) "object property"
 
 --> Remove the real property and access the array element:
 bool(true)
-%unicode|string%(13) "array element"
+string(13) "array element"
 
 --> Remove the array element and try access again:
 bool(false)
@@ -47,5 +47,5 @@ NULL
 
 --> Re-add the real property:
 bool(true)
-%unicode|string%(15) "object property"
+string(15) "object property"
 
diff --git a/ext/spl/tests/bug46051.phpt b/ext/spl/tests/bug46051.phpt
index 49a58247c0..e993951ffa 100644
--- a/ext/spl/tests/bug46051.phpt
+++ b/ext/spl/tests/bug46051.phpt
@@ -11,4 +11,4 @@ $x->openFile(NULL, NULL, NULL);
 
 var_dump($x->getPathName());
 --EXPECTF--
-%unicode|string%(%d) "%sbug46051.php"
+string(%d) "%sbug46051.php"
diff --git a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
index 32bc574433..bbd283f96c 100644
--- a/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
+++ b/ext/spl/tests/recursive_tree_iterator_setprefixpart.phpt
@@ -28,5 +28,5 @@ Warning: RecursiveTreeIterator::setPrefixPart() expects exactly 2 parameters, 1
 
 Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 1 to be integer, object given in %s on line %d
 
-Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be %binary_string_optional%, object given in %s on line %d
+Warning: RecursiveTreeIterator::setPrefixPart() expects parameter 2 to be string, object given in %s on line %d
 ===DONE===
diff --git a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
index a7b84c4bcc..b114a9022d 100644
--- a/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
+++ b/ext/spl/tests/recursiveiteratoriterator_getsubiterator_variation.phpt
@@ -18,7 +18,7 @@ var_dump(get_class($iterator->getSubIterator()));
 var_dump($iterator->getSubIterator()->getArrayCopy());
 ?>
 --EXPECTF--
-%unicode|string%(22) "RecursiveArrayIterator"
+string(22) "RecursiveArrayIterator"
 array(3) {
   [0]=>
   int(1)
@@ -32,7 +32,7 @@ array(3) {
     int(4)
   }
 }
-%unicode|string%(22) "RecursiveArrayIterator"
+string(22) "RecursiveArrayIterator"
 array(2) {
   [0]=>
   int(3)
diff --git a/ext/spl/tests/spl_heap_iteration_error.phpt b/ext/spl/tests/spl_heap_iteration_error.phpt
index 62e462f553..1202856c7b 100644
--- a/ext/spl/tests/spl_heap_iteration_error.phpt
+++ b/ext/spl/tests/spl_heap_iteration_error.phpt
@@ -31,23 +31,23 @@ var_dump($h);
 ?>
 --EXPECTF--
 object(ext_heap)#%d (4) {
-  [%u|b%"fail"]=>
+  ["fail"]=>
   bool(true)
-  [%u|b%"flags":%u|b%"SplHeap":private]=>
+  ["flags":"SplHeap":private]=>
   int(0)
-  [%u|b%"isCorrupted":%u|b%"SplHeap":private]=>
+  ["isCorrupted":"SplHeap":private]=>
   bool(true)
-  [%u|b%"heap":%u|b%"SplHeap":private]=>
+  ["heap":"SplHeap":private]=>
   array(2) {
     [0]=>
     array(1) {
       [0]=>
-      %unicode|string%(7) "foobar2"
+      string(7) "foobar2"
     }
     [1]=>
     array(1) {
       [0]=>
-      %unicode|string%(7) "foobar1"
+      string(7) "foobar1"
     }
   }
 }
diff --git a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
index 1262ec0d65..a34b5577d9 100644
--- a/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
+++ b/ext/spl/tests/spl_recursive_iterator_iterator_key_case.phpt
@@ -16,18 +16,18 @@ TestFest London May 2009
 ?>
 --EXPECTF--
 one=>1
-%unicode|string%(3) "one"
+string(3) "one"
 two=>2
-%unicode|string%(3) "two"
+string(3) "two"
 four=>4
-%unicode|string%(4) "four"
+string(4) "four"
 five=>5
-%unicode|string%(4) "five"
+string(4) "five"
 seven=>7
-%unicode|string%(5) "seven"
+string(5) "seven"
 eight=>8
-%unicode|string%(5) "eight"
+string(5) "eight"
 -100=>10
 int(-100)
 =>null
-%unicode|string%(0) ""
+string(0) ""