aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--queries/php_only/indents.scm6
-rw-r--r--tests/indent/php/issue-6888.php12
-rw-r--r--tests/indent/php_spec.lua5
3 files changed, 23 insertions, 0 deletions
diff --git a/queries/php_only/indents.scm b/queries/php_only/indents.scm
index 4a67a8b0b..fef026757 100644
--- a/queries/php_only/indents.scm
+++ b/queries/php_only/indents.scm
@@ -40,6 +40,12 @@
(compound_statement
"}" @indent.end)
+(declaration_list
+ "}" @indent.end)
+
+(enum_declaration_list
+ "}" @indent.end)
+
(return_statement
";" @indent.end)
diff --git a/tests/indent/php/issue-6888.php b/tests/indent/php/issue-6888.php
new file mode 100644
index 000000000..950cb8119
--- /dev/null
+++ b/tests/indent/php/issue-6888.php
@@ -0,0 +1,12 @@
+<?php
+enum DaysOfWeek: int
+{
+ case Sunday = 0;
+ case Monday = 1;
+}
+
+class Foo {
+ public int $id;
+ public string $brand;
+}
+?> \ No newline at end of file
diff --git a/tests/indent/php_spec.lua b/tests/indent/php_spec.lua
index 3fc681c29..2a41079ff 100644
--- a/tests/indent/php_spec.lua
+++ b/tests/indent/php_spec.lua
@@ -62,5 +62,10 @@ describe("indent PHP:", function()
run:new_line("issue-4848.php", { on_line = 64, text = "return $a;", indent = 12 })
run:new_line("issue-4848.php", { on_line = 65, text = "$a,", indent = 8 })
run:new_line("issue-4848.php", { on_line = 66, text = "$a;", indent = 0 })
+ run:new_line("issue-6888.php", { on_line = 2, text = "$a;", indent = 0 })
+ run:new_line("issue-6888.php", { on_line = 3, text = "case Funday = 2;", indent = 4 })
+ run:new_line("issue-6888.php", { on_line = 6, text = "$a;", indent = 0 })
+ run:new_line("issue-6888.php", { on_line = 8, text = "$a;", indent = 4 })
+ run:new_line("issue-6888.php", { on_line = 11, text = "$a;", indent = 0 })
end)
end)