6 files changed, 834 insertions, 6 deletions
diff --git a/ext/standard/tests/file/bug38450.phpt b/ext/standard/tests/file/bug38450.phpt
index 9a269f7cfa..cddf8e94d4 100644
--- a/ext/standard/tests/file/bug38450.phpt
+++ b/ext/standard/tests/file/bug38450.phpt
@@ -118,7 +118,7 @@ unicode(12) "constructor!"
 line1
 line2
 line3
-string(18) "line1
+unicode(18) "line1
 line2
 line3
 "
diff --git a/ext/standard/tests/file/bug38450_1.phpt b/ext/standard/tests/file/bug38450_1.phpt
index 803cb30970..c34096c49d 100644
--- a/ext/standard/tests/file/bug38450_1.phpt
+++ b/ext/standard/tests/file/bug38450_1.phpt
@@ -118,7 +118,7 @@ unicode(12) "constructor!"
 line1
 line2
 line3
-string(18) "line1
+unicode(18) "line1
 line2
 line3
 "
diff --git a/ext/standard/tests/file/filetype_variation.phpt b/ext/standard/tests/file/filetype_variation.phpt
index 5023c653a3..7555b53d3b 100644
--- a/ext/standard/tests/file/filetype_variation.phpt
+++ b/ext/standard/tests/file/filetype_variation.phpt
@@ -5,6 +5,10 @@ Test filetype() function: Variations
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip no fnmatch() on Windows');
 }
+if (!function_exists("posix_mkfifo")) {
+	die("skip no posix_mkfifo()");
+}
+?>
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
index e7eb3e7631..964ae67e3f 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_o.phpt
@@ -837,3 +837,727 @@ object(object_class)#%d (7) refcount(1){
   }
 }
 Done
