freshlybakedca.ke / git
Git fork
fork atom

Merge branch 'uk/userdiff-php-enum'

Update the userdiff pattern for PHP.

* uk/userdiff-php-enum:
userdiff: support enum keyword in PHP hunk header

Junio C Hamano 6dbe1b4e febba803

+5 -1
unified split
+4
t/t4018/php-enum
··· 1 + enum RIGHT: string 2 + { 3 + case Foo = 'ChangeMe'; 4 + }
+1 -1
userdiff.c
··· 228 228 "|<<|<>|<=>|>>"), 229 229 PATTERNS("php", 230 230 "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n" 231 - "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$", 231 + "^[\t ]*((((final|abstract)[\t ]+)?class|enum|interface|trait).*)$", 232 232 /* -- */ 233 233 "[a-zA-Z_][a-zA-Z0-9_]*" 234 234 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"