assert() special case

Author: arnaud-lb

Zend/tests/partial_application/assert.phpt

@@ -0,0 +1,35 @@
+--TEST--
+PFA of assert() behaves like a dynamic call to assert()
+--FILE--
+<?php
+
+try {
+    echo "# Static call:\n";
+    assert(false);
+} catch (Error $e) {
+    echo $e::class, ": ", $e->getMessage(), "\n";
+}
+
+try {
+    echo "# Dynamic call:\n";
+    (function ($f) { $f(false); })('assert');
+} catch (Error $e) {
+    echo $e::class, ": ", $e->getMessage() ?: '(no message)', "\n";
+}
+
+try {
+    echo "# PFA call:\n";
+    $f = assert(?);
+    $f(false);
+} catch (Error $e) {
+    echo $e::class, ": ", $e->getMessage() ?: '(no message)', "\n";
+}
+
+?>
+--EXPECT--
+# Static call:
+AssertionError: assert(false)
+# Dynamic call:
+AssertionError: (no message)
+# PFA call:
+AssertionError: (no message)

Zend/zend_partial.c

@@ -492,8 +492,18 @@ zend_ast *zp_compile_forwarding_call(
 	bool forward_superfluous_args,
 	zend_ast *stmts_ast)
 {
+	bool is_assert = zend_string_equals(function->common.function_name,
+			ZSTR_KNOWN(ZEND_STR_ASSERT));
+
 	/* Generate function body */
+
 	zend_ast *args_ast = zend_ast_create_list(0, ZEND_AST_ARG_LIST);
+
+	if (is_assert) {
+		args_ast = zend_ast_list_add(args_ast,
+				zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_ASSERT)));
+	}
+
 	for (uint32_t offset = 0; offset < argc; offset++) {
 		if (Z_ISUNDEF(argv[offset])) {
 			/* Argument was not passed. Pass its default value. */
@@ -556,7 +566,11 @@ zend_ast *zp_compile_forwarding_call(
 	}
 
 	zend_ast *call_ast;
-	if (function->common.fn_flags & ZEND_ACC_CLOSURE) {
+	if (is_assert) {
+		zend_ast *func_name_ast = zend_ast_create_zval_from_str(ZSTR_KNOWN(ZEND_STR_CALL_USER_FUNC));
+		func_name_ast->attr = ZEND_NAME_FQ;
+		call_ast = zend_ast_create(ZEND_AST_CALL, func_name_ast, args_ast);
+	} else if (function->common.fn_flags & ZEND_ACC_CLOSURE) {
 		zend_ast *fn_ast = zend_ast_create(ZEND_AST_VAR,
 					zend_ast_create_zval_from_str(zend_string_copy(param_names[argc + variadic_partial + (extra_named_params != NULL)])));
 		call_ast = zend_ast_create(ZEND_AST_CALL, fn_ast, args_ast);

Zend/zend_string.h

@@ -635,6 +635,8 @@ EMPTY_SWITCH_DEFAULT_CASE()
 	_(ZEND_STR_FUNC_GET_ARG,           "func_get_arg") \
 	_(ZEND_STR_COMPACT,                "compact") \
 	_(ZEND_STR_EXTRACT,                "extract") \
+	_(ZEND_STR_ASSERT,                 "assert") \
+	_(ZEND_STR_CALL_USER_FUNC,         "call_user_func") \
 	_(ZEND_STR_ARRAY_SLICE,            "array_slice") \
 	_(ZEND_STR_SENSITIVEPARAMETER,     "SensitiveParameter") \
 	_(ZEND_STR_CONST_EXPR_PLACEHOLDER, "[constant expression]") \