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

Zend/tests/bug47836.phpt

@@ -7,13 +7,13 @@ $arr[PHP_INT_MAX] = 1;
 try {
     $arr[] = 2;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump($arr);
 ?>
 --EXPECTF--
-Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
 array(1) {
   [%d]=>
   int(1)

Zend/tests/bug49893.phpt

@@ -7,7 +7,7 @@ class A {
         try {
             throw new Exception("2");
         } catch (Exception $e) {
-            echo $e->getMessage() . "\n";
+            echo $e::class, ': ', $e->getMessage(), "\n";
         }
     }
 }
@@ -21,9 +21,9 @@ class B {
 try {
     $b = new B();
 } catch(Exception $e) {
-    echo $e->getMessage() . "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-2
-1
+Exception: 2
+Exception: 1

Zend/tests/bug52041.phpt

@@ -9,32 +9,32 @@ function foo() {
 try {
     foo()->a = 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     foo()->a->b = 2;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     foo()->a++;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     foo()->a->b++;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     foo()->a += 2;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     foo()->a->b += 2;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 foo()[0] = 1;
@@ -48,22 +48,22 @@ var_dump(foo());
 ?>
 --EXPECTF--
 Warning: Undefined variable $x in %s on line %d
-Attempt to assign property "a" on null
+Error: Attempt to assign property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
-Attempt to modify property "a" on null
+Error: Attempt to modify property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
-Attempt to increment/decrement property "a" on null
+Error: Attempt to increment/decrement property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
-Attempt to modify property "a" on null
+Error: Attempt to modify property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
-Attempt to assign property "a" on null
+Error: Attempt to assign property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
-Attempt to modify property "a" on null
+Error: Attempt to modify property "a" on null
 
 Warning: Undefined variable $x in %s on line %d
 

Zend/tests/bug52355.phpt

@@ -13,12 +13,12 @@ var_dump($foo);
 try {
     var_dump(1.0 / -0.0);
 } catch (\DivisionByZeroError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 float(-0)
 float(-0)
 float(-0)
-Division by zero
+DivisionByZeroError: Division by zero

Zend/tests/bug52614.phpt

@@ -55,7 +55,7 @@ var_dump($foo->a3);
 try {
     $foo->f4()->a = 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($foo->o1);
 
@@ -76,7 +76,7 @@ array(0) {
 }
 array(0) {
 }
-Attempt to assign property "a" on null
+Error: Attempt to assign property "a" on null
 NULL
 object(stdClass)#3 (1) {
   ["a"]=>

Zend/tests/bug53432.phpt

@@ -19,31 +19,31 @@ $str = '';
 try {
     var_dump($str['foo'] = 'a');
 } catch (\TypeError $e) {
-    echo $e->getMessage() . \PHP_EOL;
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($str);
 
 $str = '';
 try {
     var_dump($str[] = 'a');
 } catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($str);
 
 $str = '';
 try {
     var_dump($str[0] += 1);
 } catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($str);
 
 $str = '';
 try {
     var_dump($str[0][0] = 'a');
 } catch (Error $e) {
-    echo "Error: {$e->getMessage()}\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($str);
 
@@ -57,7 +57,7 @@ string(6) "     a"
 Warning: Illegal string offset -1 in %s on line %d
 NULL
 string(0) ""
-Cannot access offset of type string on string
+TypeError: Cannot access offset of type string on string
 string(0) ""
 Error: [] operator not supported for strings
 string(0) ""

Zend/tests/bug63882.phpt

@@ -12,9 +12,9 @@ $testobj2->x = $testobj2;
 try {
     var_dump($testobj1 == $testobj2);
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-Nesting level too deep - recursive dependency?
+Error: Nesting level too deep - recursive dependency?

Zend/tests/bug65784.phpt

@@ -18,7 +18,7 @@ try {
     var_dump($foo);
 } catch (Exception $e) {
     do {
-        var_dump($e->getMessage());
+        echo $e::class, ': ', $e->getMessage(), "\n";
     } while ($e = $e->getPrevious());
 }
 
@@ -55,7 +55,7 @@ function foo3() {
 $bar = foo3();
 ?>
 --EXPECTF--
-string(9) "not catch"
+Exception: not catch
 NULL
 
 Fatal error: Uncaught Exception: not caught in %sbug65784.php:42

Zend/tests/bug69017.phpt

@@ -19,15 +19,15 @@ c1::$a2[] = 1;
 try {
     c1::$a3[] = 1;
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 var_dump(c1::$a1);
 var_dump(c1::$a2);
 var_dump(c1::$a3);
 ?>
 --EXPECTF--
-Cannot add element to the array as the next element is already occupied
+Error: Cannot add element to the array as the next element is already occupied
 array(2) {
   [1]=>
   string(3) "one"

Zend/tests/bug69315.phpt

@@ -10,41 +10,41 @@ var_dump(is_callable("strlen"));
 try {
     var_dump(strlen("xxx"));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(defined("PHP_VERSION"));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(constant("PHP_VERSION"));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(call_user_func("strlen"));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(is_string("xxx"));
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     var_dump(is_string());
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
 bool(false)
 bool(false)
-Call to undefined function strlen()
-Call to undefined function defined()
-Call to undefined function constant()
-Call to undefined function call_user_func()
-Call to undefined function is_string()
-Call to undefined function is_string()
+Error: Call to undefined function strlen()
+Error: Call to undefined function defined()
+Error: Call to undefined function constant()
+Error: Call to undefined function call_user_func()
+Error: Call to undefined function is_string()
+Error: Call to undefined function is_string()

Zend/tests/bug70083.phpt

@@ -16,13 +16,13 @@ $foo = new foo;
 try {
     $foo->i = &noref();
 } catch (Error $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 var_dump($foo);
 
 ?>
 --EXPECT--
-Cannot assign by reference to overloaded object
+Error: Cannot assign by reference to overloaded object
 object(foo)#1 (1) {
   ["var":"foo":private]=>
   NULL

Zend/tests/bug70089.phpt

@@ -8,28 +8,28 @@ function dummy($a) {
 try {
     chr(0)[0][] = 1;
 } catch (Error $e) {
-    var_dump($e->getMessage());
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     unset(chr(0)[0][0]);
 } catch (Error $e) {
-    var_dump($e->getMessage());
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 eval("function runtimetest(&\$a) {} ");
 try {
     runtimetest(chr(0)[0]);
 } catch (Error $e) {
-    var_dump($e->getMessage());
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 try {
     ++chr(0)[0];
 } catch (Error $e) {
-    var_dump($e->getMessage());
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-string(36) "Cannot use string offset as an array"
-string(36) "Cannot use string offset as an array"
-string(47) "Cannot create references to/from string offsets"
-string(41) "Cannot increment/decrement string offsets"
+Error: Cannot use string offset as an array
+Error: Cannot use string offset as an array
+Error: Cannot create references to/from string offsets
+Error: Cannot increment/decrement string offsets

Zend/tests/bug70689.phpt

@@ -14,7 +14,7 @@ set_error_handler(function($errno, $errstr) {
 try {
     foo();
 } catch (Exception $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>

Zend/tests/bug70895.phpt

@@ -6,20 +6,20 @@ Bug #70895 null ptr deref and segfault with crafted callable
 try {
     array_map("%n", 0);
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     array_map("%n %i", 0);
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 try {
     array_map("%n %i aoeu %f aoeu %p", 0);
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n" not found or invalid function name
-array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n %i" not found or invalid function name
-array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n %i aoeu %f aoeu %p" not found or invalid function name
+TypeError: array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n" not found or invalid function name
+TypeError: array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n %i" not found or invalid function name
+TypeError: array_map(): Argument #1 ($callback) must be a valid callback or null, function "%n %i aoeu %f aoeu %p" not found or invalid function name

Zend/tests/bug70898.phpt

@@ -9,8 +9,8 @@ function m($f,$a){
 try {
     echo implode(m("",m("",m("",m("",m("0000000000000000000000000000000000",("")))))));
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-array_map(): Argument #1 ($callback) must be a valid callback or null, function "0000000000000000000000000000000000" not found or invalid function name
+TypeError: array_map(): Argument #1 ($callback) must be a valid callback or null, function "0000000000000000000000000000000000" not found or invalid function name

Zend/tests/bug70914.phpt

@@ -10,8 +10,8 @@ $st = $db->query('SELECT 1');
 try {
     $re = $st->fetchObject('%Z');
 } catch (TypeError $e) {
-    echo $e->getMessage(), "\n";
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 ?>
 --EXPECT--
-PDOStatement::fetchObject(): Argument #1 ($class) must be a valid class name, %Z given
+TypeError: PDOStatement::fetchObject(): Argument #1 ($class) must be a valid class name, %Z given