summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar USAMI Kenta <tadsan@zonu.me>2021-08-31 06:01:25 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-08-31 12:13:36 -0700
commit2c7f3aacd31b564beca3a3d93a98f4efded6af58 (patch)
tree6f0e507634c14ad2f1f15f7c563948d46396c1f7
parentGit 2.33 (diff)
downloadtgif-2c7f3aacd31b564beca3a3d93a98f4efded6af58.tar.xz
userdiff: support enum keyword in PHP hunk header
"enum" keyword will be introduced in PHP 8.1. https://wiki.php.net/rfc/enumerations Signed-off-by: USAMI Kenta <tadsan@zonu.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/t4018/php-enum4
-rw-r--r--userdiff.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/t/t4018/php-enum b/t/t4018/php-enum
new file mode 100644
index 0000000000..91a69c1a2b
--- /dev/null
+++ b/t/t4018/php-enum
@@ -0,0 +1,4 @@
+enum RIGHT: string
+{
+ case Foo = 'ChangeMe';
+}
diff --git a/userdiff.c b/userdiff.c
index d9b2ba752f..d9ec484d53 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -214,7 +214,7 @@ PATTERNS("perl",
"|<<|<>|<=>|>>"),
PATTERNS("php",
"^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
- "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
+ "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"