Commit02ba9d7

committed

Unwrap reference returns in cufa etc

1 parente63443d commit02ba9d7Copy full SHA for 02ba9d7

File tree

+63

-0

lines changed

+63

-0

lines changed

Lines changed: 39 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,39 @@`
	`1`	`+--TEST--`
	`2`	`+When performing a dynamic call to a ret-by-ref function, the reference should be unwrapped`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+`
	`6`	`+namespaceFoo;`
	`7`	`+`
	`8`	`+function &retRef($x) {`
	`9`	`+return$x;`
	`10`	`+}`
	`11`	`+`
	`12`	`+var_dump(call_user_func('Foo\retRef',42));`
	`13`	`+var_dump(call_user_func_array('Foo\retRef', [42]));`
	`14`	`+`
	`15`	`+$closure =function &($x) {`
	`16`	`+return$x;`
	`17`	`+};`
	`18`	`+var_dump($closure->call(newclass {},42));`
	`19`	`+`
	`20`	`+var_dump((new \ReflectionFunction('Foo\retRef'))->invoke(42));`
	`21`	`+var_dump((new \ReflectionFunction('Foo\retRef'))->invokeArgs([42]));`
	`22`	`+`
	`23`	`+class Bar {`
	`24`	`+function &method($x) {`
	`25`	`+return$x;`
	`26`	`+ }`
	`27`	`+}`
	`28`	`+var_dump((new \ReflectionMethod('Foo\Bar','method'))->invoke(newBar,42));`
	`29`	`+var_dump((new \ReflectionMethod('Foo\Bar','method'))->invokeArgs(newBar, [42]));`
	`30`	`+`
	`31`	`+?>`
	`32`	`+--EXPECT--`
	`33`	`+int(42)`
	`34`	`+int(42)`
	`35`	`+int(42)`
	`36`	`+int(42)`
	`37`	`+int(42)`
	`38`	`+int(42)`
	`39`	`+int(42)`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ ZEND_METHOD(Closure, call)`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`if (zend_call_function(&fci,&fci_cache)==SUCCESS&&Z_TYPE(closure_result)!=IS_UNDEF) {`
	`169`	`+if (Z_ISREF(closure_result)) {`
	`170`	`+zend_unwrap_reference(&closure_result);`
	`171`	`+}`
`169`	`172`	`ZVAL_COPY_VALUE(return_value,&closure_result);`
`170`	`173`	`}`
`171`	`174`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1985,6 +1985,9 @@ ZEND_METHOD(reflection_function, invoke)`
`1985`	`1985`	`}`
`1986`	`1986`
`1987`	`1987`	`if (Z_TYPE(retval)!=IS_UNDEF) {`
	`1988`	`+if (Z_ISREF(retval)) {`
	`1989`	`+zend_unwrap_reference(&retval);`
	`1990`	`+}`
`1988`	`1991`	`ZVAL_COPY_VALUE(return_value,&retval);`
`1989`	`1992`	`}`
`1990`	`1993`	`}`
`@@ -2048,6 +2051,9 @@ ZEND_METHOD(reflection_function, invokeArgs)`
`2048`	`2051`	`}`
`2049`	`2052`
`2050`	`2053`	`if (Z_TYPE(retval)!=IS_UNDEF) {`
	`2054`	`+if (Z_ISREF(retval)) {`
	`2055`	`+zend_unwrap_reference(&retval);`
	`2056`	`+}`
`2051`	`2057`	`ZVAL_COPY_VALUE(return_value,&retval);`
`2052`	`2058`	`}`
`2053`	`2059`	`}`
`@@ -3323,6 +3329,9 @@ static void reflection_method_invoke(INTERNAL_FUNCTION_PARAMETERS, int variadic)`
`3323`	`3329`	`}`
`3324`	`3330`
`3325`	`3331`	`if (Z_TYPE(retval)!=IS_UNDEF) {`
	`3332`	`+if (Z_ISREF(retval)) {`
	`3333`	`+zend_unwrap_reference(&retval);`
	`3334`	`+}`
`3326`	`3335`	`ZVAL_COPY_VALUE(return_value,&retval);`
`3327`	`3336`	`}`
`3328`	`3337`	`}`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4823,6 +4823,9 @@ PHP_FUNCTION(call_user_func)`
`4823`	`4823`	`fci.retval=&retval;`
`4824`	`4824`
`4825`	`4825`	`if (zend_call_function(&fci,&fci_cache)==SUCCESS&&Z_TYPE(retval)!=IS_UNDEF) {`
	`4826`	`+if (Z_ISREF(retval)) {`
	`4827`	`+zend_unwrap_reference(&retval);`
	`4828`	`+}`
`4826`	`4829`	`ZVAL_COPY_VALUE(return_value,&retval);`
`4827`	`4830`	`}`
`4828`	`4831`	`}`
`@@ -4846,6 +4849,9 @@ PHP_FUNCTION(call_user_func_array)`
`4846`	`4849`	`fci.retval=&retval;`
`4847`	`4850`
`4848`	`4851`	`if (zend_call_function(&fci,&fci_cache)==SUCCESS&&Z_TYPE(retval)!=IS_UNDEF) {`
	`4852`	`+if (Z_ISREF(retval)) {`
	`4853`	`+zend_unwrap_reference(&retval);`
	`4854`	`+}`
`4849`	`4855`	`ZVAL_COPY_VALUE(return_value,&retval);`
`4850`	`4856`	`}`
`4851`	`4857`
`@@ -4880,6 +4886,9 @@ PHP_FUNCTION(forward_static_call)`
`4880`	`4886`	`}`
`4881`	`4887`
`4882`	`4888`	`if (zend_call_function(&fci,&fci_cache)==SUCCESS&&Z_TYPE(retval)!=IS_UNDEF) {`
	`4889`	`+if (Z_ISREF(retval)) {`
	`4890`	`+zend_unwrap_reference(&retval);`
	`4891`	`+}`
`4883`	`4892`	`ZVAL_COPY_VALUE(return_value,&retval);`
`4884`	`4893`	`}`
`4885`	`4894`	`}`
`@@ -4908,6 +4917,9 @@ PHP_FUNCTION(forward_static_call_array)`
`4908`	`4917`	`}`
`4909`	`4918`
`4910`	`4919`	`if (zend_call_function(&fci,&fci_cache)==SUCCESS&&Z_TYPE(retval)!=IS_UNDEF) {`
	`4920`	`+if (Z_ISREF(retval)) {`
	`4921`	`+zend_unwrap_reference(&retval);`
	`4922`	`+}`
`4911`	`4923`	`ZVAL_COPY_VALUE(return_value,&retval);`
`4912`	`4924`	`}`
`4913`	`4925`

Comments

(0)