Parse private(namespace) visibility modifier

Extend the parser to recognize private(namespace) as a visibility modifier
for methods and properties. Sets ZEND_ACC_NAMESPACE_PRIVATE flag on the
member when this syntax is encountered.

Also supports asymmetric visibility: public private(namespace)(set)
Sets ZEND_ACC_NAMESPACE_PRIVATE_SET for property write visibility.

Syntax examples:
  private(namespace) function foo() {}
  private(namespace) string $prop;
  public private(namespace)(set) int $count = 0;

Author: withinboredom

Zend/zend_compile.c

@@ -873,6 +873,10 @@ static const char *zend_modifier_token_to_string(uint32_t token)
 			return "protected(set)";
 		case T_PRIVATE_SET:
 			return "private(set)";
+		case T_PRIVATE_NAMESPACE:
+			return "private(namespace)";
+		case T_PRIVATE_NAMESPACE_SET:
+			return "private(namespace)(set)";
 		EMPTY_SWITCH_DEFAULT_CASE()
 	}
 }
@@ -927,6 +931,16 @@ uint32_t zend_modifier_token_to_flag(zend_modifier_target target, uint32_t token
 				return ZEND_ACC_PRIVATE_SET;
 			}
 			break;
+	case T_PRIVATE_NAMESPACE:
+		if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_METHOD) {
+			return ZEND_ACC_NAMESPACE_PRIVATE;
+		}
+		break;
+	case T_PRIVATE_NAMESPACE_SET:
+		if (target == ZEND_MODIFIER_TARGET_PROPERTY || target == ZEND_MODIFIER_TARGET_CPP) {
+			return ZEND_ACC_NAMESPACE_PRIVATE_SET;
+		}
+		break;
 	}
 
 	char *member;

Zend/zend_language_parser.y

@@ -158,6 +158,8 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 %token <ident> T_PRIVATE_SET   "'private(set)'"
 %token <ident> T_PROTECTED_SET "'protected(set)'"
 %token <ident> T_PUBLIC_SET    "'public(set)'"
+%token <ident> T_PRIVATE_NAMESPACE "'private(namespace)'"
+%token <ident> T_PRIVATE_NAMESPACE_SET "'private(namespace)(set)'"
 %token <ident> T_READONLY      "'readonly'"
 %token <ident> T_VAR           "'var'"
 %token <ident> T_UNSET         "'unset'"
@@ -1108,6 +1110,8 @@ member_modifier:
 	|	T_PUBLIC_SET			{ $$ = T_PUBLIC_SET; }
 	|	T_PROTECTED_SET			{ $$ = T_PROTECTED_SET; }
 	|	T_PRIVATE_SET			{ $$ = T_PRIVATE_SET; }
+	|	T_PRIVATE_NAMESPACE		{ $$ = T_PRIVATE_NAMESPACE; }
+	|	T_PRIVATE_NAMESPACE_SET	{ $$ = T_PRIVATE_NAMESPACE_SET; }
 	|	T_STATIC				{ $$ = T_STATIC; }
 	|	T_ABSTRACT				{ $$ = T_ABSTRACT; }
 	|	T_FINAL					{ $$ = T_FINAL; }

Zend/zend_language_scanner.l

@@ -1798,6 +1798,14 @@ OPTIONAL_WHITESPACE_OR_COMMENTS ({WHITESPACE}|{MULTI_LINE_COMMENT}|{SINGLE_LINE_
 	RETURN_TOKEN_WITH_IDENT(T_PRIVATE_SET);
 }
 
+<ST_IN_SCRIPTING>"private(namespace)" {
+	RETURN_TOKEN_WITH_IDENT(T_PRIVATE_NAMESPACE);
+}
+
+<ST_IN_SCRIPTING>"private(namespace)(set)" {
+	RETURN_TOKEN_WITH_IDENT(T_PRIVATE_NAMESPACE_SET);
+}
+
 <ST_IN_SCRIPTING>"public" {
 	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
 }