From d2c82dff39a549cd3942c615c0c5eec12a3cd6fc Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Wed, 7 Jul 2021 15:02:34 -0500 Subject: [PATCH] fix: missing comma in PHP names.c and generator.cc (#8787) * Update names.c * Update php_generator.cc --- php/ext/google/protobuf/names.c | 2 +- src/google/protobuf/compiler/php/php_generator.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/php/ext/google/protobuf/names.c b/php/ext/google/protobuf/names.c index 20a36a25dd..6108ff4a0d 100644 --- a/php/ext/google/protobuf/names.c +++ b/php/ext/google/protobuf/names.c @@ -77,7 +77,7 @@ const char *const kReservedNames[] = { "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", - "finally", "fn" "for", "foreach", "function", + "finally", "fn", "for", "foreach", "function", "if", "implements", "include", "include_once", "instanceof", "global", "goto", "insteadof", "interface", "isset", "list", "match", "namespace", "new", "or", diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc index eae86b3af3..84bafdd47d 100644 --- a/src/google/protobuf/compiler/php/php_generator.cc +++ b/src/google/protobuf/compiler/php/php_generator.cc @@ -61,7 +61,7 @@ const char* const kReservedNames[] = { "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", - "while", "xor", "yield" "int", "float", + "while", "xor", "yield", "int", "float", "bool", "string", "true", "false", "null", "void", "iterable"}; const char* const kValidConstantNames[] = {