Added mixed argument type & return type

Majkl578 · Majkl578 · commit 336ca0967928 · 2017-07-06T22:25:13.000+02:00
diff --git a/Zend/tests/typehints/mixed.phpt b/Zend/tests/typehints/mixed.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Test various types passed to mixed type.
+--FILE--
+<?php
+
+$types = [
+	NULL,
+	TRUE,
+	123,
+	123.456,
+	'php',
+	new stdClass,
+	fopen(__FILE__, 'r'),
+];
+
+function test(mixed $arg) {
+	var_dump($arg);
+}
+
+foreach ($types as $type) {
+	test($type);
+}
+--EXPECTF--
+NULL
+bool(true)
+int(123)
+float(123.456)
+string(3) "php"
+object(stdClass)#%d (%d) {
+}
+resource(%d) of type (stream)
diff --git a/Zend/tests/typehints/mixed_inheritance.phpt b/Zend/tests/typehints/mixed_inheritance.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Test mixed variance in inheritance.
+--FILE--
+<?php
+
+class Foo {
+	function test(mixed $arg): mixed
+	{
+		return $arg;
+	}
+}
+
+class Bar extends Foo {
+	function test($arg) {
+		return parent::test($arg);
+	}
+}
+
+class Baz extends bar {
+	function test(mixed $arg): mixed {
+		return parent::test($arg);
+	}
+}
+
+var_dump((new Baz())->test(123));
+--EXPECT--
+int(123)
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -189,6 +189,8 @@ ZEND_API char *zend_get_type_by_const(int type) /* {{{ */
 			return "array";
 		case IS_VOID:
 			return "void";
+		case IS_MIXED:
+			return "mixed";
 		default:
 			return "unknown";
 	}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -163,6 +163,7 @@ static const struct reserved_class_name reserved_class_names[] = {
 	{ZEND_STRL("void")},
 	{ZEND_STRL("iterable")},
 	{ZEND_STRL("object")},
+	{ZEND_STRL("mixed")},
 	{NULL, 0}
 };
 
@@ -209,6 +210,7 @@ static const builtin_type_info builtin_types[] = {
 	{ZEND_STRL("void"), IS_VOID},
 	{ZEND_STRL("iterable"), IS_ITERABLE},
 	{ZEND_STRL("object"), IS_OBJECT},
+	{ZEND_STRL("mixed"), IS_MIXED},
 	{NULL, 0, IS_UNDEF}
 };
 
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -859,6 +859,8 @@ static zend_always_inline zend_bool zend_check_type(
 	} else if (ZEND_TYPE_CODE(type) == _IS_BOOL &&
 			   EXPECTED(Z_TYPE_P(arg) == IS_FALSE || Z_TYPE_P(arg) == IS_TRUE)) {
 		return 1;
+	} else if (ZEND_TYPE_CODE(type) == IS_MIXED) {
+		return 1;
 	} else {
 		return zend_verify_scalar_type_hint(ZEND_TYPE_CODE(type), arg,
 			is_return_type ? ZEND_RET_USES_STRICT_TYPES() : ZEND_ARG_USES_STRICT_TYPES());
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
@@ -253,7 +253,10 @@ static int zend_do_perform_arg_type_hint_check(const zend_function *fe, zend_arg
 	}
 
 	if (!ZEND_TYPE_IS_SET(proto_arg_info->type)) {
-		/* Child defines a type, but parent doesn't, violates LSP */
+		/* Child defines a type, but parent doesn't, violates LSP, unless it's a mixed type */
+		if (ZEND_TYPE_CODE(fe_arg_info->type) == IS_MIXED) {
+			return 1;
+		}
 		return 0;
 	}
 
@@ -359,6 +362,9 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 	if (proto->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 		/* Removing a return type is not valid. */
 		if (!(fe->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) {
+			if (ZEND_TYPE_CODE(proto->common.arg_info[-1].type) == IS_MIXED) {
+				return 1;
+			}
 			return 0;
 		}
 
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
@@ -379,6 +379,7 @@ struct _zend_ast_ref {
 #define _IS_BOOL					13
 #define IS_CALLABLE					14
 #define IS_ITERABLE					19
+#define IS_MIXED					21
 #define IS_VOID						18
 
 /* internal types */

Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,8 @@ ZEND_API char zend_get_type_by_const(int type) / {{{ */`
`189`	`189`	`return "array";`
`190`	`190`	`case IS_VOID:`
`191`	`191`	`return "void";`
	`192`	`+ case IS_MIXED:`
	`193`	`+ return "mixed";`
`192`	`194`	`default:`
`193`	`195`	`return "unknown";`
`194`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,10 @@ static int zend_do_perform_arg_type_hint_check(const zend_function *fe, zend_arg`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`if (!ZEND_TYPE_IS_SET(proto_arg_info->type)) {`
`256`		`- /* Child defines a type, but parent doesn't, violates LSP */`
	`256`	`+ /* Child defines a type, but parent doesn't, violates LSP, unless it's a mixed type */`
	`257`	`+ if (ZEND_TYPE_CODE(fe_arg_info->type) == IS_MIXED) {`
	`258`	`+ return 1;`
	`259`	`+ }`
`257`	`260`	`return 0;`
`258`	`261`	`}`
`259`	`262`
`@@ -359,6 +362,9 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c`
`359`	`362`	`if (proto->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {`
`360`	`363`	`/* Removing a return type is not valid. */`
`361`	`364`	`if (!(fe->common.fn_flags & ZEND_ACC_HAS_RETURN_TYPE)) {`
	`365`	`+ if (ZEND_TYPE_CODE(proto->common.arg_info[-1].type) == IS_MIXED) {`
	`366`	`+ return 1;`
	`367`	`+ }`
`362`	`368`	`return 0;`
`363`	`369`	`}`
`364`	`370`