From 2c7f3aacd31b564beca3a3d93a98f4efded6af58 Mon Sep 17 00:00:00 2001 From: USAMI Kenta Date: Tue, 31 Aug 2021 06:01:25 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- t/t4018/php-enum | 4 ++++ userdiff.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 t/t4018/php-enum 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]+" -- cgit v1.2.3