Don't throw deprecation for poor-mans nullable types

Author: nikic

Zend/tests/bug71428.3.phpt

@@ -7,6 +7,4 @@ class B           {  public function m(A $a = NULL, $n) { echo "B.m";} };
 class C extends B {  public function m(A $a       , $n) { echo "C.m";} };
 ?>
 --EXPECTF--
-Deprecated: Required parameter $n follows optional parameter in %s on line %d
-
 Fatal error: Declaration of C::m(A $a, $n) must be compatible with B::m(?A $a, $n) in %sbug71428.3.php on line 4

Zend/tests/call_user_func_005.phpt

@@ -18,7 +18,7 @@ var_dump(call_user_func(array('foo', 'teste')));
 
 ?>
 --EXPECTF--
-Deprecated: Required parameter $b follows optional parameter in %s on line %d
+Deprecated: Required parameter $b follows optional parameter $a in %s on line %d
 string(1) "x"
 array(1) {
   [0]=>

Zend/tests/required_param_after_optional.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Required parameter after optional is deprecated
+--FILE--
+<?php
+
+function test($testA = null, $testB = null, $testC) {}
+function test2(Type $test2A = null, $test2B = null, $test2C) {}
+function test3(Type $test3A = null, Type2 $test3B = null, $test3C) {}
+
+?>
+--EXPECTF--
+Deprecated: Required parameter $testC follows optional parameter $testA in %s on line %d
+
+Deprecated: Required parameter $test2C follows optional parameter $test2B in %s on line %d

Zend/zend_compile.c

@@ -5679,7 +5679,7 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 	uint32_t i;
 	zend_op_array *op_array = CG(active_op_array);
 	zend_arg_info *arg_infos;
-	zend_bool have_optional_param = 0;
+	zend_string *optional_param = NULL;
 
 	if (return_type_ast) {
 		/* Use op_array->arg_info[-1] for return type */
@@ -5748,14 +5748,23 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 			default_node.op_type = IS_CONST;
 			zend_const_expr_to_zval(&default_node.u.constant, default_ast);
 			CG(compiler_options) = cops;
-			have_optional_param = 1;
+
+			if (!optional_param) {
+				/* Ignore parameters of the form "Type $param = null".
+				 * This is the PHP 5 style way of writing "?Type $param", so allow it for now. */
+				zend_bool is_implicit_nullable =
+					type_ast && Z_TYPE(default_node.u.constant) == IS_NULL;
+				if (!is_implicit_nullable) {
+					optional_param = name;
+				}
+			}
 		} else {
 			opcode = ZEND_RECV;
 			default_node.op_type = IS_UNUSED;
 			op_array->required_num_args = i + 1;
-			if (have_optional_param) {
-				zend_error(E_DEPRECATED, "Required parameter $%s follows optional parameter",
-					ZSTR_VAL(name));
+			if (optional_param) {
+				zend_error(E_DEPRECATED, "Required parameter $%s follows optional parameter $%s",
+					ZSTR_VAL(name), ZSTR_VAL(optional_param));
 			}
 		}
 

ext/reflection/tests/bug62715.phpt

@@ -17,7 +17,7 @@ foreach ($r->getParameters() as $p) {
 }
 ?>
 --EXPECTF--
-Deprecated: Required parameter $c follows optional parameter in %s on line %d
+Deprecated: Required parameter $c follows optional parameter $b in %s on line %d
 bool(true)
 bool(true)
 bool(false)