diff options
| author |  Stanley Cheung <stanleycheung@google.com> | 2017-01-11 19:35:17 -0800 |
|---|---|---|
| committer | Stanley Cheung <stanleycheung@google.com> | 2017-01-11 19:36:32 -0800 |
| commit | 122c687d61aac26d228da9bb6ed2a6237be55d93 (patch) | |
| tree | f104c8d4ddad7f47549709c1856f4de03b8a5afe /src | |
| parent | 1b59bfc52bf37fcbb9ab0a5c828856128f4acdf5 (diff) | |
Fix various PHP bugs
Diffstat (limited to 'src')
| -rwxr-xr-x | src/php/bin/generate_proto_php.sh | 21 | ||||
| -rw-r--r-- | src/php/lib/Grpc/BaseStub.php | 6 |
2 files changed, 16 insertions, 11 deletions
diff --git a/src/php/bin/generate_proto_php.sh b/src/php/bin/generate_proto_php.sh index c558bc5769..06cd769330 100755 --- a/src/php/bin/generate_proto_php.sh +++ b/src/php/bin/generate_proto_php.sh @@ -39,10 +39,12 @@ protoc --proto_path=src/proto/math \ # replace the Empty message with EmptyMessage # because Empty is a PHP reserved word -sed -i 's/message Empty/message EmptyMessage/g' \ - src/proto/grpc/testing/empty.proto -sed -i 's/grpc\.testing\.Empty/grpc\.testing\.EmptyMessage/g' \ - src/proto/grpc/testing/test.proto +sed 's/message Empty/message EmptyMessage/g' \ + src/proto/grpc/testing/empty.proto > empty.proto +mv empty.proto ./src/proto/grpc/testing +sed 's/grpc\.testing\.Empty/grpc\.testing\.EmptyMessage/g' \ + src/proto/grpc/testing/test.proto > test.proto +mv test.proto ./src/proto/grpc/testing protoc --proto_path=. \ --php_out=src/php/tests/interop \ @@ -53,7 +55,10 @@ protoc --proto_path=. \ src/proto/grpc/testing/test.proto # change it back -sed -i 's/message EmptyMessage/message Empty/g' \ - src/proto/grpc/testing/empty.proto -sed -i 's/grpc\.testing\.EmptyMessage/grpc\.testing\.Empty/g' \ - src/proto/grpc/testing/test.proto +sed 's/message EmptyMessage/message Empty/g' \ + src/proto/grpc/testing/empty.proto > empty.proto +mv empty.proto ./src/proto/grpc/testing +sed 's/grpc\.testing\.EmptyMessage/grpc\.testing\.Empty/g' \ + src/proto/grpc/testing/test.proto > test.proto +mv test.proto ./src/proto/grpc/testing + diff --git a/src/php/lib/Grpc/BaseStub.php b/src/php/lib/Grpc/BaseStub.php index aec60af094..a9e77b9396 100644 --- a/src/php/lib/Grpc/BaseStub.php +++ b/src/php/lib/Grpc/BaseStub.php @@ -271,7 +271,7 @@ class BaseStub * @return ClientStreamingSurfaceActiveCall The active call object */ public function _clientStreamRequest($method, - callable $deserialize, + $deserialize, array $metadata = [], array $options = []) { @@ -307,7 +307,7 @@ class BaseStub */ public function _serverStreamRequest($method, $argument, - callable $deserialize, + $deserialize, array $metadata = [], array $options = []) { @@ -340,7 +340,7 @@ class BaseStub * @return BidiStreamingSurfaceActiveCall The active call object */ public function _bidiRequest($method, - callable $deserialize, + $deserialize, array $metadata = [], array $options = []) { |