Implement static classes

oplanre · Bilge · commit 8b13efc00ece · 2024-07-08T22:06:01.000+01:00
diff --git a/Zend/Optimizer/escape_analysis.c b/Zend/Optimizer/escape_analysis.c
@@ -162,7 +162,7 @@ static bool is_allocation_def(zend_op_array *op_array, zend_ssa *ssa, int def, i
 					script, op_array, opline);
 				uint32_t forbidden_flags =
 					/* These flags will always cause an exception */
-					ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS
+					ZEND_ACC_STATIC | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS
 					| ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT;
 				if (ce
 				 && !ce->parent
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -1795,13 +1795,15 @@ ZEND_API void object_properties_load(zend_object *object, HashTable *properties)
  * calling zend_merge_properties(). */
 static zend_always_inline zend_result _object_and_properties_init(zval *arg, zend_class_entry *class_type, HashTable *properties) /* {{{ */
 {
-	if (UNEXPECTED(class_type->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS|ZEND_ACC_ENUM))) {
+	if (UNEXPECTED(class_type->ce_flags & (ZEND_ACC_STATIC|ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS|ZEND_ACC_ENUM))) {
 		if (class_type->ce_flags & ZEND_ACC_INTERFACE) {
 			zend_throw_error(NULL, "Cannot instantiate interface %s", ZSTR_VAL(class_type->name));
 		} else if (class_type->ce_flags & ZEND_ACC_TRAIT) {
 			zend_throw_error(NULL, "Cannot instantiate trait %s", ZSTR_VAL(class_type->name));
 		} else if (class_type->ce_flags & ZEND_ACC_ENUM) {
 			zend_throw_error(NULL, "Cannot instantiate enum %s", ZSTR_VAL(class_type->name));
+		} else if (class_type->ce_flags & ZEND_ACC_STATIC) {
+			zend_throw_error(NULL, "Cannot instantiate static class %s", ZSTR_VAL(class_type->name));
 		} else {
 			zend_throw_error(NULL, "Cannot instantiate abstract class %s", ZSTR_VAL(class_type->name));
 		}
diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
@@ -1837,6 +1837,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
 				if (decl->flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) {
 					smart_str_appends(str, "abstract ");
 				}
+				if (decl->flags & ZEND_ACC_STATIC) {
+					smart_str_appends(str, "static ");
+				}
 				if (decl->flags & ZEND_ACC_FINAL) {
 					smart_str_appends(str, "final ");
 				}
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -931,6 +931,7 @@ uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
 			"Multiple abstract modifiers are not allowed", 0);
 		return 0;
 	}
+
 	if ((flags & ZEND_ACC_FINAL) && (new_flag & ZEND_ACC_FINAL)) {
 		zend_throw_exception(zend_ce_compile_error, "Multiple final modifiers are not allowed", 0);
 		return 0;
@@ -944,6 +945,12 @@ uint32_t zend_add_class_modifier(uint32_t flags, uint32_t new_flag) /* {{{ */
 			"Cannot use the final modifier on an abstract class", 0);
 		return 0;
 	}
+	if ((flags & ZEND_ACC_STATIC) && (new_flag & ZEND_ACC_STATIC)) {
+		zend_throw_exception(zend_ce_compile_error,
+			"Multiple static modifiers are not allowed", 0);
+		return 0;
+	}
+
 	return new_flags;
 }
 /* }}} */
@@ -960,6 +967,10 @@ uint32_t zend_add_anonymous_class_modifier(uint32_t flags, uint32_t new_flag)
 		zend_throw_exception(zend_ce_compile_error, "Cannot use the final modifier on an anonymous class", 0);
 		return 0;
 	}
+	if (new_flag & ZEND_ACC_STATIC) {
+		zend_throw_exception(zend_ce_compile_error, "Cannot use the static modifier on an anonymous class", 0);
+		return 0;
+	}
 	if ((flags & ZEND_ACC_READONLY_CLASS) && (new_flag & ZEND_ACC_READONLY_CLASS)) {
 		zend_throw_exception(zend_ce_compile_error, "Multiple readonly modifiers are not allowed", 0);
 		return 0;
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -617,6 +617,7 @@ class_modifier:
 		T_ABSTRACT 		{ $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }
 	|	T_FINAL 		{ $$ = ZEND_ACC_FINAL; }
 	|	T_READONLY 		{ $$ = ZEND_ACC_READONLY_CLASS|ZEND_ACC_NO_DYNAMIC_PROPERTIES; }
+	|	T_STATIC 		{ $$ = ZEND_ACC_STATIC; }
 ;
 
 trait_declaration_statement:
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
@@ -758,7 +758,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags
 		if (ce == NULL) {
 			ce = zend_standard_class_def;
 		}
-		if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) {
+		if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_STATIC|ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) {
 			zend_throw_error(NULL, "Class %s cannot be instantiated", ZSTR_VAL(ce->name));
 			RETURN_THROWS();
 		}
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -348,6 +348,9 @@ static void _class_string(smart_str *str, zend_class_entry *ce, zval *obj, char
 		if (ce->ce_flags & ZEND_ACC_READONLY_CLASS) {
 			smart_str_append_printf(str, "readonly ");
 		}
+		if (ce->ce_flags & ZEND_ACC_STATIC) {
+			smart_str_append_printf(str, "static ");
+		}
 		smart_str_append_printf(str, "class ");
 	}
 	smart_str_append_printf(str, "%s", ZSTR_VAL(ce->name));
