Implement class for dynamic class constants

iluuu1994 · iluuu1994 · commit a16c02fc41c0 · 2022-11-04T00:00:14.000+01:00
diff --git a/Zend/tests/dynamic_class_const_fetch.phpt b/Zend/tests/dynamic_class_const_fetch.phpt
@@ -52,8 +52,8 @@ Warning: Undefined variable $barr in %s : eval()'d code on line %d
 Undefined constant Foo::
 string(3) "bar"
 string(3) "bar"
-Cannot dynamically fetch class constant "class"
-Cannot dynamically fetch class constant "class"
+string(3) "Foo"
+string(3) "Foo"
 Undefined constant Foo::42
 Undefined constant Foo::42
 Undefined constant Foo::42
diff --git a/Zend/tests/dynamic_class_const_fetch_cache_slot.phpt b/Zend/tests/dynamic_class_const_fetch_cache_slot.phpt
@@ -3,16 +3,24 @@ Dynamic class constant fetch
 --FILE--
 <?php
 
-class Foo {
+class FooParent {
     public const BAR = 'bar';
     public const BAZ = 'baz';
 }
 
-class Bar {
+class Foo extends FooParent {
+    public const BAZ = 'baz child';
+}
+
+class BarParent {
     public const BAR = 'bar 2';
     public const BAZ = 'baz 2';
 }
 
+class Bar extends BarParent {
+    public const BAZ = 'baz 2 child';
+}
+
 function test($const) {
     echo Foo::{$const}, "\n";
     $foo = 'Foo';
@@ -25,18 +33,29 @@ test('BAZ');
 $c = function ($const) {
     echo self::{$const}, "\n";
     echo static::{$const}, "\n";
+    echo parent::{$const}, "\n";
 };
 
 $c->bindTo(null, Foo::class)('BAR');
 $c->bindTo(null, Bar::class)('BAZ');
+$c->bindTo(null, Foo::class)('class');
+$c->bindTo(null, Bar::class)('class');
 
 ?>
 --EXPECT--
 bar
 bar
-baz
-baz
+baz child
+baz child
 bar
 bar
+bar
+baz 2 child
+baz 2 child
 baz 2
-baz 2
+Foo
+Foo
+FooParent
+Bar
+Bar
+BarParent
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -5907,12 +5907,10 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, AN
 			constant_name = zval_get_string(GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R));
 
 			if (zend_string_equals_literal_ci(constant_name, "class")) {
-				// FIXME: This should probably just be implemented, since it will work for folded constant expressions
-				zend_throw_error(NULL, "Cannot dynamically fetch class constant \"class\"");
-				ZVAL_UNDEF(EX_VAR(opline->result.var));
+				ZVAL_STR_COPY(EX_VAR(opline->result.var), ce->name);
 				zend_string_release_ex(constant_name, /* persistent */ false);
 				FREE_OP2();
-				HANDLE_EXCEPTION();
+				ZEND_VM_NEXT_OPCODE();
 			}
 		}
 		zv = zend_hash_find(CE_CONSTANTS_TABLE(ce), constant_name);
@@ -5958,6 +5956,7 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, AN
 			if (OP1_TYPE == IS_CONST && OP2_TYPE == IS_CONST) {
 				CACHE_POLYMORPHIC_PTR(opline->extended_value, ce, value);
 			}
+			zend_string_release_ex(constant_name, /* persistent */ false);
 		} else {
 			zend_throw_error(NULL, "Undefined constant %s::%s",
 				ZSTR_VAL(ce->name), ZSTR_VAL(constant_name));
@@ -5970,7 +5969,6 @@ ZEND_VM_HANDLER(181, ZEND_FETCH_CLASS_CONSTANT, VAR|CONST|UNUSED|CLASS_FETCH, AN
 
 	ZVAL_COPY_OR_DUP(EX_VAR(opline->result.var), value);
 
-	zend_string_release_ex(constant_name, /* persistent */ false);
 	FREE_OP2();
 	ZEND_VM_NEXT_OPCODE();
 }
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
