Remove more PHP 6 leftovers from tests

10 files changed, 105 insertions, 105 deletions

diff --git a/tests/basic/bug55500.phpt b/tests/basic/bug55500.phpt
index 97eeea2c8c..2f9e393348 100644
--- a/tests/basic/bug55500.phpt
+++ b/tests/basic/bug55500.phpt
@@ -35,29 +35,29 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file"]=>
+  ["file"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     array(1) {
       [0]=>
-      %unicode|string%(9) "file1.txt"
+      string(9) "file1.txt"
     }
-    [%u|b%"type"]=>
+    ["type"]=>
     array(1) {
       [0]=>
-      %unicode|string%(16) "text/plain-file1"
+      string(16) "text/plain-file1"
     }
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     array(1) {
       [0]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
     }
-    [%u|b%"error"]=>
+    ["error"]=>
     array(1) {
       [0]=>
       int(0)
     }
-    [%u|b%"size"]=>
+    ["size"]=>
     array(1) {
       [0]=>
       int(1)
diff --git a/tests/basic/rfc1867_anonymous_upload.phpt b/tests/basic/rfc1867_anonymous_upload.phpt
index 361bbbcca7..1612d554cf 100644
--- a/tests/basic/rfc1867_anonymous_upload.phpt
+++ b/tests/basic/rfc1867_anonymous_upload.phpt
@@ -26,28 +26,28 @@ var_dump($_POST);
 array(2) {
   [%d]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
   [%d]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file2"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
diff --git a/tests/basic/rfc1867_array_upload.phpt b/tests/basic/rfc1867_array_upload.phpt
index bbaa5c82ef..90ed0c36e0 100644
--- a/tests/basic/rfc1867_array_upload.phpt
+++ b/tests/basic/rfc1867_array_upload.phpt
@@ -29,36 +29,36 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file"]=>
+  ["file"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     array(3) {
       [0]=>
-      %unicode|string%(9) "file1.txt"
+      string(9) "file1.txt"
       [2]=>
-      %unicode|string%(9) "file2.txt"
+      string(9) "file2.txt"
       [3]=>
-      %unicode|string%(9) "file3.txt"
+      string(9) "file3.txt"
     }
-    [%u|b%"type"]=>
+    ["type"]=>
     array(3) {
       [0]=>
-      %unicode|string%(16) "text/plain-file1"
+      string(16) "text/plain-file1"
       [2]=>
-      %unicode|string%(16) "text/plain-file2"
+      string(16) "text/plain-file2"
       [3]=>
-      %unicode|string%(16) "text/plain-file3"
+      string(16) "text/plain-file3"
     }
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     array(3) {
       [0]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
       [2]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
       [3]=>
-      %unicode|string%(%d) "%s"
+      string(%d) "%s"
     }
-    [%u|b%"error"]=>
+    ["error"]=>
     array(3) {
       [0]=>
       int(0)
@@ -67,7 +67,7 @@ array(1) {
       [3]=>
       int(0)
     }
-    [%u|b%"size"]=>
+    ["size"]=>
     array(3) {
       [0]=>
       int(1)
diff --git a/tests/basic/rfc1867_boundary_1.phpt b/tests/basic/rfc1867_boundary_1.phpt
index e5321201a5..bea825e797 100644
--- a/tests/basic/rfc1867_boundary_1.phpt
+++ b/tests/basic/rfc1867_boundary_1.phpt
@@ -18,6 +18,6 @@ var_dump($_POST);
 array(0) {
 }
 array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
+  ["foobar"]=>
+  string(1) "1"
 }
diff --git a/tests/basic/rfc1867_boundary_2.phpt b/tests/basic/rfc1867_boundary_2.phpt
index 88f213fffa..b59fc6db98 100644
--- a/tests/basic/rfc1867_boundary_2.phpt
+++ b/tests/basic/rfc1867_boundary_2.phpt
@@ -18,6 +18,6 @@ var_dump($_POST);
 array(0) {
 }
 array(1) {
-  [%u|b%"foobar"]=>
-  %unicode|string%(1) "1"
+  ["foobar"]=>
+  string(1) "1"
 }
diff --git a/tests/basic/rfc1867_empty_upload.phpt b/tests/basic/rfc1867_empty_upload.phpt
index 039d994c50..bb6ccee896 100644
--- a/tests/basic/rfc1867_empty_upload.phpt
+++ b/tests/basic/rfc1867_empty_upload.phpt
@@ -39,49 +39,49 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(0) ""
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(4)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(1) {
-  [%u|b%"foo"]=>
-  %unicode|string%(0) ""
+  ["foo"]=>
+  string(0) ""
 }
 string(1) "1"
 string(1) "3"
diff --git a/tests/basic/rfc1867_file_upload_disabled.phpt b/tests/basic/rfc1867_file_upload_disabled.phpt
index aa4b5ee0f1..1e1a747372 100644
--- a/tests/basic/rfc1867_file_upload_disabled.phpt
+++ b/tests/basic/rfc1867_file_upload_disabled.phpt
@@ -27,8 +27,8 @@ var_dump($_POST);
 array(0) {
 }
 array(2) {
-  [%u|b%"foo"]=>
-  %unicode|string%(3) "bar"
-  [%u|b%"bar"]=>
-  %unicode|string%(3) "foo"
+  ["foo"]=>
+  string(3) "bar"
+  ["bar"]=>
+  string(3) "foo"
 }
diff --git a/tests/basic/rfc1867_max_file_size.phpt b/tests/basic/rfc1867_max_file_size.phpt
index 1b7b9aabee..61fd89f3d2 100644
--- a/tests/basic/rfc1867_max_file_size.phpt
+++ b/tests/basic/rfc1867_max_file_size.phpt
@@ -39,48 +39,48 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(2)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }
 array(1) {
-  [%u|b%"MAX_FILE_SIZE"]=>
+  ["MAX_FILE_SIZE"]=>
   %string|unicode%(1) "1"
 }
 string(1) "1"
diff --git a/tests/basic/rfc1867_missing_boundary_2.phpt b/tests/basic/rfc1867_missing_boundary_2.phpt
index 1c4581c6c3..9cc847f780 100644
--- a/tests/basic/rfc1867_missing_boundary_2.phpt
+++ b/tests/basic/rfc1867_missing_boundary_2.phpt
@@ -17,17 +17,17 @@ var_dump($_POST);
 ?>
 --EXPECTF--
 array(1) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(3)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
 }
diff --git a/tests/basic/rfc1867_post_max_filesize.phpt b/tests/basic/rfc1867_post_max_filesize.phpt
index da851c417c..89115d0703 100644
--- a/tests/basic/rfc1867_post_max_filesize.phpt
+++ b/tests/basic/rfc1867_post_max_filesize.phpt
@@ -35,43 +35,43 @@ if (is_uploaded_file($_FILES["file3"]["tmp_name"])) {
 ?>
 --EXPECTF--
 array(3) {
-  [%u|b%"file1"]=>
+  ["file1"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file1.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file1"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
-  [%u|b%"file2"]=>
+  ["file2"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file2.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(0) ""
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(0) ""
-    [%u|b%"error"]=>
+    ["error"]=>
     int(1)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(0)
   }
-  [%u|b%"file3"]=>
+  ["file3"]=>
   array(5) {
-    [%u|b%"name"]=>
+    ["name"]=>
     %string|unicode%(9) "file3.txt"
-    [%u|b%"type"]=>
+    ["type"]=>
     %string|unicode%(16) "text/plain-file3"
-    [%u|b%"tmp_name"]=>
+    ["tmp_name"]=>
     %string|unicode%(%d) "%s"
-    [%u|b%"error"]=>
+    ["error"]=>
     int(0)
-    [%u|b%"size"]=>
+    ["size"]=>
     int(1)
   }
 }