From 7e815ddd8fb8dd158e41f4550876d11f597b4111 Mon Sep 17 00:00:00 2001
From: rhydb <rhyd@rhyd.dev>
Date: Fri, 8 May 2026 11:53:43 +0100
Subject: [PATCH] Allow main asymmetric visibility to be omitted

---
 src/Parser.php                                |   8 +
 src/TokenStringMaps.php                       |   2 +
 ...asymetrical-visiblity-member-omit-main.php |   8 +
 ...trical-visiblity-member-omit-main.php.diag |   1 +
 ...trical-visiblity-member-omit-main.php.tree | 177 +++++++++++++++
 .../parser84/asymetrical-visiblity-member.php |   8 +
 .../asymetrical-visiblity-member.php.diag     |   1 +
 .../asymetrical-visiblity-member.php.tree     | 185 ++++++++++++++++
 .../asymetrical-visiblity-omit-main.php       |  15 ++
 .../asymetrical-visiblity-omit-main.php.diag  |   1 +
 .../asymetrical-visiblity-omit-main.php.tree  | 206 ++++++++++++++++++
 11 files changed, 612 insertions(+)
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member-omit-main.php
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.diag
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.tree
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member.php
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member.php.diag
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-member.php.tree
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-omit-main.php
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-omit-main.php.diag
 create mode 100644 tests/cases/parser84/asymetrical-visiblity-omit-main.php.tree

