Try to fix 32-bit tests

php · Apr 2, 2020 · 0e3dc80 · 0e3dc80
1 parent 48de974
commit 0e3dc80
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/Zend/tests/decrement_001.phpt b/Zend/tests/decrement_001.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--
+Cannot decrement array
 array(3) {
  [0]=>
  int(1)
@@ -51,8 +56,10 @@ float(1.5)
 NULL
 bool(true)
 bool(false)
+Cannot decrement object
 object(stdClass)#%d (0) {
 }
+Cannot decrement array
 array(0) {
 }
 float(-2147483649)

diff --git a/Zend/tests/increment_001.phpt b/Zend/tests/increment_001.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--
+Cannot decrement array
 array(3) {
  [0]=>
  int(1)
@@ -51,8 +56,10 @@ float(3.5)
 int(1)
 bool(true)
 bool(false)
+Cannot decrement object
 object(stdClass)#%d (0) {
 }
+Cannot decrement array
 array(0) {
 }
 float(2147483648)

diff --git a/ext/standard/tests/math/pow_variation1.phpt b/ext/standard/tests/math/pow_variation1.phpt
@@ -174,9 +174,7 @@ Warning: A non-numeric value encountered in %s on line %d
 int(0)
 
 -- Iteration 23 --
-
-Notice: Object of class classA could not be converted to number in %s on line %d
-int(1)
+Unsupported operand types: object ** int
 
 -- Iteration 24 --
 int(0)