Update: Unit Test to #20632

Author: rizwan3d

Zend/tests/add_006.phpt

@@ -45,13 +45,13 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Unsupported operand types: int + non-numeric string
+Unsupported operand types: int + non-numeric-string
 
 Warning: A non-numeric value encountered in %s on line %d
 int(951858)
 int(48550510)
 float(75661.68)
-Unsupported operand types: non-numeric string + int
+Unsupported operand types: non-numeric-string + int
 
 Warning: A non-numeric value encountered in %s on line %d
 int(951858)

Zend/tests/add_007.phpt

@@ -19,9 +19,9 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Exception: Unsupported operand types: array + non-numeric string
+Exception: Unsupported operand types: array + non-numeric-string
 
-Fatal error: Uncaught TypeError: Unsupported operand types: array + non-numeric string in %s:%d
+Fatal error: Uncaught TypeError: Unsupported operand types: array + non-numeric-string in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/arrow_functions/006.phpt

@@ -32,7 +32,7 @@ try {
 --EXPECTF--
 int(2)
 int(10)
-{closure:%s:%d}(): Argument #1 ($x) must be of type int, non-numeric string given, called in %s on line %d
+{closure:%s:%d}(): Argument #1 ($x) must be of type int, non-numeric-string given, called in %s on line %d
 array(3) {
   [0]=>
   int(20)
@@ -41,4 +41,4 @@ array(3) {
   [2]=>
   int(30)
 }
-{closure:%s:%d}(): Argument #2 must be of type ?int, non-numeric string given, called in %s on line %d
+{closure:%s:%d}(): Argument #2 must be of type ?int, non-numeric-string given, called in %s on line %d

Zend/tests/assign_op_type_error.phpt

@@ -47,11 +47,11 @@ try {
 
 ?>
 --EXPECT--
-Unsupported operand types: array + non-numeric string
-Unsupported operand types: array - non-numeric string
-Unsupported operand types: array * non-numeric string
-Unsupported operand types: array / non-numeric string
-Unsupported operand types: array ** non-numeric string
-Unsupported operand types: array % non-numeric string
-Unsupported operand types: array << non-numeric string
-Unsupported operand types: array >> non-numeric string
+Unsupported operand types: array + non-numeric-string
+Unsupported operand types: array - non-numeric-string
+Unsupported operand types: array * non-numeric-string
+Unsupported operand types: array / non-numeric-string
+Unsupported operand types: array ** non-numeric-string
+Unsupported operand types: array % non-numeric-string
+Unsupported operand types: array << non-numeric-string
+Unsupported operand types: array >> non-numeric-string

Zend/tests/attributes/030_strict_types.phpt

@@ -23,7 +23,7 @@ object(MyAttribute)#1 (1) {
   int(42)
 }
 
-Fatal error: Uncaught TypeError: MyAttribute::__construct(): Argument #1 ($value) must be of type int, non-numeric string given, called in %s030_strict_types.inc on line 4 and defined in %s030_strict_types.php:5
+Fatal error: Uncaught TypeError: MyAttribute::__construct(): Argument #1 ($value) must be of type int, non-numeric-string given, called in %s030_strict_types.inc on line 4 and defined in %s030_strict_types.php:5
 Stack trace:
 #0 %s030_strict_types.inc(4): MyAttribute->__construct('42')
 #1 %s(%d): ReflectionAttribute->newInstance()

Zend/tests/exceptions/exception_017.phpt

@@ -28,7 +28,7 @@ Error: Cannot call abstract method C::foo() in %s:%d
 Stack trace:
 #0 {main}
 
-TypeError: foo(): Argument #1 ($x) must be of type callable, non-numeric string given, called in %s:%d
+TypeError: foo(): Argument #1 ($x) must be of type callable, non-numeric-string given, called in %s:%d
 Stack trace:
 #0 %s(%d): foo('C::foo')
 #1 {main}

Zend/tests/fibers/start-arguments.phpt

@@ -21,7 +21,7 @@ $fiber->start('test');
 --EXPECTF--
 int(1)
 
-Fatal error: Uncaught TypeError: {closure:%s:%d}(): Argument #1 ($x) must be of type int, non-numeric string given in %s:%d
+Fatal error: Uncaught TypeError: {closure:%s:%d}(): Argument #1 ($x) must be of type int, non-numeric-string given in %s:%d
 Stack trace:
 #0 [internal function]: {closure:%s:%d}('test')
 #1 %sstart-arguments.php(%d): Fiber->start('test')

Zend/tests/first_class_callable/first_class_callable_015.phpt

@@ -21,4 +21,4 @@ try {
 ?>
 --EXPECTF--
 int(42)
-test(): Argument #1 ($i) must be of type int, non-numeric string given, called in %s on line %d
+test(): Argument #1 ($i) must be of type int, non-numeric-string given, called in %s on line %d

Zend/tests/function_arguments/argument_count_incorrect_userland_strict.phpt

@@ -50,6 +50,6 @@ Too few arguments to function bar(), 1 passed in %s and exactly 2 expected
 ArgumentCountError
 Too few arguments to function bat(), 1 passed in %s and exactly 2 expected
 TypeError
-bat(): Argument #1 ($foo) must be of type int, non-numeric string given, called in %s on line %d
+bat(): Argument #1 ($foo) must be of type int, non-numeric-string given, called in %s on line %d
 TypeError
 bat(): Argument #2 ($bar) must be of type string, int given, called in %s on line %d

Zend/tests/gh19719.phpt

@@ -18,4 +18,4 @@ try {
 
 ?>
 --EXPECTF--
-takesInt(): Argument #1 ($x) must be of type int, non-numeric string given, called in %s on line %d
+takesInt(): Argument #1 ($x) must be of type int, non-numeric-string given, called in %s on line %d