Disallow nullable mixed types at compile time

Majkl578 · Majkl578 · commit e1142bb60845 · 2017-07-06T23:22:36.000+02:00
diff --git a/Zend/tests/typehints/mixed_nullable_parameter.phpt b/Zend/tests/typehints/mixed_nullable_parameter.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test nullable mixed parameter type.
+--FILE--
+<?php
+
+function test(?mixed $arg) {
+}
+
+--EXPECTF--
+Fatal error: Mixed type cannot be nullable in %smixed_nullable_parameter.php on line %d
diff --git a/Zend/tests/typehints/mixed_nullable_return.phpt b/Zend/tests/typehints/mixed_nullable_return.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Test nullable mixed return type.
+--FILE--
+<?php
+
+function test($arg): ?mixed {
+}
+
+--EXPECTF--
+Fatal error: Mixed type cannot be nullable in %smixed_nullable_return.php on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -5441,6 +5441,10 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 			zend_error_noreturn(E_COMPILE_ERROR, "Void type cannot be nullable");
 		}
 
+		if (ZEND_TYPE_CODE(arg_infos->type) == IS_MIXED && ZEND_TYPE_ALLOW_NULL(arg_infos->type)) {
+			zend_error_noreturn(E_COMPILE_ERROR, "Mixed type cannot be nullable");
+		}
+
 		arg_infos++;
 		op_array->fn_flags |= ZEND_ACC_HAS_RETURN_TYPE;
 	} else {
@@ -5535,6 +5539,10 @@ void zend_compile_params(zend_ast *ast, zend_ast *return_type_ast) /* {{{ */
 				zend_error_noreturn(E_COMPILE_ERROR, "void cannot be used as a parameter type");
 			}
 
+			if (ZEND_TYPE_CODE(arg_info->type) == IS_MIXED && ZEND_TYPE_ALLOW_NULL(arg_info->type)) {
+				zend_error_noreturn(E_COMPILE_ERROR, "Mixed type cannot be nullable");
+			}
+
 			if (type_ast->kind == ZEND_AST_TYPE) {
 				if (ZEND_TYPE_CODE(arg_info->type) == IS_ARRAY) {
 					if (default_ast && !has_null_default
diff --git a/errors.log b/errors.log
@@ -0,0 +1 @@
+[06-Jul-2017 21:06:40 UTC] PHP Deprecated:  Directive 'track_errors' is deprecated in Unknown on line 0
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
diff --git a/run_002_tmp.fixture b/run_002_tmp.fixture

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[06-Jul-2017 21:06:40 UTC] PHP Deprecated: Directive 'track_errors' is deprecated in Unknown on line 0`