Test fixes for increment/decrement change

Author: Girgias

Zend/tests/bug64417.phpt

@@ -32,7 +32,8 @@ class obj implements ArrayAccess {
 
 $o = new obj;
 $o['x'] = 1;
-++$o['x'];
+$ref = &$o['x'];
+$ref++;
 echo $o['x'], "\n";
 ?>
 --EXPECT--

Zend/tests/in-de-crement/overloaded_access.phpt

@@ -32,5 +32,5 @@ try {
 }
 ?>
 --EXPECT--
-Cannot increment array
-Cannot decrement array
+Cannot increment/decrement object offsets
+Cannot increment/decrement object offsets

Zend/tests/temporary_cleaning_013.phpt

@@ -300,11 +300,7 @@ caught Exception 13
 
 Deprecated: Creation of dynamic property class@anonymous::$foo is deprecated in %s on line %d
 caught Exception 14
-
-Notice: Indirect modification of overloaded element of ArrayAccess@anonymous has no effect in %s on line %d
 caught Exception 15
-
-Notice: Indirect modification of overloaded element of ArrayAccess@anonymous has no effect in %s on line %d
 caught Exception 16
 caught Exception 17
 caught Exception 18

Zend/tests/type_declarations/typed_properties_065.phpt

@@ -21,10 +21,15 @@ var_dump($a->foo);
 $a[0] .= "e50";
 var_dump($a->foo);
 
-$a[0]--;
+try {
+    $a[0]--;
+} catch (Error $e) { echo $e->getMessage(), "\n"; }
 var_dump($a->foo);
 
---$a[0];
+try {
+    --$a[0];
+} catch (Error $e) { echo $e->getMessage(), "\n"; }
+
 var_dump($a->foo);
 
 $a->foo = PHP_INT_MIN;
@@ -59,13 +64,15 @@ offsetSet(11)
 int(1)
 offsetSet(1e50)
 int(1)
-int(0)
-int(-1)
-Cannot decrement a reference held by property ArrayAccess@anonymous::$foo of type int past its minimal value
+Cannot increment/decrement object offsets
+int(1)
+Cannot increment/decrement object offsets
+int(1)
+Cannot increment/decrement object offsets
 integer
-Cannot decrement a reference held by property ArrayAccess@anonymous::$foo of type int past its minimal value
+Cannot increment/decrement object offsets
 integer
-Cannot increment a reference held by property ArrayAccess@anonymous::$foo of type int past its maximal value
+Cannot increment/decrement object offsets
 integer
-Cannot increment a reference held by property ArrayAccess@anonymous::$foo of type int past its maximal value
+Cannot increment/decrement object offsets
 integer

Zend/tests/weakrefs/weakmap_basic_map_behavior.phpt

@@ -53,7 +53,11 @@ echo "\nIndirect modification:\n";
 $map[$obj] = [];
 $map[$obj][] = 42;
 $map[$obj2] = 41;
-$map[$obj2]++;
+try {
+    $map[$obj2]++;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump($map);
 
 echo "\nMethods:\n";
@@ -143,6 +147,7 @@ bool(false)
 Object stdClass#2 not contained in WeakMap
 
 Indirect modification:
+Cannot increment/decrement object offsets
 object(WeakMap)#1 (2) {
   [0]=>
   array(2) {
@@ -165,7 +170,7 @@ object(WeakMap)#1 (2) {
       int(2)
     }
     ["value"]=>
-    &int(42)
+    int(41)
   }
 }
 

ext/spl/tests/bug70852.phpt

@@ -5,11 +5,10 @@ Bug #70852 Segfault getting NULL offset of an ArrayObject
 $y = new ArrayObject();
 
 var_dump($y[NULL]);
-var_dump($y[NULL]++);
+$ref =& $y[NULL];
+var_dump($ref);
 ?>
 --EXPECTF--
 Warning: Undefined array key "" in %s on line %d
 NULL
-
-Warning: Undefined offset in %s on line %d
 NULL

ext/spl/tests/fixedarray_014.phpt

@@ -1,5 +1,5 @@
 --TEST--
-SPL: FixedArray: Trying to access inexistent item
+SPL: FixedArray: Trying to access nonexistent item
 --FILE--
 <?php
 
@@ -12,4 +12,4 @@ try {
 
 ?>
 --EXPECT--
-OutOfBoundsException: Index invalid or out of range
+Error: Cannot increment/decrement object offsets

tests/classes/array_access_003.phpt

@@ -41,7 +41,8 @@ $obj = new ObjectOne;
 
 var_dump($obj[1]);
 var_dump($obj[2]);
-$obj[2]++;
+$ref =& $obj[2];
+$ref++;
 var_dump($obj[2]);
 
 ?>
@@ -50,7 +51,6 @@ ObjectOne::offsetGet(1)
 string(6) "fooBar"
 ObjectOne::offsetGet(2)
 int(1)
-ObjectOne::offsetExists(2)
 ObjectOne::offsetGet(2)
 
 Notice: Indirect modification of overloaded element of ObjectOne has no effect in %sarray_access_003.php on line 39

tests/classes/array_access_004.phpt

@@ -39,7 +39,8 @@ $obj = new ObjectOne;
 
 var_dump($obj[1]);
 var_dump($obj[2]);
-$obj[2]++;
+$ref =& $obj[2];
+$ref++;
 var_dump($obj[2]);
 
 ?>
@@ -48,7 +49,6 @@ ObjectOne::offsetGet(1)
 string(6) "fooBar"
 ObjectOne::offsetGet(2)
 int(1)
-ObjectOne::offsetExists(2)
 ObjectOne::offsetGet(2)
 
 Notice: Indirect modification of overloaded element of ObjectOne has no effect in %sarray_access_004.php on line 39