From 35f838e82ddfeb187cd275f2add96bf776019af5 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Fri, 2 Jun 2017 11:33:58 -0700 Subject: php_namespace should be explicitly set even if it's empty. --- upb/descriptor/reader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/upb/descriptor/reader.c b/upb/descriptor/reader.c index f982300..624c3ae 100644 --- a/upb/descriptor/reader.c +++ b/upb/descriptor/reader.c @@ -237,6 +237,18 @@ static size_t file_onpackage(void *closure, const void *hd, const char *buf, return n; } +static void *file_startphpnamespace(void *closure, const void *hd, + size_t size_hint) { + upb_descreader *r = closure; + bool ok; + UPB_UNUSED(hd); + UPB_UNUSED(size_hint); + + ok = upb_filedef_setphpnamespace(r->file, "", NULL); + UPB_ASSERT(ok); + return closure; +} + static size_t file_onphpnamespace(void *closure, const void *hd, const char *buf, size_t n, const upb_bufhandle *handle) { @@ -797,6 +809,8 @@ static void reghandlers(const void *closure, upb_handlers *h) { } else if (upbdefs_google_protobuf_FileOptions_is(m)) { upb_handlers_setstring(h, F(FileOptions, php_class_prefix), &file_onphpprefix, NULL); + upb_handlers_setstartstr(h, F(FileOptions, php_namespace), + &file_startphpnamespace, NULL); upb_handlers_setstring(h, F(FileOptions, php_namespace), &file_onphpnamespace, NULL); } -- cgit v1.2.3