Promote arithmetic/bitwise ops warnings to TypeError

Author: Girgias

Zend/tests/add_006.phpt

@@ -11,9 +11,12 @@ $s2 = "876222numeric";
 $s3 = "48474874";
 $s4 = "25.68";
 
-$c = $i + $s1;
-var_dump($c);
-
+try {
+    $c = $i + $s1;
+    var_dump($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 $c = $i + $s2;
 var_dump($c);
 
@@ -23,8 +26,12 @@ var_dump($c);
 $c = $i + $s4;
 var_dump($c);
 
-$c = $s1 + $i;
-var_dump($c);
+try {
+    $c = $s1 + $i;
+    var_dump($c);
+} catch (\TypeError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 $c = $s2 + $i;
 var_dump($c);
@@ -38,19 +45,16 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: A non-numeric value encountered in %s on line %d
-int(75636)
+Unsupported operand types: int + string
 
 Warning: A non-numeric value encountered in %s on line %d
-int(75636)
+int(951858)
 int(48550510)
 float(75661.68)
+Unsupported operand types: string + int
 
 Warning: A non-numeric value encountered in %s on line %d
-int(75636)
-
-Warning: A non-numeric value encountered in %s on line %d
-int(75636)
+int(951858)
 int(48550510)
 float(75661.68)
 Done

Zend/tests/bug39018_2.phpt

@@ -8,11 +8,8 @@ error_reporting(E_ALL);
 $foo = 'test';
 $x = @$foo[6];
 
-print @($foo[100] + $foo[130]);
-
-print "\nDone\n";
+var_dump(@($foo[100] . $foo[130]));
 
 ?>
 --EXPECT--
-0
-Done
+string(0) ""

Zend/tests/constant_expressions_dynamic.phpt

@@ -5,7 +5,7 @@ Dynamic Constant Expressions
 
 const C_0 = 0;
 const C_1 = 1;
-const C_foo = "foo";
+const C_foo = "0foo";
 const C_arr = [0 => 0, "foo" => "foo"];
 
 const T_1 = C_1 | 2;

Zend/tests/int_conversion_exponents.phpt

@@ -40,13 +40,13 @@ int(1234500000)
 int(-1234500000)
 
 Warning: A non-numeric value encountered in %s on line %d
-int(0)
+int(1234500000)
 
 Warning: A non-numeric value encountered in %s on line %d
-int(0)
+int(-1234500000)
 
 Warning: A non-numeric value encountered in %s on line %d
-int(0)
+int(1234500000)
 
 Warning: A non-numeric value encountered in %s on line %d
-int(0)
+int(-1234500000)