Make class constants fully dereferencable

nikic · nikic · commit ab154b7a64f5 · 2020-02-11T12:33:23.000+01:00
diff --git a/Zend/tests/varSyntax/class_constant_static_deref.phpt b/Zend/tests/varSyntax/class_constant_static_deref.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Class constants can be used as a class name
+--FILE--
+<?php
+
+class Test {
+    const NAME = 'Test2';
+}
+
+class Test2 {
+    const FOO = 42;
+    public static $foo = 42;
+
+    public static function foo() {
+        return 42;
+    }
+}
+
+var_dump(Test::NAME::FOO);
+var_dump(Test::NAME::$foo);
+var_dump(Test::NAME::foo());
+
+?>
+--EXPECT--
+int(42)
+int(42)
+int(42)
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1150,12 +1150,12 @@ fully_dereferencable:
 		variable				{ $$ = $1; }
 	|	'(' expr ')'			{ $$ = $2; }
 	|	dereferencable_scalar	{ $$ = $1; }
+	|	class_constant			{ $$ = $1; }
 ;
 
 array_object_dereferencable:
 		fully_dereferencable	{ $$ = $1; }
 	|	constant				{ $$ = $1; }
-	|	class_constant			{ $$ = $1; }
 ;
 
 callable_expr:

Original file line number	Diff line number	Diff line change
`@@ -1150,12 +1150,12 @@ fully_dereferencable:`
`1150`	`1150`	`variable { $$ = $1; }`
`1151`	`1151`	`\| '(' expr ')' { $$ = $2; }`
`1152`	`1152`	`\| dereferencable_scalar { $$ = $1; }`
	`1153`	`+ \| class_constant { $$ = $1; }`
`1153`	`1154`	`;`
`1154`	`1155`
`1155`	`1156`	`array_object_dereferencable:`
`1156`	`1157`	`fully_dereferencable { $$ = $1; }`
`1157`	`1158`	`\| constant { $$ = $1; }`
`1158`		`- \| class_constant { $$ = $1; }`
`1159`	`1159`	`;`
`1160`	`1160`
`1161`	`1161`	`callable_expr:`