Commit 70f59b3

committed

Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4: Fix usage of casted string in ReflectionParameter ctor

2 parents fc26ad9 + 706241f commit 70f59b3Copy full SHA for 70f59b3

File tree

+20

-2

lines changed

+20

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2306,10 +2306,10 @@ ZEND_METHOD(ReflectionParameter, __construct)`
`2306`	`2306`	`/* nothing to do. don't set is_closure since is the invoke handler,`
`2307`	`2307`	`not the closure itself */`
`2308`	`2308`	`} else if ((fptr = zend_hash_find_ptr(&ce->function_table, lcname)) == NULL) {`
	`2309`	`+ zend_throw_exception_ex(reflection_exception_ptr, 0,`
	`2310`	`+ "Method %s::%s() does not exist", ZSTR_VAL(ce->name), ZSTR_VAL(name));`
`2309`	`2311`	`zend_string_release(name);`
`2310`	`2312`	`zend_string_release(lcname);`
`2311`		`- zend_throw_exception_ex(reflection_exception_ptr, 0,`
`2312`		`- "Method %s::%s() does not exist", ZSTR_VAL(ce->name), Z_STRVAL_P(method));`
`2313`	`2313`	`RETURN_THROWS();`
`2314`	`2314`	`}`
`2315`	`2315`	`zend_string_release(name);`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+--TEST--`
	`2`	`+Test method name string cast in ReflectionParameter ctor`
	`3`	`+--FILE--`
	`4`	`+<?php`
	`5`	`+`
	`6`	`+class A {}`
	`7`	`+try {`
	`8`	`+ new ReflectionParameter([`
	`9`	`+ A::class,`
	`10`	`+ new class { public function __toString() { return 'method'; } }`
	`11`	`+ ], 'param');`
	`12`	`+} catch (ReflectionException $e) {`
	`13`	`+ echo $e->getMessage(), "\n";`
	`14`	`+}`
	`15`	`+`
	`16`	`+?>`
	`17`	`+--EXPECT--`
	`18`	`+Method A::method() does not exist`

Comments

(0)