From 710be138565139ace1291857d004220b4e4f07b4 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 20 Apr 2020 12:22:26 +0200
Subject: [PATCH] refactor generate_proto_php.sh

---
 src/php/README.md                             |  8 ++---
 src/php/bin/generate_proto_php.sh             | 29 ++++++++++++-------
 .../grpc_interop_php/build_interop.sh         |  1 -
 .../grpc_interop_php7/build_interop.sh        |  2 --
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/php/README.md b/src/php/README.md
index e589408b0c3..84ee8f7a2e9 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -275,12 +275,8 @@ $ composer install
 
 ### Client Stub
 
-Generate client stub classes from `.proto` files
-
-```sh
-$ cd grpc/src/php
-$ ./bin/generate_proto_php.sh
-```
+The generate client stub classes have already been generated from `.proto` files
+by the `./bin/generate_proto_php.sh` script.
 
 ### Run test server
 
diff --git a/src/php/bin/generate_proto_php.sh b/src/php/bin/generate_proto_php.sh
index 0b09b85b415..1c943457ba1 100755
--- a/src/php/bin/generate_proto_php.sh
+++ b/src/php/bin/generate_proto_php.sh
@@ -16,16 +16,15 @@
 set -e
 cd $(dirname $0)/../../..
 
-# TODO(jtattermusch): unlike for e.g. ruby and csharp,
-# PHP runs the code generator as part of the build, so we cannot
-# easily use bazel-built "protoc" and "grpc_php_plugin" binaries.
-# TODO(jtattermusch): the generated code for qps tests
-# is actually checked into the repository, but for other tests
-# (e.g. interop or unit tests) it's not. This should made consistent.
-protoc --proto_path=src/proto/math \
+# protoc and grpc_*_plugin binaries can be obtained by running
+# $ bazel build @com_google_protobuf//:protoc //src/compiler:all
+PROTOC=bazel-bin/external/com_google_protobuf/protoc
+PLUGIN=protoc-gen-grpc=bazel-bin/src/compiler/grpc_php_plugin
+
+$PROTOC --proto_path=src/proto/math \
        --php_out=src/php/tests/generated_code \
        --grpc_out=src/php/tests/generated_code \
-       --plugin=protoc-gen-grpc=bins/opt/grpc_php_plugin \
+       --plugin=$PLUGIN \
        src/proto/math/math.proto
 
 # replace the Empty message with EmptyMessage
@@ -38,14 +37,23 @@ sed 's/grpc\.testing\.Empty/grpc\.testing\.EmptyMessage/g' \
   src/proto/grpc/testing/test.proto > $output_file
 mv $output_file ./src/proto/grpc/testing/test.proto
 
-protoc --proto_path=. \
+# interop test protos
+$PROTOC --proto_path=. \
        --php_out=src/php/tests/interop \
        --grpc_out=src/php/tests/interop \
-       --plugin=protoc-gen-grpc=bins/opt/grpc_php_plugin \
+       --plugin=$PLUGIN \
        src/proto/grpc/testing/messages.proto \
        src/proto/grpc/testing/empty.proto \
        src/proto/grpc/testing/test.proto
 
+# qps test protos
+$PROTOC --proto_path=. \
+       --php_out=src/php/tests/qps/generated_code \
+       --grpc_out=src/php/tests/qps/generated_code \
+       --plugin=$PLUGIN \
+       src/proto/grpc/core/stats.proto \
+       src/proto/grpc/testing/{benchmark_service,compiler_test,control,echo_messages,empty,empty_service,messages,payloads,proxy-service,report_qps_scenario_service,stats,test,worker_service}.proto
+
 # change it back
 sed 's/message EmptyMessage/message Empty/g' \
   src/proto/grpc/testing/empty.proto > $output_file
@@ -53,4 +61,3 @@ mv $output_file ./src/proto/grpc/testing/empty.proto
 sed 's/grpc\.testing\.EmptyMessage/grpc\.testing\.Empty/g' \
   src/proto/grpc/testing/test.proto > $output_file
 mv $output_file ./src/proto/grpc/testing/test.proto
-
diff --git a/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
index 8f9a7c3d09e..d613d55c9cd 100755
--- a/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_php/build_interop.sh
@@ -45,4 +45,3 @@ for ((i = 0; i < 5; i++)); do
 done
 [[ "$DONE" != 1 ]] && echo "Failed to do composer install" && exit 1
 
-./bin/generate_proto_php.sh
diff --git a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
index 7de17550df2..ab7eface1ef 100755
--- a/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
+++ b/tools/dockerfile/interoptest/grpc_interop_php7/build_interop.sh
@@ -44,5 +44,3 @@ for ((i = 0; i < 5; i++)); do
   [[ "$DONE" == 1 ]] && break
 done
 [[ "$DONE" != 1 ]] && echo "Failed to do composer install" && exit 1
-
-./bin/generate_proto_php.sh