+--UEXPECTF--
+*** Testing debug_zval_dump() on objects ***
+-- Iteration 1 --
+object(object_class)#%d (6) refcount(4){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(5)
+  [u"value3":protected]=>
+  long(20) refcount(5)
+  [u"value4"]=>
+  long(30) refcount(6)
+  [u"array_var"]=>
+  array(2) refcount(5){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (6) refcount(4){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 2 --
+object(no_member_class)#%d (0) refcount(3){
+}
+-- Iteration 3 --
+object(contains_object_class)#%d (9) refcount(3){
+  [u"p"]=>
+  long(30) refcount(2)
+  [u"p1":protected]=>
+  long(40) refcount(2)
+  [u"p2":u"contains_object_class":private]=>
+  long(50) refcount(2)
+  [u"class_object1"]=>
+  object(object_class)#%d (6) refcount(5){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+    }
+  }
+  [u"class_object2"]=>
+  object(object_class)#%d (6) refcount(5){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+    }
+  }
+  [u"class_object3":u"contains_object_class":private]=>
+  object(object_class)#%d (6) refcount(5){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+    }
+  }
+  [u"class_object4":protected]=>
+  object(object_class)#%d (6) refcount(5){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+    }
+  }
+  [u"no_member_class_object"]=>
+  object(no_member_class)#%d (0) refcount(2){
+  }
+  [u"class_object5"]=>
+  object(contains_object_class)#%d (9) refcount(1){
+    [u"p"]=>
+    long(30) refcount(2)
+    [u"p1":protected]=>
+    long(40) refcount(2)
+    [u"p2":u"contains_object_class":private]=>
+    long(50) refcount(2)
+    [u"class_object1"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      object(object_class)#%d (6) refcount(5){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(5)
+        [u"value3":protected]=>
+        long(20) refcount(5)
+        [u"value4"]=>
+        long(30) refcount(6)
+        [u"array_var"]=>
+        array(2) refcount(5){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+      }
+    }
+    [u"class_object2"]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      object(object_class)#%d (6) refcount(5){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(5)
+        [u"value3":protected]=>
+        long(20) refcount(5)
+        [u"value4"]=>
+        long(30) refcount(6)
+        [u"array_var"]=>
+        array(2) refcount(5){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+      }
+    }
+    [u"class_object3":u"contains_object_class":private]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      object(object_class)#%d (6) refcount(5){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(5)
+        [u"value3":protected]=>
+        long(20) refcount(5)
+        [u"value4"]=>
+        long(30) refcount(6)
+        [u"array_var"]=>
+        array(2) refcount(5){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+      }
+    }
+    [u"class_object4":protected]=>
+    object(object_class)#%d (6) refcount(5){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(5)
+      [u"value3":protected]=>
+      long(20) refcount(5)
+      [u"value4"]=>
+      long(30) refcount(6)
+      [u"array_var"]=>
+      array(2) refcount(5){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      object(object_class)#%d (6) refcount(5){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(5)
+        [u"value3":protected]=>
+        long(20) refcount(5)
+        [u"value4"]=>
+        long(30) refcount(6)
+        [u"array_var"]=>
+        array(2) refcount(5){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+      }
+    }
+    [u"no_member_class_object"]=>
+    object(no_member_class)#%d (0) refcount(2){
+    }
+    [u"class_object5"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 4 --
+object(object_class)#%d (6) refcount(7){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(5)
+  [u"value3":protected]=>
+  long(20) refcount(5)
+  [u"value4"]=>
+  long(30) refcount(6)
+  [u"array_var"]=>
+  array(2) refcount(5){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (6) refcount(7){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 5 --
+object(object_class)#%d (6) refcount(7){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(5)
+  [u"value3":protected]=>
+  long(20) refcount(5)
+  [u"value4"]=>
+  long(30) refcount(6)
+  [u"array_var"]=>
+  array(2) refcount(5){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (6) refcount(7){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 6 --
+object(no_member_class)#%d (0) refcount(4){
+}
+-- Iteration 7 --
+NULL refcount(1)
+-- Iteration 8 --
+object(object_class)#%d (6) refcount(7){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(5)
+  [u"value3":protected]=>
+  long(20) refcount(5)
+  [u"value4"]=>
+  long(30) refcount(6)
+  [u"array_var"]=>
+  array(2) refcount(5){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (6) refcount(7){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 9 --
+object(object_class)#%d (6) refcount(7){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(5)
+  [u"value3":protected]=>
+  long(20) refcount(5)
+  [u"value4"]=>
+  long(30) refcount(6)
+  [u"array_var"]=>
+  array(2) refcount(5){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (6) refcount(7){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(5)
+    [u"value3":protected]=>
+    long(20) refcount(5)
+    [u"value4"]=>
+    long(30) refcount(6)
+    [u"array_var"]=>
+    array(2) refcount(5){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+  }
+}
+-- Iteration 10 --
+long(30) refcount(8)
+-- Iteration 11 --
+NULL refcount(1)
+
+-- Testing debug_zval_dump() on overwritten object variables --
+long(500) refcount(1)
+long(500) refcount(1)
+long(500) refcount(1)
+long(500) refcount(1)
+
+-- Testing debug_zval_dump() on objects having circular reference --
+object(object_class)#%d (7) refcount(1){
+  [u"value1"]=>
+  long(5) refcount(1)
+  [u"value2":u"object_class":private]=>
+  long(10) refcount(7)
+  [u"value3":protected]=>
+  long(20) refcount(7)
+  [u"value4"]=>
+  long(30) refcount(8)
+  [u"array_var"]=>
+  array(2) refcount(7){
+    [u"key1" { 006b 0065 0079 0031 }]=>
+    long(1) refcount(1)
+    [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+    long(3) refcount(1)
+  }
+  [u"object_class1"]=>
+  object(object_class)#%d (7) refcount(1){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(7)
+    [u"value3":protected]=>
+    long(20) refcount(7)
+    [u"value4"]=>
+    long(30) refcount(8)
+    [u"array_var"]=>
+    array(2) refcount(7){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    *RECURSION*
+    [u"obj"]=>
+    &object(object_class)#%d (7) refcount(2){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(7)
+      [u"value3":protected]=>
+      long(20) refcount(7)
+      [u"value4"]=>
+      long(30) refcount(8)
+      [u"array_var"]=>
+      array(2) refcount(7){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      object(object_class)#%d (7) refcount(1){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(7)
+        [u"value3":protected]=>
+        long(20) refcount(7)
+        [u"value4"]=>
+        long(30) refcount(8)
+        [u"array_var"]=>
+        array(2) refcount(7){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+        [u"obj"]=>
+        *RECURSION*
+      }
+      [u"obj"]=>
+      *RECURSION*
+    }
+  }
+  [u"obj"]=>
+  &object(object_class)#%d (7) refcount(2){
+    [u"value1"]=>
+    long(5) refcount(1)
+    [u"value2":u"object_class":private]=>
+    long(10) refcount(7)
+    [u"value3":protected]=>
+    long(20) refcount(7)
+    [u"value4"]=>
+    long(30) refcount(8)
+    [u"array_var"]=>
+    array(2) refcount(7){
+      [u"key1" { 006b 0065 0079 0031 }]=>
+      long(1) refcount(1)
+      [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+      long(3) refcount(1)
+    }
+    [u"object_class1"]=>
+    object(object_class)#%d (7) refcount(1){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(7)
+      [u"value3":protected]=>
+      long(20) refcount(7)
+      [u"value4"]=>
+      long(30) refcount(8)
+      [u"array_var"]=>
+      array(2) refcount(7){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+      [u"obj"]=>
+      &object(object_class)#%d (7) refcount(2){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(7)
+        [u"value3":protected]=>
+        long(20) refcount(7)
+        [u"value4"]=>
+        long(30) refcount(8)
+        [u"array_var"]=>
+        array(2) refcount(7){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+        [u"obj"]=>
+        *RECURSION*
+      }
+    }
+    [u"obj"]=>
+    &object(object_class)#%d (7) refcount(2){
+      [u"value1"]=>
+      long(5) refcount(1)
+      [u"value2":u"object_class":private]=>
+      long(10) refcount(7)
+      [u"value3":protected]=>
+      long(20) refcount(7)
+      [u"value4"]=>
+      long(30) refcount(8)
+      [u"array_var"]=>
+      array(2) refcount(7){
+        [u"key1" { 006b 0065 0079 0031 }]=>
+        long(1) refcount(1)
+        [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+        long(3) refcount(1)
+      }
+      [u"object_class1"]=>
+      *RECURSION*
+      [u"obj"]=>
+      &object(object_class)#%d (7) refcount(2){
+        [u"value1"]=>
+        long(5) refcount(1)
+        [u"value2":u"object_class":private]=>
+        long(10) refcount(7)
+        [u"value3":protected]=>
+        long(20) refcount(7)
+        [u"value4"]=>
+        long(30) refcount(8)
+        [u"array_var"]=>
+        array(2) refcount(7){
+          [u"key1" { 006b 0065 0079 0031 }]=>
+          long(1) refcount(1)
+          [u"key2 " { 006b 0065 0079 0032 0020 }]=>
+          long(3) refcount(1)
+        }
+        [u"object_class1"]=>
+        *RECURSION*
+        [u"obj"]=>
+        *RECURSION*
+      }
+    }
+  }
+}
+Done
diff --git a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
index 6fa1b00942..3a180f1a25 100644
--- a/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
+++ b/ext/standard/tests/general_functions/debug_zval_dump_v.phpt
@@ -214,3 +214,95 @@ string(9) "string123" refcount(3)
 string(10) "NULLstring" refcount(3)
 &string(10) "NULLstring" refcount(2)
 Done
+--UEXPECTF--
+Strict Standards: Call-time pass-by-reference has been deprecated in %s on line %d
+*** Testing debug_zval_dump() on functions ***
+--- Variation 1: global variable inside a function ---
+
+-- Value of global variable, before calling dump_globalvar() --
+long(10) refcount(2)
+
+-- Value of local variable inside dump_globalvar() --
+long(10) refcount(1)
+
+-- Value of global variable inside dump_globalvar() --
+long(10) refcount(1)
+
+-- Value of global variable, after exiting dump_globalvar() --
+long(10) refcount(2)
+
+--- Variation 2: one variable references another ---
+
+-- Value of $first_var: --
+long(10) refcount(2)
+
+-- Value of $ref_first_var --
+NULL refcount(1)
+
+-- Value of $first_var --
+long(10) refcount(2)
+
+-- Value of $ref_first_var --
+
+Notice: Undefined variable: ref_first_var in %s on line %d
+NULL refcount(1)
+
+-- Value of $first_var --
+long(10) refcount(2)
+
+--- Variation 3: multiple references of variables ---
+
+-- Value of $var_1: (before referencing) --
+long(10) refcount(1)
+
+-- Value of $var_2: (referencing var_1) --
+long(10) refcount(1)
+
+-- Value of $var_3: (referencing var_2) --
+long(10) refcount(1)
+
+-- Value of $var_3: (after unsetting var_3) --
+
+Notice: Undefined variable: var_3 in %s on line %d
+NULL refcount(1)
+
+-- Value of $var_2: --
+long(10) refcount(1)
+
+-- Value of $var_3: --
+long(10) refcount(1)
+
+-- Value of $var_1: (after unsetting variable_1) --
+
+Notice: Undefined variable: var_1 in %s on line %d
+NULL refcount(1)
+
+-- Value of $var_2: --
+long(10) refcount(2)
+
+*** Testing debug_zval_dump() on miscelleneous input arguments ***
+-- Iteration 1 --
+NULL refcount(3)
+&NULL refcount(2)
+-- Iteration 2 --
+NULL refcount(3)
+&NULL refcount(2)
+-- Iteration 3 --
+NULL refcount(1)
+&NULL refcount(2)
+-- Iteration 4 --
+NULL refcount(1)
+&NULL refcount(2)
+-- Iteration 5 --
+unicode(7) "TRUE123" { 0054 0052 0055 0045 0031 0032 0033 } refcount(3)
+&unicode(7) "TRUE123" { 0054 0052 0055 0045 0031 0032 0033 } refcount(2)
+-- Iteration 6 --
+unicode(9) "123string" { 0031 0032 0033 0073 0074 0072 0069 006e 0067 } refcount(3)
+&unicode(9) "123string" { 0031 0032 0033 0073 0074 0072 0069 006e 0067 } refcount(2)
+-- Iteration 7 --
+unicode(9) "string123" { 0073 0074 0072 0069 006e 0067 0031 0032 0033 } refcount(3)
+&unicode(9) "string123" { 0073 0074 0072 0069 006e 0067 0031 0032 0033 } refcount(2)
+-- Iteration 8 --
+unicode(10) "NULLstring" { 004e 0055 004c 004c 0073 0074 0072 0069 006e 0067 } refcount(3)
+&unicode(10) "NULLstring" { 004e 0055 004c 004c 0073 0074 0072 0069 006e 0067 } refcount(2)
+Done
diff --git a/ext/standard/tests/general_functions/strval.phpt b/ext/standard/tests/general_functions/strval.phpt
index 6b76cd0e31..66204cf708 100644
--- a/ext/standard/tests/general_functions/strval.phpt
+++ b/ext/standard/tests/general_functions/strval.phpt
@@ -280,16 +280,24 @@ string(0) ""
 -- Iteration 1 --
 string(6) "Object"
 -- Iteration 2 --
-string(14) "Resource id #5"
+string(14) "Resource id #%d"
 -- Iteration 3 --
-string(14) "Resource id #6"
+string(14) "Resource id #%d"
 -- Iteration 4 --
+
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 -- Iteration 5 --
+
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 -- Iteration 6 --
+
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 -- Iteration 7 --
+
+Notice: Array to string conversion in %s on line %d
 string(5) "Array"
 -- Iteration 8 --
 string(0) ""
@@ -432,9 +440,9 @@ unicode(0) ""
 -- Iteration 1 --
 unicode(6) "Object"
 -- Iteration 2 --
-unicode(%d) "Resource id #%d"
+unicode(14) "Resource id #%d"
 -- Iteration 3 --
-unicode(%d) "Resource id #%d"
+unicode(14) "Resource id #%d"
 -- Iteration 4 --
 
 Notice: Array to string conversion in %s on line %d