Skip to content

Deprecate returning values from __construct() and __destruct() #21982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
TimWolla wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Deprecate returning values from __construct() and __destruct() #21982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Zend/tests/prop_const_expr/non_enums_catchable.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const A_prop = (new A)->{new Printer ? 'printer' : null};

?>
--EXPECTF--
Deprecated: Returning a value from a constructor is deprecated in %s on line %d
Printer

Fatal error: Uncaught Error: Fetching properties on non-enums in constant expressions is not allowed in %s:%d
Expand Down
4 changes: 4 additions & 0 deletions Zend/tests/traits/bug60536_001.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,9 @@ $a->__construct();
echo "DONE";
?>
--EXPECTF--
Deprecated: Returning a value from a constructor is deprecated in %s on line %d

Deprecated: Returning a value from a constructor is deprecated in %s on line %d

Warning: Undefined property: Z::$x in %s on line %d
DONE
22 changes: 16 additions & 6 deletions Zend/zend_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,12 @@ ZEND_API bool zend_is_compiling(void) /* {{{ */
}
/* }}} */

static bool zend_is_constructor(const zend_string *name) /* {{{ */
{
return zend_string_equals_literal_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME);
}
/* }}} */

static zend_always_inline uint32_t get_temporary_variable(void) /* {{{ */
{
return (uint32_t)CG(active_op_array)->T++;
Expand Down Expand Up @@ -5549,12 +5555,6 @@ static void zend_compile_method_call(znode *result, zend_ast *ast, uint32_t type
}
/* }}} */

static bool zend_is_constructor(const zend_string *name) /* {{{ */
{
return zend_string_equals_literal_ci(name, ZEND_CONSTRUCTOR_FUNC_NAME);
}
/* }}} */

static bool is_func_accessible(const zend_function *fbc)
{
if ((fbc->common.fn_flags & ZEND_ACC_PUBLIC) || fbc->common.scope == CG(active_class_entry)) {
Expand Down Expand Up @@ -5993,6 +5993,16 @@ static void zend_compile_return(const zend_ast *ast) /* {{{ */
zend_compile_expr(&expr_node, expr_ast);
}

if (expr_ast) {
if (CG(active_class_entry) != NULL) {
if (zend_is_constructor(CG(active_op_array)->function_name)) {
zend_error(E_DEPRECATED, "Returning a value from a constructor is deprecated");
} else if (zend_string_equals_literal_ci(CG(active_op_array)->function_name, ZEND_DESTRUCTOR_FUNC_NAME)) {
zend_error(E_DEPRECATED, "Returning a value from a destructor is deprecated");
}
}
}

if ((CG(active_op_array)->fn_flags & ZEND_ACC_HAS_FINALLY_BLOCK)
&& (expr_node.op_type == IS_CV || (by_ref && expr_node.op_type == IS_VAR))
&& zend_has_finally()) {
Expand Down
Loading