Some fixes

Author: kocsismate

Zend/tests/type_declarations/typed_class_constants_type_error8.phpt

@@ -1,23 +1,29 @@
 --TEST--
-Typed class constants (declaration; enums)
+Typed enum constants (self/static)
 --FILE--
 <?php
 enum E {
-    const E FooConst = E::Foo;
+    public const E CONST1 = E::Foo;
+    public const self CONST2 = E::Foo;
+    public const static CONST3 = E::Foo;
 
     case Foo;
 }
 
 class A {
-    public const E CONST1 = E::Foo;
-    public const E CONST2 = E::FooConst;
+    public const E ENUM_CONST = E::Foo;
+    public const E CONST1 = E::CONST1;
+    public const E CONST2 = E::CONST2;
+    public const E CONST3 = E::CONST3;
 }
 
-var_dump(E::FooConst);
+var_dump(A::ENUM_CONST);
 var_dump(A::CONST1);
 var_dump(A::CONST2);
+var_dump(A::CONST3);
 ?>
---EXPECTF--
+--EXPECT--
+enum(E::Foo)
 enum(E::Foo)
 enum(E::Foo)
 enum(E::Foo)

Zend/tests/type_declarations/typed_class_constants_type_success3.phpt

@@ -7714,7 +7714,7 @@ static void zend_compile_class_const_decl(zend_ast *ast, uint32_t flags, zend_as
 
 			uint32_t type_mask = ZEND_TYPE_PURE_MASK(type);
 
-			if (type_mask != MAY_BE_ANY && (type_mask & (MAY_BE_CALLABLE|MAY_BE_VOID|MAY_BE_NEVER|MAY_BE_STATIC))) {
+			if (type_mask != MAY_BE_ANY && (type_mask & (MAY_BE_CALLABLE|MAY_BE_VOID|MAY_BE_NEVER))) {
 				zend_string *type_str = zend_type_to_string(type);
 
 				zend_error_noreturn(E_COMPILE_ERROR, "Class constant %s::%s cannot have type %s",

Zend/zend_compile.c

@@ -1471,7 +1471,7 @@ static ZEND_COLD void zend_verify_missing_return_type(const zend_function *zf)
 	zend_verify_return_error(zf, NULL);
 }
 
-zend_bool zend_never_inline zend_verify_class_constant_type(const zend_class_constant *c, zval *constant)
+bool zend_never_inline zend_verify_class_constant_type(const zend_class_constant *c, zval *constant)
 {
 	if (zend_check_type((zend_type *) &c->type, constant, NULL, NULL, /* is_return_type */ 1, /* is_internal_arg */ 0)) {
 		return 1;

Zend/zend_execute.c

@@ -462,7 +462,7 @@ ZEND_API int ZEND_FASTCALL zend_handle_undef_args(zend_execute_data *call);
 #define ZEND_CLASS_HAS_TYPE_HINTS(ce) ((ce->ce_flags & ZEND_ACC_HAS_TYPE_HINTS) == ZEND_ACC_HAS_TYPE_HINTS)
 
 
-zend_bool zend_verify_class_constant_type(const zend_class_constant *c, zval *constant);
+bool zend_verify_class_constant_type(const zend_class_constant *c, zval *constant);
 ZEND_COLD void zend_verify_class_constant_type_error(const zend_class_constant *c, const zval *constant);
 
 ZEND_API bool zend_verify_property_type(const zend_property_info *info, zval *property, bool strict);