Commit 6193b67

committed

Handle constants declared with const

1 parent b17a353 commit 6193b67Copy full SHA for 6193b67

File tree

+22

-2

lines changed

+22

-2

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8232,6 +8232,13 @@ ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)`
`8232`	`8232`	`ZEND_CONSTANT_SET_FLAGS(&c, 0, PHP_USER_CONSTANT);`
`8233`	`8233`	`c.name = zend_string_copy(Z_STR_P(name));`
`8234`	`8234`
	`8235`	`+ zend_string *filename = zend_get_executed_filename_ex();`
	`8236`	`+ if (filename == NULL) {`
	`8237`	`+ c.filename = NULL;`
	`8238`	`+ } else {`
	`8239`	`+ c.filename = zend_string_copy(filename);`
	`8240`	`+ }`
	`8241`	`+`
`8235`	`8242`	`if (zend_register_constant(&c) == FAILURE) {`
`8236`	`8243`	`}`
`8237`	`8244`

Lines changed: 7 additions & 0 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,15 @@ define('IN_CURRENT_FILE', 42);`
`12`	`12`	`$reflectionConstant = new ReflectionConstant('IN_CURRENT_FILE');`
`13`	`13`	`var_dump($reflectionConstant->getFileName());`
`14`	`14`
`15`		`-$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT');`
	`15`	`+$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT_DEFINED');`
	`16`	`+var_dump($reflectionConstant->getFileName());`
	`17`	`+`
	`18`	`+$reflectionConstant = new ReflectionConstant('INCLUDED_CONSTANT_AST');`
`16`	`19`	`var_dump($reflectionConstant->getFileName());`
`17`	`20`
`18`	`21`	`?>`
`19`	`22`	`--EXPECTF--`
`20`	`23`	`bool(false)`
`21`	`24`	`string(%d) "%sReflectionConstant_getFileName.php"`
`22`	`25`	`string(%d) "%sincluded5.inc"`
	`26`	`+string(%d) "%sincluded5.inc"`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`<?php`
`2`		`-define('INCLUDED_CONSTANT', 'Foo');`
	`2`	`+define('INCLUDED_CONSTANT_DEFINED', 'Foo');`
	`3`	`+`
	`4`	`+const INCLUDED_CONSTANT_AST = 'Bar';`
`3`	`5`	`?>`

Comments

(0)