Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions pkg/visitor/formatter/formatter.go
Original file line number Diff line number Diff line change
Expand Up @@ -1145,11 +1145,35 @@ func (formatter *formatter) ExprArray(node *ast.ExprArray) {

func (formatter *formatter) ExprArrayDimFetch(node *ast.ExprArrayDimFetch) {
node.Var.Accept(formatter)
formatter.braceDimensionBase(node.Var)
node.OpenBracketTkn = formatter.newToken('[', []byte("["))
node.Dim.Accept(formatter)
node.CloseBracketTkn = formatter.newToken(']', []byte("]"))
}

// braceDimensionBase braces a variable name a dimension follows: PHP 5
// reads $$a['b'] as ${$a['b']} and $a->$b['c'] as $a->{$b['c']}, where
// PHP 7 reads ${$a}['b'] and $a->{$b}['c'].
func (formatter *formatter) braceDimensionBase(base ast.Vertex) {
switch n := base.(type) {
case *ast.ExprVariable:
if _, ok := n.Name.(*ast.ExprVariable); ok {
n.OpenCurlyBracketTkn = formatter.newToken('{', []byte("{"))
n.CloseCurlyBracketTkn = formatter.newToken('}', []byte("}"))
}
case *ast.ExprPropertyFetch:
if _, ok := n.Prop.(*ast.ExprVariable); ok {
n.OpenCurlyBracketTkn = formatter.newToken('{', []byte("{"))
n.CloseCurlyBracketTkn = formatter.newToken('}', []byte("}"))
}
case *ast.ExprNullsafePropertyFetch:
if _, ok := n.Prop.(*ast.ExprVariable); ok {
n.OpenCurlyBracketTkn = formatter.newToken('{', []byte("{"))
n.CloseCurlyBracketTkn = formatter.newToken('}', []byte("}"))
}
}
}

func (formatter *formatter) ExprArrayItem(node *ast.ExprArrayItem) {
if node.EllipsisTkn != nil {
node.EllipsisTkn = formatter.newToken(token.T_ELLIPSIS, []byte("..."))
Expand Down
65 changes: 65 additions & 0 deletions pkg/visitor/formatter/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4820,6 +4820,71 @@ func TestFormatter_ExprVariable_Variable(test *testing.T) {
}
}

func TestFormatter_ExprArrayDimFetch_VariableVariable(test *testing.T) {
buffer := bytes.NewBufferString("")

node := &ast.ExprArrayDimFetch{
Var: &ast.ExprVariable{
Name: &ast.ExprVariable{
Name: &ast.Identifier{
Value: []byte("$foo"),
},
},
},
Dim: &ast.ScalarString{
Value: []byte("'bar'"),
},
}

formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1)
node.Accept(formatterValue)

printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP)
node.Accept(printerValue)

expected := `${$foo}['bar']`
actual := buffer.String()

if expected != actual {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}

func TestFormatter_ExprArrayDimFetch_VariableProperty(test *testing.T) {
buffer := bytes.NewBufferString("")

node := &ast.ExprArrayDimFetch{
Var: &ast.ExprPropertyFetch{
Var: &ast.ExprVariable{
Name: &ast.Identifier{
Value: []byte("$foo"),
},
},
Prop: &ast.ExprVariable{
Name: &ast.Identifier{
Value: []byte("$bar"),
},
},
},
Dim: &ast.ScalarString{
Value: []byte("'baz'"),
},
}

formatterValue := formatter.NewFormatter().WithState(formatter.FormatterStatePHP).WithIndent(1)
node.Accept(formatterValue)

printerValue := printer.NewPrinter(buffer).WithState(printer.PrinterStatePHP)
node.Accept(printerValue)

expected := `$foo->{$bar}['baz']`
actual := buffer.String()

if expected != actual {
test.Errorf("\nexpected: %s\ngot: %s\n", expected, actual)
}
}

func TestFormatter_ExprVariable_Expression(test *testing.T) {
buffer := bytes.NewBufferString("")

Expand Down