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

Author: NickSdot

Zend/tests/function_arguments/variadic_argument_type_error.phpt

@@ -8,16 +8,16 @@ function foo($foo, int ...$bar) {}
 try {
     foo(1, []);
 } catch (TypeError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 try {
     foo(1, 1, 1, []);
 } catch (TypeError $exception) {
-    echo $exception->getMessage() . "\n";
+    echo $exception::class, ': ', $exception->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
-foo(): Argument #2 must be of type int, array given, called in %s on line %d
-foo(): Argument #4 must be of type int, array given, called in %s on line %d
+TypeError: foo(): Argument #2 must be of type int, array given, called in %s on line %d
+TypeError: foo(): Argument #4 must be of type int, array given, called in %s on line %d

Zend/tests/gc/bug54305.phpt

@@ -12,8 +12,8 @@ $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs');
 try {
     echo $methodWithArgs++;
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-Cannot increment ReflectionMethod
+TypeError: Cannot increment ReflectionMethod

Zend/tests/gc/bug80072.phpt

@@ -7,11 +7,11 @@ try {
     $s = 'O:8:"stdClass":1:{s:1:"x";r:1;}';
     unserialize($s) % gc_collect_cycles();
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 $a[]=&$a == $a=&$b > gc_collect_cycles();
 
 ?>
 --EXPECT--
-Unsupported operand types: stdClass % int
+TypeError: Unsupported operand types: stdClass % int

Zend/tests/generators/bug79927.phpt

@@ -12,7 +12,7 @@ $generator->next();
 try {
     $generator->rewind();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 echo $generator->current(), "\n";
 
@@ -26,6 +26,6 @@ echo $generator2->current(), "\n";
 
 ?>
 --EXPECT--
-Cannot rewind a generator that was already run
+Exception: Cannot rewind a generator that was already run
 3
 4

Zend/tests/generators/dynamic_properties.phpt

@@ -11,9 +11,9 @@ $gen = gen();
 try {
     $gen->prop = new stdClass;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Cannot create dynamic property Generator::$prop
+Error: Cannot create dynamic property Generator::$prop

Zend/tests/generators/errors/count_error.phpt

@@ -10,9 +10,9 @@ $gen = gen();
 try {
     count($gen);
 } catch (\TypeError $e) {
-    echo $e->getMessage(), PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-count(): Argument #1 ($value) must be of type Countable|array, Generator given
+TypeError: count(): Argument #1 ($value) must be of type Countable|array, Generator given

Zend/tests/generators/errors/resume_running_generator_error.phpt

@@ -8,7 +8,7 @@ function gen() {
     try {
         $gen->next();
     } catch (Error $e) {
-        echo "\nException: " . $e->getMessage() . "\n";
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
     $gen->next();
 }
@@ -19,7 +19,7 @@ $gen->next();
 
 ?>
 --EXPECTF--
-Exception: Cannot resume an already running generator
+Error: Cannot resume an already running generator
 
 Fatal error: Uncaught Error: Cannot resume an already running generator in %s:%d
 Stack trace:

Zend/tests/generators/errors/resume_running_generator_error_002.phpt

@@ -10,8 +10,8 @@ $gen = gen();
 try {
     $gen->send($gen);
 } catch (Throwable $e) {
-    echo $e->getMessage() . "\n";	
+    echo $e::class, ': ', $e->getMessage(), "\n";	
 }
 ?>
 --EXPECT--
-Cannot resume an already running generator
+Error: Cannot resume an already running generator

Zend/tests/generators/generator_throwing_during_function_call.phpt

@@ -20,13 +20,13 @@ var_dump($gen->current());
 try {
     $gen->next();
 } catch (Exception $e) {
-    echo 'Caught exception with message "', $e->getMessage(), '"', "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump($gen->current());
 
 ?>
 --EXPECT--
 string(3) "foo"
-Caught exception with message "test"
+Exception: test
 NULL

Zend/tests/generators/generator_throwing_exception.phpt

@@ -16,13 +16,13 @@ var_dump($gen->current());
 try {
     $gen->next();
 } catch (Exception $e) {
-    echo 'Caught exception with message "', $e->getMessage(), '"', "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump($gen->current());
 
 ?>
 --EXPECT--
 string(3) "foo"
-Caught exception with message "test"
+Exception: test
 NULL