diff --git a/src/Parser.php b/src/Parser.php
index a6574916..d9cb58e3 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1069,6 +1069,8 @@ private function isClassMemberDeclarationStart(Token $token) {
             case TokenKind::PublicKeyword:
             case TokenKind::ProtectedKeyword:
             case TokenKind::PrivateKeyword:
+            case TokenKind::ProtectedSetKeyword:
+            case TokenKind::PrivateSetKeyword:
 
             // static-modifier
             case TokenKind::StaticKeyword:
@@ -1574,6 +1576,8 @@ private function isModifier($token): bool {
             case TokenKind::PublicKeyword:
             case TokenKind::ProtectedKeyword:
             case TokenKind::PrivateKeyword:
+            case TokenKind::ProtectedSetKeyword:
+            case TokenKind::PrivateSetKeyword:
 
             // static-modifier
             case TokenKind::StaticKeyword:
@@ -1594,6 +1598,8 @@ private function isParameterModifier($token): bool {
             case TokenKind::PublicKeyword:
             case TokenKind::ProtectedKeyword:
             case TokenKind::PrivateKeyword:
+            case TokenKind::ProtectedSetKeyword:
+            case TokenKind::PrivateSetKeyword:
 
             // readonly-modifier
             case TokenKind::ReadonlyKeyword:
@@ -1648,6 +1654,8 @@ private function isParameterStartFn() {
                 case TokenKind::PublicKeyword:
                 case TokenKind::ProtectedKeyword:
                 case TokenKind::PrivateKeyword:
+                case TokenKind::ProtectedSetKeyword:
+                case TokenKind::PrivateSetKeyword:
                 case TokenKind::AttributeToken:
 
                 // dnf types (A&B)|C
diff --git a/src/TokenStringMaps.php b/src/TokenStringMaps.php
index 15249ed1..3a4f5437 100644
--- a/src/TokenStringMaps.php
+++ b/src/TokenStringMaps.php
@@ -63,7 +63,9 @@ class TokenStringMaps {
         "or" => TokenKind::OrKeyword,
         "print" => TokenKind::PrintKeyword,
         "private" => TokenKind::PrivateKeyword,
+        "private(set)" => TokenKind::PrivateSetKeyword,
         "protected" => TokenKind::ProtectedKeyword,
+        "protected(set)" => TokenKind::ProtectedSetKeyword,
         "public" => TokenKind::PublicKeyword,
         "readonly" => TokenKind::ReadonlyKeyword,
         "require" => TokenKind::RequireKeyword,
diff --git a/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php
new file mode 100644
index 00000000..8e51c056
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php
@@ -0,0 +1,8 @@
+<?php
+
+class Book
+{
+    private(set) string $title;
+    protected(set) string $author;
+    public string $bar;
+}
diff --git a/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.diag b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.tree b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.tree
new file mode 100644
index 00000000..7ee5f724
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member-omit-main.php.tree
@@ -0,0 +1,177 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": null,
+                    "abstractOrFinalModifier": null,
+                    "modifiers": [],
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "textLength": 5
+                    },
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 4
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "classMemberDeclarations": [
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PrivateSetKeyword",
+                                                "textLength": 12
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 6
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                },
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "ProtectedSetKeyword",
+                                                "textLength": 14
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 7
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                },
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 4
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                }
+                            ],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/parser84/asymetrical-visiblity-member.php b/tests/cases/parser84/asymetrical-visiblity-member.php
new file mode 100644
index 00000000..24d3d03d
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member.php
@@ -0,0 +1,8 @@
+<?php
+
+class Book
+{
+    public private(set) string $title;
+    public protected(set) string $author;
+    public string $bar;
+}
diff --git a/tests/cases/parser84/asymetrical-visiblity-member.php.diag b/tests/cases/parser84/asymetrical-visiblity-member.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser84/asymetrical-visiblity-member.php.tree b/tests/cases/parser84/asymetrical-visiblity-member.php.tree
new file mode 100644
index 00000000..a070089b
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-member.php.tree
@@ -0,0 +1,185 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": null,
+                    "abstractOrFinalModifier": null,
+                    "modifiers": [],
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "textLength": 5
+                    },
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 4
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "classMemberDeclarations": [
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            },
+                                            {
+                                                "kind": "PrivateSetKeyword",
+                                                "textLength": 12
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 6
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                },
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            },
+                                            {
+                                                "kind": "ProtectedSetKeyword",
+                                                "textLength": 14
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 7
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                },
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 4
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyHooks": null,
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                }
+                            ],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/parser84/asymetrical-visiblity-omit-main.php b/tests/cases/parser84/asymetrical-visiblity-omit-main.php
new file mode 100644
index 00000000..7530df9e
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-omit-main.php
@@ -0,0 +1,15 @@
+<?php
+
+/*
+If a property is public, then the main visibility may be omitted. That is, public private(set) and private(set) will have the same result.
+https://www.php.net/manual/en/language.oop5.visibility.php
+*/
+
+class Book
+{
+    public function __construct(
+        private(set) string $title,
+        protected(set) string $author,
+        public string $bar,
+    ) {}
+}
diff --git a/tests/cases/parser84/asymetrical-visiblity-omit-main.php.diag b/tests/cases/parser84/asymetrical-visiblity-omit-main.php.diag
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-omit-main.php.diag
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/tests/cases/parser84/asymetrical-visiblity-omit-main.php.tree b/tests/cases/parser84/asymetrical-visiblity-omit-main.php.tree
new file mode 100644
index 00000000..7854204a
--- /dev/null
+++ b/tests/cases/parser84/asymetrical-visiblity-omit-main.php.tree
@@ -0,0 +1,206 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": null,
+                    "abstractOrFinalModifier": null,
+                    "modifiers": [],
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "textLength": 5
+                    },
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 4
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "classMemberDeclarations": [
+                                {
+                                    "MethodDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            }
+                                        ],
+                                        "functionKeyword": {
+                                            "kind": "FunctionKeyword",
+                                            "textLength": 8
+                                        },
+                                        "byRefToken": null,
+                                        "name": {
+                                            "kind": "Name",
+                                            "textLength": 11
+                                        },
+                                        "openParen": {
+                                            "kind": "OpenParenToken",
+                                            "textLength": 1
+                                        },
+                                        "parameters": {
+                                            "ParameterDeclarationList": {
+                                                "children": [
+                                                    {
+                                                        "Parameter": {
+                                                            "attributes": null,
+                                                            "visibilityToken": null,
+                                                            "setVisibilityToken": {
+                                                                "kind": "PrivateSetKeyword",
+                                                                "textLength": 12
+                                                            },
+                                                            "modifiers": null,
+                                                            "questionToken": null,
+                                                            "typeDeclarationList": {
+                                                                "QualifiedNameList": {
+                                                                    "children": [
+                                                                        {
+                                                                            "kind": "StringReservedWord",
+                                                                            "textLength": 6
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            },
+                                                            "byRefToken": null,
+                                                            "dotDotDotToken": null,
+                                                            "variableName": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 6
+                                                            },
+                                                            "equalsToken": null,
+                                                            "default": null,
+                                                            "propertyHooks": null
+                                                        }
+                                                    },
+                                                    {
+                                                        "kind": "CommaToken",
+                                                        "textLength": 1
+                                                    },
+                                                    {
+                                                        "Parameter": {
+                                                            "attributes": null,
+                                                            "visibilityToken": null,
+                                                            "setVisibilityToken": {
+                                                                "kind": "ProtectedSetKeyword",
+                                                                "textLength": 14
+                                                            },
+                                                            "modifiers": null,
+                                                            "questionToken": null,
+                                                            "typeDeclarationList": {
+                                                                "QualifiedNameList": {
+                                                                    "children": [
+                                                                        {
+                                                                            "kind": "StringReservedWord",
+                                                                            "textLength": 6
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            },
+                                                            "byRefToken": null,
+                                                            "dotDotDotToken": null,
+                                                            "variableName": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 7
+                                                            },
+                                                            "equalsToken": null,
+                                                            "default": null,
+                                                            "propertyHooks": null
+                                                        }
+                                                    },
+                                                    {
+                                                        "kind": "CommaToken",
+                                                        "textLength": 1
+                                                    },
+                                                    {
+                                                        "Parameter": {
+                                                            "attributes": null,
+                                                            "visibilityToken": {
+                                                                "kind": "PublicKeyword",
+                                                                "textLength": 6
+                                                            },
+                                                            "setVisibilityToken": null,
+                                                            "modifiers": null,
+                                                            "questionToken": null,
+                                                            "typeDeclarationList": {
+                                                                "QualifiedNameList": {
+                                                                    "children": [
+                                                                        {
+                                                                            "kind": "StringReservedWord",
+                                                                            "textLength": 6
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            },
+                                                            "byRefToken": null,
+                                                            "dotDotDotToken": null,
+                                                            "variableName": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 4
+                                                            },
+                                                            "equalsToken": null,
+                                                            "default": null,
+                                                            "propertyHooks": null
+                                                        }
+                                                    },
+                                                    {
+                                                        "kind": "CommaToken",
+                                                        "textLength": 1
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "closeParen": {
+                                            "kind": "CloseParenToken",
+                                            "textLength": 1
+                                        },
+                                        "colonToken": null,
+                                        "questionToken": null,
+                                        "returnTypeList": null,
+                                        "compoundStatementOrSemicolon": {
+                                            "CompoundStatementNode": {
+                                                "openBrace": {
+                                                    "kind": "OpenBraceToken",
+                                                    "textLength": 1
+                                                },
+                                                "statements": [],
+                                                "closeBrace": {
+                                                    "kind": "CloseBraceToken",
+                                                    "textLength": 1
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            ],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}
\ No newline at end of file