@@ -4934,7 +4937,7 @@ ZEND_METHOD(ReflectionClass, isInstantiable)
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT_PTR(ce);
-	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
+	if (ce->ce_flags & (ZEND_ACC_STATIC | ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
 		RETURN_FALSE;
 	}
 
@@ -4959,7 +4962,7 @@ ZEND_METHOD(ReflectionClass, isCloneable)
 		RETURN_THROWS();
 	}
 	GET_REFLECTION_OBJECT_PTR(ce);
-	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
+	if (ce->ce_flags & (ZEND_ACC_STATIC | ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
 		RETURN_FALSE;
 	}
 	if (!Z_ISUNDEF(intern->obj)) {
@@ -5028,7 +5031,7 @@ ZEND_METHOD(ReflectionClass, getModifiers)
 {
 	reflection_object *intern;
 	zend_class_entry *ce;
-	uint32_t keep_flags = ZEND_ACC_FINAL | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_READONLY_CLASS;
+	uint32_t keep_flags = ZEND_ACC_STATIC | ZEND_ACC_FINAL | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_READONLY_CLASS;
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		RETURN_THROWS();
@@ -5433,7 +5436,7 @@ ZEND_METHOD(ReflectionClass, isIterable)
 
 	GET_REFLECTION_OBJECT_PTR(ce);
 
-	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS |
+	if (ce->ce_flags & (ZEND_ACC_STATIC | ZEND_ACC_INTERFACE | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS |
 	                    ZEND_ACC_TRAIT     | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
 		RETURN_FALSE;
 	}
diff --git a/ext/reflection/php_reflection.stub.php b/ext/reflection/php_reflection.stub.php
@@ -249,6 +249,8 @@ class ReflectionClass implements Reflector
     public const int IS_FINAL = UNKNOWN;
     /** @cvalue ZEND_ACC_READONLY_CLASS */
     public const int IS_READONLY = UNKNOWN;
+    /** @cvalue ZEND_ACC_STATIC */
+    public const int IS_STATIC = UNKNOWN;
 
     public string $name;
 
diff --git a/ext/reflection/php_reflection_arginfo.h b/ext/reflection/php_reflection_arginfo.h
diff --git a/main/streams/userspace.c b/main/streams/userspace.c
@@ -260,7 +260,7 @@ static zend_result call_method_if_exists(
 
 static void user_stream_create_object(struct php_user_stream_wrapper *uwrap, php_stream_context *context, zval *object)
 {
-	if (uwrap->ce->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
+	if (uwrap->ce->ce_flags & (ZEND_ACC_STATIC|ZEND_ACC_INTERFACE|ZEND_ACC_TRAIT|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {
 		ZVAL_UNDEF(object);
 		return;
 	}

Original file line number	Diff line number	Diff line change
`@@ -1837,6 +1837,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str str, zend_ast ast, int prio`
`1837`	`1837`	`if (decl->flags & ZEND_ACC_EXPLICIT_ABSTRACT_CLASS) {`
`1838`	`1838`	`smart_str_appends(str, "abstract ");`
`1839`	`1839`	`}`
	`1840`	`+ if (decl->flags & ZEND_ACC_STATIC) {`
	`1841`	`+ smart_str_appends(str, "static ");`
	`1842`	`+ }`
`1840`	`1843`	`if (decl->flags & ZEND_ACC_FINAL) {`
`1841`	`1844`	`smart_str_appends(str, "final ");`
`1842`	`1845`	`}`
Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,7 @@ class_modifier:`
`617`	`617`	`T_ABSTRACT { $$ = ZEND_ACC_EXPLICIT_ABSTRACT_CLASS; }`
`618`	`618`	`\| T_FINAL { $$ = ZEND_ACC_FINAL; }`
`619`	`619`	`\| T_READONLY { $$ = ZEND_ACC_READONLY_CLASS\|ZEND_ACC_NO_DYNAMIC_PROPERTIES; }`
	`620`	`+ \| T_STATIC { $$ = ZEND_ACC_STATIC; }`
`620`	`621`	`;`
`621`	`622`
`622`	`623`	`trait_declaration_statement:`
Original file line number	Diff line number	Diff line change
`@@ -758,7 +758,7 @@ void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flags`
`758`	`758`	`if (ce == NULL) {`
`759`	`759`	`ce = zend_standard_class_def;`
`760`	`760`	`}`
`761`		`- if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_INTERFACE\|ZEND_ACC_TRAIT\|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS\|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) {`
	`761`	`+ if (UNEXPECTED(ce->ce_flags & (ZEND_ACC_STATIC\|ZEND_ACC_INTERFACE\|ZEND_ACC_TRAIT\|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS\|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS))) {`
`762`	`762`	`zend_throw_error(NULL, "Class %s cannot be instantiated", ZSTR_VAL(ce->name));`
`763`	`763`	`RETURN_THROWS();`
`764`	`764`	`}`
Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,9 @@ static void _class_string(smart_str str, zend_class_entry ce, zval *obj, char`
`348`	`348`	`if (ce->ce_flags & ZEND_ACC_READONLY_CLASS) {`
`349`	`349`	`smart_str_append_printf(str, "readonly ");`
`350`	`350`	`}`
	`351`	`+ if (ce->ce_flags & ZEND_ACC_STATIC) {`
	`352`	`+ smart_str_append_printf(str, "static ");`
	`353`	`+ }`
`351`	`354`	`smart_str_append_printf(str, "class ");`
`352`	`355`	`}`
`353`	`356`	`smart_str_append_printf(str, "%s", ZSTR_VAL(ce->name));`
`@@ -4934,7 +4937,7 @@ ZEND_METHOD(ReflectionClass, isInstantiable)`
`4934`	`4937`	`RETURN_THROWS();`
`4935`	`4938`	`}`
`4936`	`4939`	`GET_REFLECTION_OBJECT_PTR(ce);`
`4937`		`- if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
	`4940`	`+ if (ce->ce_flags & (ZEND_ACC_STATIC \| ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
`4938`	`4941`	`RETURN_FALSE;`
`4939`	`4942`	`}`
`4940`	`4943`
`@@ -4959,7 +4962,7 @@ ZEND_METHOD(ReflectionClass, isCloneable)`
`4959`	`4962`	`RETURN_THROWS();`
`4960`	`4963`	`}`
`4961`	`4964`	`GET_REFLECTION_OBJECT_PTR(ce);`
`4962`		`- if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
	`4965`	`+ if (ce->ce_flags & (ZEND_ACC_STATIC \| ZEND_ACC_INTERFACE \| ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \| ZEND_ACC_ENUM)) {`
`4963`	`4966`	`RETURN_FALSE;`
`4964`	`4967`	`}`
`4965`	`4968`	`if (!Z_ISUNDEF(intern->obj)) {`
`@@ -5028,7 +5031,7 @@ ZEND_METHOD(ReflectionClass, getModifiers)`
`5028`	`5031`	`{`
`5029`	`5032`	`reflection_object *intern;`
`5030`	`5033`	`zend_class_entry *ce;`
`5031`		`- uint32_t keep_flags = ZEND_ACC_FINAL \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_READONLY_CLASS;`
	`5034`	`+ uint32_t keep_flags = ZEND_ACC_STATIC \| ZEND_ACC_FINAL \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS \| ZEND_ACC_READONLY_CLASS;`
`5032`	`5035`
`5033`	`5036`	`if (zend_parse_parameters_none() == FAILURE) {`
`5034`	`5037`	`RETURN_THROWS();`
`@@ -5433,7 +5436,7 @@ ZEND_METHOD(ReflectionClass, isIterable)`
`5433`	`5436`
`5434`	`5437`	`GET_REFLECTION_OBJECT_PTR(ce);`
`5435`	`5438`
`5436`		`- if (ce->ce_flags & (ZEND_ACC_INTERFACE \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \|`
	`5439`	`+ if (ce->ce_flags & (ZEND_ACC_STATIC \| ZEND_ACC_INTERFACE \| ZEND_ACC_IMPLICIT_ABSTRACT_CLASS \|`
`5437`	`5440`	`ZEND_ACC_TRAIT \| ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {`
`5438`	`5441`	`RETURN_FALSE;`
`5439`	`5442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ static zend_result call_method_if_exists(`
`260`	`260`
`261`	`261`	`static void user_stream_create_object(struct php_user_stream_wrapper uwrap, php_stream_context context, zval *object)`
`262`	`262`	`{`
`263`		`- if (uwrap->ce->ce_flags & (ZEND_ACC_INTERFACE\|ZEND_ACC_TRAIT\|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS\|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {`
	`263`	`+ if (uwrap->ce->ce_flags & (ZEND_ACC_STATIC\|ZEND_ACC_INTERFACE\|ZEND_ACC_TRAIT\|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS\|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) {`
`264`	`264`	`ZVAL_UNDEF(object);`
`265`	`265`	`return;`
`266`	`266`	`}`