Commit c34558d

authored

GH-19691: Add asymmetric visibility to Reflection::getModifierNames() (#19697)

1 parent 01ae278 commit c34558dCopy full SHA for c34558d

File tree

+17

-0

lines changed

+17

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,10 @@ PHP NEWS`
`35`	`35`	`- PDO:`
`36`	`36`	`. Driver specific methods in the PDO class are now deprecated. (Arnaud)`
`37`	`37`
	`38`	`+- Reflection:`
	`39`	`+ . Fix GH-19691 (getModifierNames() not reporting asymmetric visibility).`
	`40`	`+ (DanielEScherzer)`
	`41`	`+`
`38`	`42`	`- Session:`
`39`	`43`	`. Fix RC violation of session SID constant deprecation attribute. (ilutov)`
`40`	`44`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1713,6 +1713,15 @@ ZEND_METHOD(Reflection, getModifierNames)`
`1713`	`1713`	`add_next_index_stringl(return_value, "protected", sizeof("protected")-1);`
`1714`	`1714`	`break;`
`1715`	`1715`	`}`
	`1716`	`+ /* These are also mutually exclusive */`
	`1717`	`+ switch (modifiers & ZEND_ACC_PPP_SET_MASK) {`
	`1718`	`+ case ZEND_ACC_PROTECTED_SET:`
	`1719`	`+ add_next_index_stringl(return_value, "protected(set)", sizeof("protected(set)")-1);`
	`1720`	`+ break;`
	`1721`	`+ case ZEND_ACC_PRIVATE_SET:`
	`1722`	`+ add_next_index_stringl(return_value, "private(set)", sizeof("private(set)")-1);`
	`1723`	`+ break;`
	`1724`	`+ }`
`1716`	`1725`
`1717`	`1726`	`if (modifiers & ZEND_ACC_STATIC) {`
`1718`	`1727`	`add_next_index_str(return_value, ZSTR_KNOWN(ZEND_STR_STATIC));`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ printModifiers(ReflectionMethod::IS_ABSTRACT \| ReflectionMethod::IS_FINAL);`
`15`	`15`	`printModifiers(ReflectionProperty::IS_PUBLIC \| ReflectionProperty::IS_STATIC \| ReflectionProperty::IS_READONLY);`
`16`	`16`	`printModifiers(ReflectionClass::IS_READONLY);`
`17`	`17`	`printModifiers(ReflectionProperty::IS_VIRTUAL);`
	`18`	`+printModifiers(ReflectionProperty::IS_PROTECTED_SET);`
	`19`	`+printModifiers(ReflectionProperty::IS_PRIVATE_SET);`
`18`	`20`	`?>`
`19`	`21`	`--EXPECT--`
`20`	`22`	`private`
`@@ -25,3 +27,5 @@ abstract,final`
`25`	`27`	`public,static,readonly`
`26`	`28`	`readonly`
`27`	`29`	`virtual`
	`30`	`+protected(set)`
	`31`	`+private(set)`

Comments

(0)