moar tests

Author: krakjoe

Zend/tests/return_hint/011.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Basic return hints callable
+--FILE--
+<?php
+class foo {
+	public function bar() : callable {
+		return function() {};
+	}
+}
+
+$baz = new foo();
+var_dump($baz->bar());
+?>
+--EXPECTF--
+object(Closure)#%d (%d) {
+  ["this"]=>
+  object(foo)#%d (0) {
+  }
+}
+
+

Zend/tests/return_hint/012.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Basic return hints callable and closures
+--FILE--
+<?php
+class foo {
+	public function bar() : callable {
+		$test = "one";
+		return function() use($test) : ?array {
+			return array($test);
+		};
+	}
+}
+
+$baz = new foo();
+var_dump($baz->bar());
+?>
+--EXPECT--
+object(Closure)#2 (2) {
+  ["static"]=>
+  array(1) {
+    ["test"]=>
+    string(3) "one"
+  }
+  ["this"]=>
+  object(foo)#1 (0) {
+  }
+}

Zend/tests/return_hint/013.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Basic return hints callable and closures errors
+--FILE--
+<?php
+class foo {
+	public function bar() : callable {
+		$test = "one";
+		return function() use($test) : array {
+			return null;
+		};
+	}
+}
+
+$baz = new foo();
+var_dump($func=$baz->bar(), $func());
+?>
+--EXPECT--
+Fatal error: the function {closure} was expected to return array and returned null in %s on line %d
+

Zend/zend_compile.c

@@ -1878,7 +1878,6 @@ void zend_do_function_return_hint(const znode *return_hint, zend_bool allow_null
 				CG(active_op_array)->return_hint.type = Z_TYPE(return_hint->u.constant);
 			}
 		} else {
-			printf("non constant return hint\n");
 			CG(active_op_array)->return_hint.type = IS_OBJECT;
 			CG(active_op_array)->return_hint.class_name_len = Z_STRLEN(return_hint->u.constant);
 			CG(active_op_array)->return_hint.class_name = zend_new_interned_string

Zend/zend_language_parser.y

@@ -862,10 +862,10 @@ expr_without_variable:
 	|	T_PRINT expr  { zend_do_print(&$$, &$2 TSRMLS_CC); }
 	|	T_YIELD { zend_do_yield(&$$, NULL, NULL, 0 TSRMLS_CC); }
 	|	function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
-		'(' parameter_list ')' lexical_vars
+		'(' parameter_list ')' lexical_vars function_return_hint
 		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$1 TSRMLS_CC); $$ = $3; }
 	|	T_STATIC function is_reference { zend_do_begin_lambda_function_declaration(&$$, &$2, $3.op_type, 1 TSRMLS_CC); }
-		'(' parameter_list ')' lexical_vars
+		'(' parameter_list ')' lexical_vars function_return_hint
 		'{' inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$ = $4; }
 ;
 

Zend/zend_vm_def.h

@@ -2872,7 +2872,7 @@ ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
 						"the function %s was expected to return callable and returned %s", 
 						EX(function_state).function->common.function_name, 
 						zend_get_type_by_const(Z_TYPE_P(retval_ptr)));
-				}
+				} break;
 
 				case IS_OBJECT: {
 					zend_class_entry **ce = NULL;

Zend/zend_vm_execute.h

@@ -2618,7 +2618,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG
 						"the function %s was expected to return callable and returned %s",
 						EX(function_state).function->common.function_name,
 						zend_get_type_by_const(Z_TYPE_P(retval_ptr)));
-				}
+				} break;
 
 				case IS_OBJECT: {
 					zend_class_entry **ce = NULL;
@@ -8026,7 +8026,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 						"the function %s was expected to return callable and returned %s",
 						EX(function_state).function->common.function_name,
 						zend_get_type_by_const(Z_TYPE_P(retval_ptr)));
-				}
+				} break;
 
 				case IS_OBJECT: {
 					zend_class_entry **ce = NULL;
@@ -13334,7 +13334,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 						"the function %s was expected to return callable and returned %s",
 						EX(function_state).function->common.function_name,
 						zend_get_type_by_const(Z_TYPE_P(retval_ptr)));
-				}
+				} break;
 
 				case IS_OBJECT: {
 					zend_class_entry **ce = NULL;
@@ -30997,7 +30997,7 @@ static int ZEND_FASTCALL  ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 						"the function %s was expected to return callable and returned %s",
 						EX(function_state).function->common.function_name,
 						zend_get_type_by_const(Z_TYPE_P(retval_ptr)));
-				}
+				} break;
 
 				case IS_OBJECT: {
 					zend_class_entry **ce = NULL;