Fix tests

Author: iluuu1994

Zend/tests/generators/generator_closure_collection.phpt

@@ -4,6 +4,8 @@ The Closure object of a generator is freed when the generator is freed.
 <?php
 
 $genFactory = function() {
+  /* Avoid static inference and caching. */
+  static $dummy;
   yield 1;
   yield 2;
   yield 3;
@@ -25,23 +27,33 @@ var_dump($r->get());
 
 ?>
 --EXPECTF--
-object(Closure)#%d (3) {
+object(Closure)#%d (4) {
   ["name"]=>
   string(%d) "{closure:%s:%d}"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
   int(%d)
+  ["static"]=>
+  array(1) {
+    ["dummy"]=>
+    NULL
+  }
 }
 int(1)
 int(2)
 int(3)
-object(Closure)#%d (3) {
+object(Closure)#%d (4) {
   ["name"]=>
   string(%d) "{closure:%s:%d}"
   ["file"]=>
   string(%d) "%s"
   ["line"]=>
   int(%d)
+  ["static"]=>
+  array(1) {
+    ["dummy"]=>
+    NULL
+  }
 }
 NULL

Zend/zend_vm_def.h

@@ -8348,7 +8348,7 @@ ZEND_VM_HANDLER(210, ZEND_DECLARE_ATTRIBUTED_CONST, CONST, CONST)
 	ZEND_VM_NEXT_OPCODE_EX(1, 2);
 }
 
-ZEND_VM_HANDLER(142, ZEND_DECLARE_LAMBDA_FUNCTION, CONST, NUM, NUM|CACHE_SLOT)
+ZEND_VM_HANDLER(142, ZEND_DECLARE_LAMBDA_FUNCTION, UNUSED, NUM, NUM|CACHE_SLOT)
 {
 	USE_OPLINE
 	zend_function *func;

Zend/zend_vm_execute.h

@@ -15,15 +15,15 @@ $_main:
      ; (lines=%d, args=0, vars=%d, tmps=%d)
      ; (after optimizer)
      ; %s
-0000 T0 = DECLARE_LAMBDA_FUNCTION 0
+0000 T0 = DECLARE_LAMBDA_FUNCTION %d 0
 0001 FREE T0
 0002 RETURN int(1)
 
 {closure:%s:%d}:
      ; (lines=%d, args=0, vars=%d, tmps=%d)
      ; (after optimizer)
      ; %s
-0000 T0 = DECLARE_LAMBDA_FUNCTION 0
+0000 T0 = DECLARE_LAMBDA_FUNCTION %d 0
 0001 RETURN T0
 
 {closure:%s:%d}:

Zend/zend_vm_handlers.h

@@ -19,10 +19,10 @@ echo (string) $rf;
 
 ?>
 --EXPECTF--
-Closure [ <user> function {closure:%s:%d} ] {
+Closure [ <user> static function {closure:%s:%d} ] {
   @@ %sReflectionFunction__toString_bound_variables.php 3 - 3
 }
-Closure [ <user> function {closure:%s:%d} ] {
+Closure [ <user> static function {closure:%s:%d} ] {
   @@ %sReflectionFunction__toString_bound_variables.php 9 - 12
 
   - Bound Variables [2] {

Zend/zend_vm_opcodes.c

@@ -41,7 +41,7 @@ object(ArrayObject)#2 (1) {
 }
 
 Deprecated: ArrayObject::__construct(): Using an object as a backing array for ArrayObject is deprecated, as it allows violating class constraints and invariants in %s on line %d
-object(ArrayObject)#3 (1) {
+object(ArrayObject)#%d (1) {
   ["storage":"ArrayObject":private]=>
   object(ArrayObject)#2 (1) {
     ["storage":"ArrayObject":private]=>
@@ -59,18 +59,18 @@ Deprecated: ArrayObject::exchangeArray(): Using an object as a backing array for
 Deprecated: Creation of dynamic property ArrayObject::$a is deprecated in %s on line %d
 
 Deprecated: Creation of dynamic property ArrayObject::$b is deprecated in %s on line %d
-object(ArrayObject)#4 (2) {
+object(ArrayObject)#%d (2) {
   ["b"]=>
   int(1)
   ["a"]=>
   int(2)
 }
-object(ArrayObject)#5 (1) {
+object(ArrayObject)#%d (1) {
   ["storage":"ArrayObject":private]=>
   array(0) {
   }
 }
-object(ArrayObject)#6 (1) {
+object(ArrayObject)#%d (1) {
   ["storage":"ArrayObject":private]=>
   array(2) {
     ["b"]=>