Skip to content

Rfc: nested classes #5

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

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Rfc: nested classes #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0dc1c19
Add a test that fails
withinboredom Mar 26, 2025
8905724
Add scope to class entries
withinboredom Mar 26, 2025
be18661
modify grammar
withinboredom Mar 26, 2025
d382a7f
namespaces: add support
withinboredom Mar 26, 2025
05686a2
allow for defining nested classes
withinboredom Mar 26, 2025
a06723e
add more tests and fix a memory leak
withinboredom Mar 26, 2025
b369064
add more tests
withinboredom Mar 26, 2025
df7f149
add more tests
withinboredom Mar 26, 2025
d3b3666
add reflection support
withinboredom Mar 26, 2025
0c70dae
rewrite scopes during opcache compilation
withinboredom Mar 26, 2025
369af23
add tests for visibility
withinboredom Mar 26, 2025
7d13444
handle protected/private lookups in outer classes
withinboredom Mar 26, 2025
36c7c52
handle private/protected types in properties
withinboredom Mar 26, 2025
3e14baf
do not elide return checks for private/protected inner classes
withinboredom Mar 26, 2025
977643d
do not elide return checks for private/protected inner classes
withinboredom Mar 26, 2025
f26f1e9
add and update tests
withinboredom Mar 26, 2025
f28513d
handle instantiation protections
withinboredom Mar 26, 2025
8e5f4d9
start keeping track of own nested classes
withinboredom Mar 26, 2025
b9ff2ec
simplify resolution logic
withinboredom Mar 26, 2025
fd69299
keep cased namespace names
withinboredom Mar 26, 2025
7e754b7
add alias tests
withinboredom Mar 27, 2025
f7161a9
add more tests and fix a small visibility issue
withinboredom Mar 30, 2025
9117b02
validate scope is set
withinboredom Mar 30, 2025
2640748
allow enums and traits
withinboredom Mar 30, 2025
10b2f63
only allow enums and fix test
withinboredom Mar 30, 2025
21f7dfc
do not allow private/protected classes on interfaces
withinboredom Mar 30, 2025
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
2 changes: 1 addition & 1 deletion Zend/Optimizer/dfa_pass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ static inline bool can_elide_list_type(
zend_string *lcname = zend_string_tolower(ZEND_TYPE_NAME(*single_type));
zend_class_entry *ce = zend_optimizer_get_class_entry(script, op_array, lcname);
zend_string_release(lcname);
bool result = ce && safe_instanceof(use_info->ce, ce);
bool result = ce && !ce->required_scope && safe_instanceof(use_info->ce, ce);
if (result == !is_intersection) {
return result;
}
Expand Down
2 changes: 1 addition & 1 deletion Zend/tests/errmsg/errmsg_027.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ class test {
echo "Done\n";
?>
--EXPECTF--
Fatal error: Class declarations may not be nested in %s on line %d
Fatal error: Class declarations may not be declared inside functions in %s on line %d
4 changes: 4 additions & 0 deletions Zend/zend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ struct _zend_class_entry {
HashTable properties_info;
HashTable constants_table;

zend_class_entry *required_scope;
zend_class_entry *lexical_scope;
bool required_scope_absolute;

ZEND_MAP_PTR_DEF(zend_class_mutable_data*, mutable_data);
zend_inheritance_cache_entry *inheritance_cache;

Expand Down
29 changes: 29 additions & 0 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1816,6 +1816,35 @@ static zend_always_inline zend_result _object_and_properties_init(zval *arg, zen
return FAILURE;
}

const zend_class_entry *check_class = class_type;
const zend_class_entry *scope = zend_get_executed_scope();
check_lexical_scope:
if (check_class->required_scope) {
if (UNEXPECTED(scope == NULL)) {
zend_type_error("Cannot instantiate class %s from the global scope", ZSTR_VAL(class_type->name));
ZVAL_NULL(arg);
Z_OBJ_P(arg) = NULL;
return FAILURE;
}

if (check_class->required_scope_absolute) {
if (scope != check_class->required_scope && scope->lexical_scope != check_class->required_scope) {
zend_type_error("Cannot instantiate private class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
ZVAL_NULL(arg);
Z_OBJ_P(arg) = NULL;
return FAILURE;
}
} else if (!instanceof_function(scope, class_type->required_scope) && !instanceof_function(scope->lexical_scope, class_type->required_scope)) {
zend_type_error("Cannot instantiate protected class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
}
Comment on lines +1838 to +1839
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Return after throwing the type error for protected classes.

Currently, the code calls zend_type_error() at line 1838 but does not set arg to NULL or return immediately. The engine will still throw an exception, but for parallelism with the private-class block, consider returning right away to keep the logic uniform and prevent any unexpected continuation of object creation.

Apply this diff to mirror the private-class pattern:

-            zend_type_error("Cannot instantiate protected class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
+            zend_type_error("Cannot instantiate protected class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
+            ZVAL_NULL(arg);
+            Z_OBJ_P(arg) = NULL;
+            return FAILURE;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
zend_type_error("Cannot instantiate protected class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
}
zend_type_error("Cannot instantiate protected class %s from scope %s", ZSTR_VAL(class_type->name), ZSTR_VAL(scope->name));
ZVAL_NULL(arg);
Z_OBJ_P(arg) = NULL;
return FAILURE;
}

}

// preloading may have changed the class type from ZEND_NAMESPACE_CLASS, so we need to check for user/internal class
if (check_class != scope && check_class->lexical_scope && (check_class->lexical_scope->type == ZEND_USER_CLASS || check_class->lexical_scope->type == ZEND_INTERNAL_CLASS)) {
check_class = check_class->lexical_scope;
goto check_lexical_scope;
}

if (UNEXPECTED(!(class_type->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
if (UNEXPECTED(zend_update_class_constants(class_type) != SUCCESS)) {
ZVAL_NULL(arg);
Expand Down
Loading
Loading