Zend: applied fixers to improve test robustness (6/8)

Zend/tests/readonly_props/readonly_clone_error6.phpt

@@ -22,13 +22,13 @@ var_dump($foo);
 try {
     $foo->__clone();
 } catch (Error $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     $foo->__clone();
 } catch (Error $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump($foo);
@@ -39,8 +39,8 @@ object(Foo)#%d (%d) {
   ["bar"]=>
   int(0)
 }
-Cannot modify readonly property Foo::$bar
-Cannot modify readonly property Foo::$bar
+Error: Cannot modify readonly property Foo::$bar
+Error: Cannot modify readonly property Foo::$bar
 object(Foo)#%d (%d) {
   ["bar"]=>
   int(0)

Zend/tests/readonly_props/readonly_clone_error7.phpt

@@ -19,15 +19,15 @@ $foo = new Foo([]);
 try {
     var_dump(clone $foo);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(clone $foo);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Cannot indirectly modify readonly property Foo::$bar
-Cannot indirectly modify readonly property Foo::$bar
+Error: Cannot indirectly modify readonly property Foo::$bar
+Error: Cannot indirectly modify readonly property Foo::$bar

Zend/tests/readonly_props/readonly_clone_success4.phpt

@@ -13,7 +13,7 @@ class Foo {
         try {
             $this->bar = "foo";
         } catch (Error $e) {
-            echo $e->getMessage() . "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
 
         $this->bar = 2;
@@ -27,12 +27,12 @@ var_dump(clone $foo);
 
 ?>
 --EXPECTF--
-Cannot assign string to property Foo::$bar of type int
+TypeError: Cannot assign string to property Foo::$bar of type int
 object(Foo)#%d (%d) {
   ["bar"]=>
   int(2)
 }
-Cannot assign string to property Foo::$bar of type int
+TypeError: Cannot assign string to property Foo::$bar of type int
 object(Foo)#%d (%d) {
   ["bar"]=>
   int(2)

Zend/tests/readonly_props/readonly_coercion_type_error.phpt

@@ -11,7 +11,7 @@ class Foo {
         try {
             $this->bar = 42;
         } catch (Error $e) {
-            echo $e->getMessage(), "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
     }
 }
@@ -20,4 +20,4 @@ new Foo();
 
 ?>
 --EXPECTF--
-Cannot modify readonly property Foo::$bar
+Error: Cannot modify readonly property Foo::$bar

Zend/tests/readonly_props/readonly_containing_object.phpt

@@ -18,17 +18,17 @@ $test->prop->foo++;
 try {
     $test->prop += 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $test->prop++;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     --$test->prop;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($test->prop);
 
@@ -44,9 +44,9 @@ var_dump($test->prop);
 
 ?>
 --EXPECT--
-Unsupported operand types: stdClass + int
-Cannot modify readonly property Test::$prop
-Cannot modify readonly property Test::$prop
+TypeError: Unsupported operand types: stdClass + int
+Error: Cannot modify readonly property Test::$prop
+Error: Cannot modify readonly property Test::$prop
 object(stdClass)#2 (1) {
   ["foo"]=>
   int(3)

Zend/tests/readonly_props/readonly_modification.phpt

@@ -21,62 +21,62 @@ var_dump($test->prop); // Read.
 try {
     $test->prop = 2;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $test->prop += 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $test->prop++;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     ++$test->prop;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $ref =& $test->prop;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $test->prop =& $ref;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     byRef($test->prop);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump($test->prop2); // Read.
 try {
     $test->prop2[] = 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     $test->prop2[0][] = 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 int(1)
-Cannot modify readonly property Test::$prop
-Cannot modify readonly property Test::$prop
-Cannot modify readonly property Test::$prop
-Cannot modify readonly property Test::$prop
-Cannot indirectly modify readonly property Test::$prop
-Cannot indirectly modify readonly property Test::$prop
-Cannot indirectly modify readonly property Test::$prop
+Error: Cannot modify readonly property Test::$prop
+Error: Cannot modify readonly property Test::$prop
+Error: Cannot modify readonly property Test::$prop
+Error: Cannot modify readonly property Test::$prop
+Error: Cannot indirectly modify readonly property Test::$prop
+Error: Cannot indirectly modify readonly property Test::$prop
+Error: Cannot indirectly modify readonly property Test::$prop
 array(0) {
 }
-Cannot indirectly modify readonly property Test::$prop2
-Cannot indirectly modify readonly property Test::$prop2
+Error: Cannot indirectly modify readonly property Test::$prop2
+Error: Cannot indirectly modify readonly property Test::$prop2

Zend/tests/readonly_props/unset.phpt

@@ -15,7 +15,7 @@ $test = new Test(1);
 try {
     unset($test->prop);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 class Test2 {
@@ -40,7 +40,7 @@ var_dump($test->prop); // Don't call __get.
 try {
     unset($test->prop); // Unset initialized, illegal.
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 class Test3 {
@@ -51,7 +51,7 @@ $test = new Test3;
 try {
     unset($test->prop);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 class Test4 {
@@ -81,12 +81,12 @@ var_dump($test->prop); // Still don't call __get.
 
 ?>
 --EXPECT--
-Cannot unset readonly property Test::$prop
+Error: Cannot unset readonly property Test::$prop
 Test2::__get
 int(1)
 int(1)
-Cannot unset readonly property Test2::$prop
-Cannot unset protected(set) readonly property Test3::$prop from global scope
+Error: Cannot unset readonly property Test2::$prop
+Error: Cannot unset protected(set) readonly property Test3::$prop from global scope
 Error: Cannot unset readonly property Test4::$prop
 int(1)
 Error: Cannot unset readonly property Test4::$prop

Zend/tests/readonly_props/visibility_change.phpt

@@ -18,13 +18,13 @@ $a = new A();
 try {
     var_dump($a->prop);
 } catch (Error $error) {
-    echo $error->getMessage() . "\n";
+    echo $error::class, ': ', $error->getMessage(), "\n";
 }
 
 $b = new B();
 var_dump($b->prop);
 
 ?>
 --EXPECT--
-Cannot access protected property A::$prop
+Error: Cannot access protected property A::$prop
 int(42)

Zend/tests/recursive_array_comparison.phpt

@@ -6,16 +6,16 @@ $a = [&$a];
 try {
     $a === [[]];
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     [[]] === $a;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($a === $a);
 ?>
 --EXPECT--
-Nesting level too deep - recursive dependency?
-Nesting level too deep - recursive dependency?
+Error: Nesting level too deep - recursive dependency?
+Error: Nesting level too deep - recursive dependency?
 bool(true)

Zend/tests/recv_init_ref_type.phpt

@@ -10,9 +10,9 @@ try {
     $bar = 42;
     test($bar);
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
-test(): Argument #1 ($foo) must be of type array, int given, called in %s on line %d
+TypeError: test(): Argument #1 ($foo) must be of type array, int given, called in %s on line %d

Zend/tests/require_once_warning_to_exception.phpt

@@ -11,9 +11,9 @@ set_error_handler("exception_error_handler");
 try {
     $results = require_once 'does-not-exist.php';
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 };
 
 ?>
 --EXPECT--
-require_once(): Failed to open stream: No such file or directory
+Exception: require_once(): Failed to open stream: No such file or directory

Zend/tests/require_parse_exception.phpt

@@ -9,7 +9,7 @@ function test_parse_error($code) {
     try {
         require 'data://text/plain;base64,' . base64_encode($code);
     } catch (ParseError $e) {
-        echo $e->getMessage(), " on line ", $e->getLine(), "\n";
+        echo $e::class, ': ', $e->getMessage(), ' on line ', $e->getLine(), "\n";
     }
 }
 
@@ -43,9 +43,9 @@ var_dump("\u{ffffff}");');
 ?>
 --EXPECT--
 Deprecated: Directive 'allow_url_include' is deprecated in Unknown on line 0
-Unclosed '{' on line 2
-Unclosed '{' on line 3
-syntax error, unexpected end of file, expecting "(" on line 2
-Invalid numeric literal on line 2
-Invalid UTF-8 codepoint escape sequence on line 2
-Invalid UTF-8 codepoint escape sequence: Codepoint too large on line 2
+ParseError: Unclosed '{' on line 2
+ParseError: Unclosed '{' on line 3
+ParseError: syntax error, unexpected end of file, expecting "(" on line 2
+ParseError: Invalid numeric literal on line 2
+ParseError: Invalid UTF-8 codepoint escape sequence on line 2
+ParseError: Invalid UTF-8 codepoint escape sequence: Codepoint too large on line 2

Zend/tests/required_param_after_optional_named_args.phpt

@@ -8,10 +8,10 @@ function test($a = 1, $b) {
 try {
     test(b: 2);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
 Deprecated: test(): Optional parameter $a declared before required parameter $b is implicitly treated as a required parameter in %s on line %d
-test(): Argument #1 ($a) not passed
+ArgumentCountError: test(): Argument #1 ($a) not passed

Zend/tests/restrict_globals/invalid_pass_by_ref.phpt

@@ -7,17 +7,17 @@ function by_ref(&$ref) {}
 try {
     by_ref($GLOBALS);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     by_ref2($GLOBALS);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 function by_ref2(&$ref) {}
 
 ?>
 --EXPECT--
-by_ref(): Argument #1 ($ref) could not be passed by reference
-by_ref2(): Argument #1 ($ref) could not be passed by reference
+Error: by_ref(): Argument #1 ($ref) could not be passed by reference
+Error: by_ref2(): Argument #1 ($ref) could not be passed by reference

Zend/tests/return_types/028.phpt

@@ -12,9 +12,9 @@ function foo(): stdClass {
 try {
     foo();
 } catch (Error $e) {
-    echo $e->getMessage(), " in ", $e->getFile(), " on line ", $e->getLine();
+    echo $e::class, ': ', $e->getMessage(), ' in ', $e->getFile(), ' on line ', $e->getLine(), "\n";
 }
 
 ?>
 --EXPECTF--
-foo(): Return value must be of type stdClass, array returned in %s on line %d
+TypeError: foo(): Return value must be of type stdClass, array returned in %s on line %d

Zend/tests/return_types/bug70557.phpt

@@ -10,8 +10,8 @@ function getNumber() : int {
 try {
     getNumber();
 } catch (TypeError $e) {
-    var_dump($e->getMessage());
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-string(62) "getNumber(): Return value must be of type int, string returned"
+TypeError: getNumber(): Return value must be of type int, string returned

Zend/tests/return_types/never_disallowed5.phpt

@@ -14,8 +14,8 @@ class Foo {
 try {
     Foo::bar();
 } catch (TypeError $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Foo::bar(): never-returning method must not implicitly return
+TypeError: Foo::bar(): never-returning method must not implicitly return