Merge pull request #8276 from haberman/php-warning

Added more information to "file already loaded" warning.
protocolbuffers · Feb 11, 2021 · a97c4f4 · a97c4f4
2 parents 44cd75d + db66c95
commit a97c4f4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/php/ext/google/protobuf/def.c b/php/ext/google/protobuf/def.c
@@ -916,7 +916,10 @@ static void add_descriptor(DescriptorPool *pool,
 
   if (upb_symtab_lookupfile2(pool->symtab, name.data, name.size)) {
     // Already added.
-    fprintf(stderr, "WARNING: file was already added\n");
+    zend_error(E_USER_WARNING,
+               "proto descriptor was previously loaded (included in multiple "
+               "metadata bundles?): " UPB_STRVIEW_FORMAT,
+               UPB_STRVIEW_ARGS(name));
     return;
   }