Zend: reengineer how __debugInfo() magic method is handed

Zend/tests/debug_info/debug_info-error-0.0.phpt

@@ -17,4 +17,8 @@ $c = new C(0.0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-0.phpt

@@ -17,4 +17,8 @@ $c = new C(0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-1.0.phpt

@@ -17,4 +17,8 @@ $c = new C(1.0);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-1.phpt

@@ -17,4 +17,8 @@ $c = new C(1);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-debug_zval_dump-basic.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar (debug_zval_dump)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$c = new C(true);
+debug_zval_dump($c);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): debug_zval_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-debug_zval_dump-within-array.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an array (debug_zval_dump)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$a = [
+	'foo',
+	new C(true),
+	'bar',
+];
+debug_zval_dump($a);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): debug_zval_dump(Array)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-debug_zval_dump-within-object.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an object (debug_zval_dump)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$o = new stdClass();
+$o->foo = 'foo';
+$o->c = new C(true);
+$o->bar = 'bar';
+debug_zval_dump($o);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): debug_zval_dump(Object(stdClass))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-empty_str.phpt

@@ -17,4 +17,8 @@ $c = new C("");
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-false.phpt

@@ -17,4 +17,8 @@ $c = new C(false);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-object.phpt

@@ -17,4 +17,8 @@ $c = new C(new stdClass);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-print_r-basic.phpt

@@ -0,0 +1,25 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar (print_r)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$c = new C(true);
+print_r($c);
+
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): print_r(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-print_r-within-array.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an array (print_r)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$a = [
+	'foo',
+	new C(true),
+	'bar',
+];
+print_r($a);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): print_r(Array)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-print_r-within-object.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an object (print_r)
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$o = new stdClass();
+$o->foo = 'foo';
+$o->c = new C(true);
+$o->bar = 'bar';
+print_r($o);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): print_r(Object(stdClass))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-resource.phpt

@@ -19,4 +19,8 @@ $c = new C(fopen("data:text/plain,Foo", 'r'));
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-str.phpt

@@ -17,4 +17,8 @@ $c = new C("foo");
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-true.phpt

@@ -17,4 +17,8 @@ $c = new C(true);
 var_dump($c);
 ?>
 --EXPECTF--
-Fatal error: __debuginfo() must return an array in %s on line %d
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(C))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-within-array.phpt

@@ -0,0 +1,28 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an array
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$a = [
+	'foo',
+	new C(true),
+	'bar',
+];
+var_dump($a);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Array)
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-error-within-object.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Testing __debugInfo() magic method with bad returns scalar inside an object
+--FILE--
+<?php
+
+class C {
+  public $val;
+  public function __debugInfo() {
+    return $this->val;
+  }
+  public function __construct($val) {
+    $this->val = $val;
+  }
+}
+
+$o = new stdClass();
+$o->foo = 'foo';
+$o->c = new C(true);
+$o->bar = 'bar';
+var_dump($o);
+?>
+--EXPECTF--
+Fatal error: Uncaught TypeError: __debuginfo() must return an array in %s:%d
+Stack trace:
+#0 %s(%d): var_dump(Object(stdClass))
+#1 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-null-deprecation-promoted.phpt

@@ -0,0 +1,30 @@
+--TEST--
+Testing __debugInfo() magic method with deprecated return null
+--FILE--
+<?php
+
+set_error_handler(function($_, $m) {
+    throw new Exception($m);
+});
+
+class Bar {
+  public $val = 123;
+
+  public function __debugInfo() {
+    return null;
+  }
+}
+
+$b = new Bar;
+var_dump($b);
+?>
+--EXPECTF--
+object(Bar)#2 (0) {
+}
+
+Fatal error: Uncaught Exception: Returning null from Bar::__debugInfo() is deprecated, return an empty array instead in %s:%d
+Stack trace:
+#0 [internal function]: {closure:%s:%d}(8192, 'Returning null ...', '%s', %d)
+#1 %s(%d): var_dump(Object(Bar))
+#2 {main}
+  thrown in %s on line %d

Zend/tests/debug_info/debug_info-null.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Testing __debugInfo() magic method with deprecated return null
+--FILE--
+<?php
+
+class Bar {
+  public $val = 123;
+
+  public function __debugInfo() {
+    return null;
+  }
+}
+
+$b = new Bar;
+var_dump($b);
+?>
+--EXPECTF--
+Deprecated: Returning null from Bar::__debugInfo() is deprecated, return an empty array instead in %s on line %d
+object(Bar)#%d (0) {
+}