Test fixing php

include/grpc/grpc.h

@@ -86,6 +86,9 @@ GRPCAPI void grpc_shutdown(void);
     part of stabilizing the fork support API, as tracked in
     https://github.com/grpc/grpc/issues/15334 */
 GRPCAPI int grpc_is_initialized(void);
+/** EXPERIMENTAL. Wait for grpc_shutdown to finish if it is in process.
+    This is only for wrapped language to use now. */
+GRPCAPI void grpc_maybe_wait_for_async_shutdown(void);
 
 /** Return a string representing the current version of grpc */
 GRPCAPI const char* grpc_version_string(void);

src/core/lib/surface/init.h

@@ -22,6 +22,5 @@
 void grpc_register_security_filters(void);
 void grpc_security_pre_init(void);
 void grpc_security_init(void);
-void grpc_maybe_wait_for_async_shutdown(void);
 
 #endif /* GRPC_CORE_LIB_SURFACE_INIT_H */

src/php/ext/grpc/php_grpc.c

@@ -362,6 +362,7 @@ PHP_MSHUTDOWN_FUNCTION(grpc) {
     grpc_shutdown_timeval(TSRMLS_C);
     grpc_php_shutdown_completion_queue(TSRMLS_C);
     grpc_shutdown();
+    grpc_maybe_wait_for_async_shutdown();
     GRPC_G(initialized) = 0;
   }
   return SUCCESS;

test/core/util/test_config.cc

@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <grpc/grpc.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>