10 files changed, 42 insertions, 42 deletions
diff --git a/ext/snmp/tests/bug64124.phpt b/ext/snmp/tests/bug64124.phpt
index 454b06dcf1..8b29a38c59 100644
--- a/ext/snmp/tests/bug64124.phpt
+++ b/ext/snmp/tests/bug64124.phpt
@@ -32,9 +32,9 @@ var_dump(snmpget($checkvar, $community, '.1.3.6.1.2.1.1.1.0'));
 var_dump(($checkvar === $hostname6_port));
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 bool(true)
diff --git a/ext/snmp/tests/ipv6.phpt b/ext/snmp/tests/ipv6.phpt
index f5239e1178..aaa3304e87 100644
--- a/ext/snmp/tests/ipv6.phpt
+++ b/ext/snmp/tests/ipv6.phpt
@@ -23,7 +23,7 @@ var_dump(snmpget($hostname6_port, $community, '.1.3.6.1.2.1.1.1.0'));
 var_dump(snmpget('[dead:beef::', $community, '.1.3.6.1.2.1.1.1.0'));
 ?>
 --EXPECTF--
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 
 Warning: snmpget(): malformed IPv6 address, closing square bracket missing in %s on line %d
 bool(false)
 \ No newline at end of file
diff --git a/ext/snmp/tests/snmp2_get.phpt b/ext/snmp/tests/snmp2_get.phpt
index e50f9aff03..1463d94901 100644
--- a/ext/snmp/tests/snmp2_get.phpt
+++ b/ext/snmp/tests/snmp2_get.phpt
@@ -60,18 +60,18 @@ Warning: snmp2_get(): Got empty OID array in %s on line %d
 bool(false)
 Checking working
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
 More error handling
 Single OID
@@ -100,5 +100,5 @@ Multiple OID
 Warning: snmp2_get(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': No Such Instance currently exists at this OID in %s on line %d
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
diff --git a/ext/snmp/tests/snmp2_getnext.phpt b/ext/snmp/tests/snmp2_getnext.phpt
index 5c5abf428e..45701cbd13 100644
--- a/ext/snmp/tests/snmp2_getnext.phpt
+++ b/ext/snmp/tests/snmp2_getnext.phpt
@@ -24,16 +24,16 @@ var_dump(snmp2_getnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.
 ?>
 --EXPECTF--
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
diff --git a/ext/snmp/tests/snmp2_real_walk.phpt b/ext/snmp/tests/snmp2_real_walk.phpt
index e9159d6429..a255a763f2 100644
--- a/ext/snmp/tests/snmp2_real_walk.phpt
+++ b/ext/snmp/tests/snmp2_real_walk.phpt
@@ -59,12 +59,12 @@ Warning: snmp2_real_walk() expects parameter 5 to be integer, %s given in %s on
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
 Single OID in array
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
diff --git a/ext/snmp/tests/snmp2_walk.phpt b/ext/snmp/tests/snmp2_walk.phpt
index 1d2195688c..6d03693dac 100644
--- a/ext/snmp/tests/snmp2_walk.phpt
+++ b/ext/snmp/tests/snmp2_walk.phpt
@@ -67,16 +67,16 @@ Warning: snmp2_walk() expects parameter 5 to be integer, %s given in %s on line
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
-%unicode|string%(6) "string"
-%unicode|string%(6) "string"
+string(6) "string"
+string(6) "string"
 Single OID in array
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 Default OID
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 More error handling
 Single incorrect OID
 
diff --git a/ext/snmp/tests/snmpget.phpt b/ext/snmp/tests/snmpget.phpt
index 7bbb64ed0c..576bef14e0 100644
--- a/ext/snmp/tests/snmpget.phpt
+++ b/ext/snmp/tests/snmpget.phpt
@@ -58,22 +58,22 @@ Warning: snmpget() expects parameter 5 to be integer,%s given in %s on line %d
 bool(false)
 Checking working
 Single OID, default timeout and retries
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID, default retries
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
 More error handling
 Single OID
@@ -102,5 +102,5 @@ Multiple OID
 Warning: snmpget(): Error in packet at 'SNMPv2-MIB::sysUpTime.220': (noSuchName) There is no such variable name in this MIB. in %s on line %d
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
diff --git a/ext/snmp/tests/snmpgetnext.phpt b/ext/snmp/tests/snmpgetnext.phpt
index af92d56c7c..2c868bfcd1 100644
--- a/ext/snmp/tests/snmpgetnext.phpt
+++ b/ext/snmp/tests/snmpgetnext.phpt
@@ -24,16 +24,16 @@ var_dump(snmpgetnext($hostname, $community, array('.1.3.6.1.2.1.1.1.0', '.1.3.6.
 ?>
 --EXPECTF--
 Single OID
-%unicode|string%(%d) "%s"
+string(%d) "%s"
 Single OID in array
 array(1) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
 }
 Multiple OID
 array(2) {
   ["%s"]=>
-  %unicode|string%(%d) "%s"
+  string(%d) "%s"
   ["%s"]=>
-  %unicode|string%(%d) "%d"
+  string(%d) "%d"
 }
diff --git a/ext/snmp/tests/snmprealwalk.phpt b/ext/snmp/tests/snmprealwalk.phpt
index 97d56ef70b..e3827ab1c7 100644
--- a/ext/snmp/tests/snmprealwalk.phpt
+++ b/ext/snmp/tests/snmprealwalk.phpt
@@ -59,12 +59,12 @@ Warning: snmprealwalk() expects parameter 5 to be integer, %s given in %s on lin
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
 Single OID in array
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
 string(%d) "%s"
 string(%d) "%s"
diff --git a/ext/snmp/tests/snmpwalk.phpt b/ext/snmp/tests/snmpwalk.phpt
index d71a014dab..12544eebd6 100644
--- a/ext/snmp/tests/snmpwalk.phpt
+++ b/ext/snmp/tests/snmpwalk.phpt
@@ -67,16 +67,16 @@ Warning: snmpwalk() expects parameter 5 to be integer, %s given in %s on line %d
 bool(false)
 Checking working
 Single OID
-%unicode|string%(5) "array"
+string(5) "array"
 int(%d)
-%unicode|string%(6) "string"
-%unicode|string%(6) "string"
+string(6) "string"
+string(6) "string"
 Single OID in array
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 Default OID
-%unicode|string%(5) "array"
-%unicode|string%(6) "string"
+string(5) "array"
+string(6) "string"
 More error handling
 Single incorrect OID