Handle constants declared with const

Author: DanielEScherzer

Zend/zend_vm_def.h

@@ -8232,6 +8232,13 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
 	ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);
 	c.name = zend_string_copy(Z_STR_P(name));
 
+	zend_string *filename = zend_get_executed_filename_ex();
+	if (filename == NULL) {
+		c.filename = NULL;
+	} else {
+		c.filename = zend_string_copy(filename);
+	}
+
 	if (zend_register_constant(&c) == FAILURE) {
 	}
 

Zend/zend_vm_execute.h

@@ -12,11 +12,15 @@ define('IN_CURRENT_FILE', 42);
 $reflectionConstant = new ReflectionConstant('IN_CURRENT_FILE');
 var_dump($reflectionConstant->getFileName());
 
-$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT');
+$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT_DEFINED');
+var_dump($reflectionConstant->getFileName());
+
+$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT_AST');
 var_dump($reflectionConstant->getFileName());
 
 ?>
 --EXPECTF--
 bool(false)
 string(%d) "%sReflectionConstant_getFileName.php"
 string(%d) "%sincluded5.inc"
+string(%d) "%sincluded5.inc"

ext/reflection/tests/ReflectionConstant_getFileName.phpt

@@ -1,3 +1,5 @@
 <?php
-define('INCLUDED_CONSTANT', 'Foo');
+define('INCLUDED_CONSTANT_DEFINED', 'Foo');
+
+const INCLUDED_CONSTANT_AST = 'Bar';
 ?>