Fix issues

Author: iluuu1994

Zend/tests/explicitSendByRef/call_user_func.phpt

@@ -26,10 +26,10 @@ var_dump($i);
 
 ?>
 --EXPECTF--
-Warning: Foo\inc() expects argument #1 ($i) to be passed by reference, value given in %s on line %d
+Warning: Foo\inc(): Argument #1 ($i) must be passed by reference, value given in %s on line %d
 int(0)
 int(1)
 
-Warning: Foo\inc() expects argument #1 ($i) to be passed by reference, value given in %s on line %d
+Warning: Foo\inc(): Argument #1 ($i) must be passed by reference, value given in %s on line %d
 int(0)
 int(1)

Zend/tests/explicitSendByRef/parseErrorOnNonVariable.phpt

@@ -8,4 +8,4 @@ byRef(&null);
 
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected ')', expecting %s in %s on line %d
+Parse error: syntax error, unexpected token ")", expecting "->" or "?->" or "{" or "[" in %s on line %d

Zend/tests/explicitSendByRef/requiredExplicitSendByRef.phpt

@@ -114,10 +114,10 @@ function test2($foo, &$bar) {
 
 ?>
 --EXPECT--
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
+test1(): Argument #2 ($bar) could not be passed by reference
+test1(): Argument #2 ($bar) could not be passed by reference
+test1(): Argument #2 ($bar) could not be passed by reference
+test1(): Argument #2 ($bar) could not be passed by reference
 string(6) "foobar"
 int(0)
 string(9) "foobarbaz"
@@ -126,10 +126,10 @@ string(6) "barfoo"
 int(2)
 string(6) "foobar"
 int(3)
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
-Cannot pass parameter 2 by reference
+test2(): Argument #2 ($bar) could not be passed by reference
+test2(): Argument #2 ($bar) could not be passed by reference
+test2(): Argument #2 ($bar) could not be passed by reference
+test2(): Argument #2 ($bar) could not be passed by reference
 string(6) "foobar"
 int(0)
 string(9) "foobarbaz"

Zend/zend_execute_API.c

@@ -891,7 +891,7 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
 
 			if (ARG_SHOULD_BE_SENT_BY_REF(func, arg_num)) {
 				if (UNEXPECTED(!Z_ISREF_P(arg))) {
-					if (!ARG_MAY_BE_SENT_BY_REF(func, arg_num)) {
+					if (ARG_MUST_BE_SENT_BY_REF(func, arg_num)) {
 						/* By-value send is not allowed -- emit a warning,
 						 * and perform the call with the value wrapped in a reference. */
 						zend_param_must_be_ref(func, arg_num);

Zend/zend_language_parser.y

@@ -904,7 +904,7 @@ argument:
 	|	identifier ':' expr
 			{ $$ = zend_ast_create(ZEND_AST_NAMED_ARG, $1, $3); }
 	|	T_ELLIPSIS expr	{ $$ = zend_ast_create(ZEND_AST_UNPACK, $2); }
-	|	'&' variable	{ $$ = zend_ast_create(ZEND_AST_REF, $2); }
+	|	ampersand variable	{ $$ = zend_ast_create(ZEND_AST_REF, $2); }
 ;
 
 global_var_list:

Zend/zend_vm_def.h

@@ -4863,7 +4863,7 @@ ZEND_VM_HOT_SEND_HANDLER(50, ZEND_SEND_VAR_NO_REF_EX, VAR, CONST|UNUSED|NUM, SPE
 		ZVAL_COPY_VALUE(arg, varptr);
 
 		if (EXPECTED(Z_ISREF_P(varptr) ||
-		    QUICK_ARG_MAY_BE_SENT_BY_REF(EX(call)->func, arg_num))) {
+		    !ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num))) {
 			ZEND_VM_NEXT_OPCODE();
 		}
 	} else {
@@ -4875,7 +4875,7 @@ ZEND_VM_HOT_SEND_HANDLER(50, ZEND_SEND_VAR_NO_REF_EX, VAR, CONST|UNUSED|NUM, SPE
 		ZVAL_COPY_VALUE(arg, varptr);
 
 		if (EXPECTED(Z_ISREF_P(varptr) ||
-		    ARG_MAY_BE_SENT_BY_REF(EX(call)->func, arg_num))) {
+		    !ARG_MUST_BE_SENT_BY_REF(EX(call)->func, arg_num))) {
 			ZEND_VM_NEXT_OPCODE();
 		}
 	}
@@ -5572,15 +5572,24 @@ ZEND_VM_HANDLER(120, ZEND_SEND_USER, CONST|TMP|VAR|CV, NUM, REF)
 
 	SAVE_OPLINE();
 
-	// FIXME: Re-add changes from Nikita
-	arg = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
 	param = ZEND_CALL_VAR(EX(call), opline->result.var);
-	if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
-		zend_param_must_be_ref(EX(call)->func, opline->op2.num);
-		Z_TRY_ADDREF_P(arg);
-		ZVAL_NEW_REF(param, arg);
+	if (opline->extended_value) {
+		arg = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
+		if (Z_ISREF_P(arg)) {
+			Z_ADDREF_P(arg);
+		} else {
+			ZVAL_MAKE_REF_EX(arg, 2);
+		}
+		ZVAL_REF(param, Z_REF_P(arg));
 	} else {
-		ZVAL_COPY(param, arg);
+		arg = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
+		if (UNEXPECTED(ARG_MUST_BE_SENT_BY_REF(EX(call)->func, opline->op2.num))) {
+			zend_param_must_be_ref(EX(call)->func, opline->op2.num);
+			Z_TRY_ADDREF_P(arg);
+			ZVAL_NEW_REF(param, arg);
+		} else {
+			ZVAL_COPY(param, arg);
+		}
 	}
 
 	FREE_OP1();