fix - invalid visibility - edge cases - kokororin/vscode-phpfmt#172

driade · driade · commit eda0fff94642 · 2025-06-15T14:16:32.000+02:00
diff --git a/fmt.stub.php b/fmt.stub.php
@@ -6589,8 +6589,9 @@ public function format($source) {
 					}
 					break;
                 case '?':
-                    if ($this->rightUsefulTokenIs([T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED])) {
-                        $this->tkns[$this->ptr + 1][1] = $text . $this->tkns[$this->ptr + 1][1];
+                    $tidx = $this->rightUsefulTokenIdx();
+                    if (in_array($this->tkns[$tidx][0], [T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED]) && (! isset($this->tkns[$tidx + 1]) || $this->tkns[$tidx + 1][0] !== '(')) {
+                       $this->tkns[$tidx][1] = $text . $this->tkns[$tidx][1];
                     } else {
                         $this->appendCode($text);
                     }

Original file line number	Diff line number	Diff line change
`@@ -6589,8 +6589,9 @@ public function format($source) {`
`6589`	`6589`	`}`
`6590`	`6590`	`break;`
`6591`	`6591`	`case '?':`
`6592`		`- if ($this->rightUsefulTokenIs([T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED])) {`
`6593`		`- $this->tkns[$this->ptr + 1][1] = $text . $this->tkns[$this->ptr + 1][1];`
	`6592`	`+ $tidx = $this->rightUsefulTokenIdx();`
	`6593`	`+ if (in_array($this->tkns[$tidx][0], [T_STRING, T_ARRAY, T_NAME_RELATIVE, T_NAME_QUALIFIED, T_NAME_FULLY_QUALIFIED]) && (! isset($this->tkns[$tidx + 1]) \|\| $this->tkns[$tidx + 1][0] !== '(')) {`
	`6594`	`+ $this->tkns[$tidx][1] = $text . $this->tkns[$tidx][1];`
`6594`	`6595`	`} else {`
`6595`	`6596`	`$this->appendCode($text);`
`6596`	`6597`	`}`