From ea1e5eda6e0464530f50f06a88c6d87f3f343366 Mon Sep 17 00:00:00 2001 From: Daniel Oliveira Date: Mon, 16 Nov 2026 11:27:59 +0100 Subject: [PATCH] Keep a space between extends or implements and a fully qualified name The printer only separates two identifier characters, and the formatter added no whitespace after extends or implements. A fully qualified parent came out as extends\Foo\Bar, which PHP 8 lexes as one name. --- pkg/visitor/formatter/formatter.go | 4 + pkg/visitor/formatter/formatter_test.go | 118 ++++++++++++++++++++++++ 2 files changed, 122 insertions(+) diff --git a/pkg/visitor/formatter/formatter.go b/pkg/visitor/formatter/formatter.go index c82a741..cc3e7a2 100644 --- a/pkg/visitor/formatter/formatter.go +++ b/pkg/visitor/formatter/formatter.go @@ -334,12 +334,14 @@ func (formatter *formatter) StmtClass(node *ast.StmtClass) { formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) if node.Extends != nil { node.ExtendsTkn = formatter.newToken(token.T_EXTENDS, []byte("extends")) + formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) node.Extends.Accept(formatter) formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) } if node.Implements != nil { node.ImplementsTkn = formatter.newToken(token.T_IMPLEMENTS, []byte("implements")) + formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) node.ImplementsSeparatorTkns = formatter.formatList(node.Implements, ',') formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) } @@ -728,6 +730,7 @@ func (formatter *formatter) StmtEnum(node *ast.StmtEnum) { if node.Implements != nil { node.ImplementsTkn = formatter.newToken(token.T_IMPLEMENTS, []byte("implements")) + formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) node.ImplementsSeparatorTkns = formatter.formatList(node.Implements, ',') formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) } @@ -771,6 +774,7 @@ func (formatter *formatter) StmtInterface(node *ast.StmtInterface) { if node.Extends != nil { node.ExtendsTkn = formatter.newToken(token.T_EXTENDS, []byte("extends")) + formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) node.ExtendsSeparatorTkns = formatter.formatList(node.Extends, ',') formatter.addFreeFloating(token.T_WHITESPACE, []byte(" ")) } diff --git a/pkg/visitor/formatter/formatter_test.go b/pkg/visitor/formatter/formatter_test.go index 6e501bb..11a7aa9 100644 --- a/pkg/visitor/formatter/formatter_test.go +++ b/pkg/visitor/formatter/formatter_test.go @@ -6800,3 +6800,121 @@ func TestFormatter_NameNamePart(test *testing.T) { test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) } } + +func TestFormatter_Class_FullyQualifiedParents(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.StmtClass{ + Name: &ast.Identifier{ + Value: []byte("foo"), + }, + Extends: &ast.NameFullyQualified{ + Parts: []ast.Vertex{ + &ast.NamePart{ + Value: []byte("bar"), + }, + }, + }, + Implements: []ast.Vertex{ + &ast.NameFullyQualified{ + Parts: []ast.Vertex{ + &ast.NamePart{ + Value: []byte("baz"), + }, + }, + }, + }, + Stmts: []ast.Vertex{ + &ast.StmtNop{}, + }, + } + + formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1) + node.Accept(formatterValue) + + printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP) + node.Accept(printerValue) + + expected := `class foo extends \bar implements \baz { + ; + }` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +} + +func TestFormatter_StmtInterface_FullyQualifiedExtends(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.StmtInterface{ + Name: &ast.Identifier{ + Value: []byte("foo"), + }, + Extends: []ast.Vertex{ + &ast.NameFullyQualified{ + Parts: []ast.Vertex{ + &ast.NamePart{ + Value: []byte("bar"), + }, + }, + }, + }, + Stmts: []ast.Vertex{ + &ast.StmtNop{}, + }, + } + + formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1) + node.Accept(formatterValue) + + printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP) + node.Accept(printerValue) + + expected := `interface foo extends \bar { + ; + }` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +} + +func TestFormatter_StmtEnum_FullyQualifiedImplements(test *testing.T) { + buffer := bytes.NewBufferString("") + + node := &ast.StmtEnum{ + Name: &ast.Identifier{ + Value: []byte("foo"), + }, + Implements: []ast.Vertex{ + &ast.NameFullyQualified{ + Parts: []ast.Vertex{ + &ast.NamePart{ + Value: []byte("bar"), + }, + }, + }, + }, + Stmts: []ast.Vertex{ + &ast.StmtNop{}, + }, + } + + formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1) + node.Accept(formatterValue) + + printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP) + node.Accept(printerValue) + + expected := `enum foo implements \bar { + ; + }` + actual := buffer.String() + + if expected != actual { + test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual) + } +}