Fixes

Author: kocsismate

Zend/tests/type_declarations/typed_class_constants_type_error2.phpt

@@ -13,6 +13,14 @@ try {
 } catch (TypeError $exception) {
     echo $exception->getMessage() . "\n";
 }
+
+try {
+    var_dump(A::CONST1);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 ?>
 --EXPECT--
 Cannot assign string to class constant A::CONST1 of type int
+Cannot assign string to class constant A::CONST1 of type int

Zend/tests/type_declarations/typed_class_constants_type_error3.phpt

@@ -8,6 +8,12 @@ class A {
 
 define('C', new stdClass);
 
+try {
+    var_dump(A::CONST1);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 try {
     var_dump(A::CONST1);
 } catch (TypeError $exception) {
@@ -16,3 +22,4 @@ try {
 ?>
 --EXPECT--
 Cannot assign stdClass to class constant A::CONST1 of type string
+Cannot assign stdClass to class constant A::CONST1 of type string

Zend/tests/type_declarations/typed_class_constants_type_error7.phpt

@@ -8,6 +8,12 @@ class A {
 
 define("C", new stdClass);
 
+try {
+    var_dump(A::CONST1);
+} catch (TypeError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 try {
     var_dump(A::CONST1);
 } catch (TypeError $exception) {
@@ -16,3 +22,4 @@ try {
 ?>
 --EXPECT--
 Cannot assign stdClass to class constant A::CONST1 of type stdClass&Stringable
+Cannot assign stdClass to class constant A::CONST1 of type stdClass&Stringable

Zend/tests/type_declarations/typed_class_constants_type_success1.phpt

@@ -17,27 +17,50 @@ class A {
 }
 
 var_dump(A::CONST1);
+var_dump(A::CONST1);
+var_dump(A::CONST2);
 var_dump(A::CONST2);
 var_dump(A::CONST3);
+var_dump(A::CONST3);
 var_dump(A::CONST4);
+var_dump(A::CONST4);
+var_dump(A::CONST5);
 var_dump(A::CONST5);
 var_dump(A::CONST6);
+var_dump(A::CONST6);
 var_dump(A::CONST7);
+var_dump(A::CONST7);
+var_dump(A::CONST8);
 var_dump(A::CONST8);
 var_dump(A::CONST9);
+var_dump(A::CONST9);
 var_dump(A::CONST10);
+var_dump(A::CONST10);
+var_dump(A::CONST11);
 var_dump(A::CONST11);
 ?>
 --EXPECT--
 NULL
+NULL
 bool(false)
+bool(false)
+bool(true)
+bool(true)
 bool(true)
 bool(true)
 int(0)
+int(0)
+float(3.14)
 float(3.14)
 float(3)
+float(3)
 string(0) ""
+string(0) ""
+array(0) {
+}
 array(0) {
 }
 string(0) ""
+string(0) ""
+NULL
 NULL

Zend/tests/type_declarations/typed_class_constants_type_success2.phpt

@@ -19,10 +19,15 @@ class B implements Stringable {
 const C = new B();
 
 var_dump(A::CONST1);
+var_dump(A::CONST1);
+var_dump(A::CONST2);
 var_dump(A::CONST2);
 var_dump(A::CONST3);
+var_dump(A::CONST3);
+var_dump(A::CONST4);
 var_dump(A::CONST4);
 var_dump(A::CONST5);
+var_dump(A::CONST5);
 ?>
 --EXPECTF--
 object(B)#%d (%d) {
@@ -35,3 +40,13 @@ object(B)#%d (%d) {
 }
 object(B)#%d (%d) {
 }
+object(B)#%d (%d) {
+}
+object(B)#%d (%d) {
+}
+object(B)#%d (%d) {
+}
+object(B)#%d (%d) {
+}
+object(B)#%d (%d) {
+}

Zend/tests/type_declarations/typed_class_constants_type_success3.phpt

@@ -18,12 +18,20 @@ class A {
 }
 
 var_dump(A::ENUM_CONST);
+var_dump(A::ENUM_CONST);
+var_dump(A::CONST1);
 var_dump(A::CONST1);
 var_dump(A::CONST2);
+var_dump(A::CONST2);
+var_dump(A::CONST3);
 var_dump(A::CONST3);
 ?>
 --EXPECT--
 enum(E::Foo)
 enum(E::Foo)
 enum(E::Foo)
 enum(E::Foo)
+enum(E::Foo)
+enum(E::Foo)
+enum(E::Foo)
+enum(E::Foo)

Zend/zend_execute.c

@@ -830,6 +830,11 @@ ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool s
 
 ZEND_COLD zend_never_inline void zend_verify_class_constant_type_error(const zend_class_constant *c, const zval *constant)
 {
+	/* we _may_ land here in case reading already errored and runtime cache thus has not been updated (i.e. it contains a valid but unrelated info) */
+	if (EG(exception)) {
+		return;
+	}
+
 	zend_string *type_str = zend_type_to_string(c->type);
 
 	zend_type_error("Cannot assign %s to class constant %s::%s of type %s",

Zend/zend_vm_def.h

@@ -5948,6 +5948,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 			if (UNEXPECTED(!(c->ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED))) {
 				if (UNEXPECTED(zend_update_class_constants(c->ce)) != SUCCESS) {
 					ZVAL_UNDEF(EX_VAR(opline->result.var));
+					FREE_OP2();
 					HANDLE_EXCEPTION();
 				}
 			}
@@ -5970,7 +5971,6 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, CO
 				}
 			}
 			if (OP2_TYPE == IS_CONST) {
-				value = &c->value;
 				CACHE_POLYMORPHIC_PTR(opline->extended_value, ce, value);
 			}
 		} else {