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

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

Zend/tests/generators/generator_with_type_check_2.phpt

@@ -6,17 +6,17 @@ function gen(array $a) { yield; }
 try {
     gen(42);
 } catch (TypeError $e) {
-    echo $e->getMessage()."\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     foreach (gen(42) as $val) {
         var_dump($val);
     }
 } catch (TypeError $e) {
-        echo $e->getMessage()."\n";
+        echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECTF--
-gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d
-gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d
+TypeError: gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d
+TypeError: gen(): Argument #1 ($a) must be of type array, int given, called in %s on line %d

Zend/tests/generators/get_return_and_finally.phpt

@@ -31,17 +31,17 @@ try {
     // during auto-priming, so fails
     var_dump($gen->getReturn());
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     // This fails, because the return value was discarded
     var_dump($gen->getReturn());
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 int(42)
-gen2() throw
-Cannot get return value of a generator that hasn't returned
+Exception: gen2() throw
+Exception: Cannot get return value of a generator that hasn't returned

Zend/tests/generators/get_return_errors.phpt

@@ -14,7 +14,7 @@ try {
     // Generator hasn't reached the "return" yet
     $gen->getReturn();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 function gen2() {
@@ -27,13 +27,13 @@ $gen = gen2();
 try {
     $gen->next();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     // Generator has been aborted as a result of an exception
     $gen->getReturn();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 function gen3() {
@@ -47,7 +47,7 @@ try {
     // Generator throws during auto-priming of getReturn() call
     $gen->getReturn();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 function gen4() {
@@ -59,21 +59,21 @@ $gen = gen4();
 try {
     $gen->throw(new Exception("gen4() throw"));
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     // Generator has been aborted as a result of an exception
     // that was injected using throw()
     $gen->getReturn();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Cannot get return value of a generator that hasn't returned
-gen2() throw
-Cannot get return value of a generator that hasn't returned
-gen3() throw
-gen4() throw
-Cannot get return value of a generator that hasn't returned
+Exception: Cannot get return value of a generator that hasn't returned
+Exception: gen2() throw
+Exception: Cannot get return value of a generator that hasn't returned
+Exception: gen3() throw
+Exception: gen4() throw
+Exception: Cannot get return value of a generator that hasn't returned

Zend/tests/generators/gh11028_1.phpt

@@ -15,7 +15,7 @@ function test($msg, $x) {
     try {
         var_dump([...generator($x)]);
     } catch (Throwable $e) {
-        echo $e->getMessage(), "\n";
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
@@ -26,10 +26,10 @@ test("object", new stdClass);
 ?>
 --EXPECT--
 yield null
-Keys must be of type int|string during array unpacking
+Error: Keys must be of type int|string during array unpacking
 yield false
-Keys must be of type int|string during array unpacking
+Error: Keys must be of type int|string during array unpacking
 yield true
-Keys must be of type int|string during array unpacking
+Error: Keys must be of type int|string during array unpacking
 yield object
-Keys must be of type int|string during array unpacking
+Error: Keys must be of type int|string during array unpacking

Zend/tests/generators/gh11028_3.phpt

@@ -14,8 +14,8 @@ function generator() {
 try {
     var_dump([...generator()]);
 } catch (Throwable $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-exception
+Exception: exception

Zend/tests/generators/throw_into_yield_from_array.phpt

@@ -20,7 +20,7 @@ function test($g) {
     try {
         $g->throw(new Exception("Exception!"));
     } catch (Exception $e) {
-        echo "{$e->getMessage()}\n";
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
     var_dump($g->current());
 }
@@ -35,9 +35,9 @@ test(yf(yielditer($data)));
 ?>
 --EXPECT--
 int(1)
-Exception!
+Exception: Exception!
 NULL
 
 int(1)
-Exception!
+Exception: Exception!
 NULL

Zend/tests/generators/yield_from_non_iterable.phpt

@@ -10,9 +10,9 @@ function gen() {
 try {
     gen()->current();
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Can use "yield from" only with arrays and Traversables
+Error: Can use "yield from" only with arrays and Traversables

Zend/tests/generators/yield_from_valid_exception.phpt

@@ -18,7 +18,7 @@ function gen() {
         // the fact that the yield from result is used is relevant.
         var_dump(yield from new FooBar);
     } catch (Exception $e) {
-        echo $e->getMessage(), "\n";
+        echo $e::class, ': ', $e->getMessage(), "\n";
     }
 }
 
@@ -27,4 +27,4 @@ $x->current();
 
 ?>
 --EXPECT--
-Exception from valid()
+Exception: Exception from valid()

Zend/tests/get_called_class_001.phpt

@@ -6,9 +6,9 @@ Calling get_called_class() outside a class
 try {
     var_dump(get_called_class());
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-get_called_class() must be called from within a class
+Error: get_called_class() must be called from within a class