Make numeric operations on resources, arrays and objects type errors

php · Apr 1, 2020 · 48de974 · 48de974
1 parent 3a7c716
commit 48de974
Show file tree

Hide file tree

Showing 18 changed files with 1,120 additions and 166 deletions.
diff --git a/Zend/tests/add_003.phpt b/Zend/tests/add_003.phpt
@@ -20,12 +20,8 @@ var_dump($c);
 echo "Done\n";
 ?>
 --EXPECTF--
-Notice: Object of class stdClass could not be converted to number in %sadd_003.php on line %d
-
 Exception: Unsupported operand types: object + array
 
-Notice: Object of class stdClass could not be converted to number in %s on line %d
-
 Fatal error: Uncaught TypeError: Unsupported operand types: object + array in %s:%d
 Stack trace:
 #0 {main}

diff --git a/Zend/tests/bug54305.phpt b/Zend/tests/bug54305.phpt
@@ -9,14 +9,11 @@ class TestClass {
 abstract class AbstractClass {
 }
 $methodWithArgs = new ReflectionMethod('TestClass', 'methodWithArgs');
-echo $methodWithArgs++;
-?>
---EXPECTF--
-Method [ <user> public method methodWithArgs ] {
- @@ %sbug54305.php %d - %d
-
- - Parameters [2] {
- Parameter #0 [ <required> $a ]
- Parameter #1 [ <required> $b ]
- }
+try {
+ echo $methodWithArgs++;
+} catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
 }
+?>
+--EXPECT--
+Cannot increment object
diff --git a/Zend/tests/bug73337.phpt b/Zend/tests/bug73337.phpt
@@ -5,8 +5,5 @@ Bug #73337 (try/catch not working with two exceptions inside a same operation)
 class d { function __destruct() { throw new Exception; } }
 try { new d + new d; } catch (Exception $e) { print "Exception properly caught\n"; }
 ?>
---EXPECTF--
-Notice: Object of class d could not be converted to number in %sbug73337.php on line 3
-
-Notice: Object of class d could not be converted to number in %sbug73337.php on line 3
+--EXPECT--
 Exception properly caught
diff --git a/Zend/tests/compound_assign_failure.phpt b/Zend/tests/compound_assign_failure.phpt
@@ -34,167 +34,167 @@ try {
 
 $x = new stdClass;
 try { $x += 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x += new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x += new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x -= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x -= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x -= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x *= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x *= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x *= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x /= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x /= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x /= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x %= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x %= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x %= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x **= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x **= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x **= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x ^= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x ^= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x ^= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x &= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x &= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x &= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x |= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x |= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x |= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x <<= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x <<= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x <<= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = new stdClass;
 try { $x >>= 1; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = 1;
 try { $x >>= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 $x = "foo";
 try { $x >>= new stdClass; }
-catch (Exception $e) {}
+catch (Throwable $e) {}
 var_dump($x);
 
 ?>

diff --git a/Zend/tests/decrement_001_64bit.phpt b/Zend/tests/decrement_001_64bit.phpt
@@ -26,13 +26,18 @@ $a = array(
 );
 
 foreach ($a as $var) {
- $var--;
+ try {
+ $var--;
+ } catch (TypeError $e) {
+ echo $e->getMessage(), "\n";
+ }
  var_dump($var);
 }
 
 echo "Done\n";
 ?>
---EXPECTF--
+--EXPECT--
+Cannot decrement array
 array(3) {
  [0]=>
  int(1)
@@ -51,8 +56,10 @@ float(1.5)
 NULL
 bool(true)
 bool(false)
-object(stdClass)#%d (0) {
+Cannot decrement object
+object(stdClass)#1 (0) {
 }
+Cannot decrement array
 array(0) {
 }
 float(-9.223372036854776E+18)