diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
| commit | eb35a1d16bf7ccdb3e4006203ad63e5865454652 (patch) | |
| tree | e7445fb61be3ff9b3d8a2ed9a8a5b5a4c544609d /src/php | |
| parent | 15195741d7758a80bcf901e7db05b3c57654c4a3 (diff) | |
| parent | 20e77f27b0cf2cb1305df21a91e6a51d9a4171d1 (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'src/php')
| -rw-r--r-- | src/php/README.md | 4 | ||||
| -rw-r--r-- | src/php/composer.json | 1 | ||||
| -rwxr-xr-x | src/php/tests/interop/interop_client.php | 13 |
3 files changed, 10 insertions, 8 deletions
diff --git a/src/php/README.md b/src/php/README.md index 0e5b4de31e..1b15768d44 100644 --- a/src/php/README.md +++ b/src/php/README.md @@ -4,10 +4,6 @@ This directory contains source code for PHP implementation of gRPC layered on shared C library. -#Status - -GA - ## Environment **Prerequisite:** diff --git a/src/php/composer.json b/src/php/composer.json index 6042094032..2d5d555bc2 100644 --- a/src/php/composer.json +++ b/src/php/composer.json @@ -8,6 +8,7 @@ "version": "1.1.0", "require": { "php": ">=5.5.0", + "ext-grpc": "*", "google/protobuf": "v3.1.0-alpha-1" }, "require-dev": { diff --git a/src/php/tests/interop/interop_client.php b/src/php/tests/interop/interop_client.php index 124d324913..72012a49d0 100755 --- a/src/php/tests/interop/interop_client.php +++ b/src/php/tests/interop/interop_client.php @@ -477,9 +477,11 @@ function statusCodeAndMessage($stub) list($result, $status) = $call->wait(); hardAssert($status->code === 2, - 'Received unexpected status code'); + 'Received unexpected UnaryCall status code: ' . + $status->code); hardAssert($status->details === 'test status message', - 'Received unexpected status details'); + 'Received unexpected UnaryCall status details: ' . + $status->details); $streaming_call = $stub->FullDuplexCall(); @@ -487,12 +489,15 @@ function statusCodeAndMessage($stub) $streaming_request->setResponseStatus($echo_status); $streaming_call->write($streaming_request); $streaming_call->writesDone(); + $result = $streaming_call->read(); $status = $streaming_call->getStatus(); hardAssert($status->code === 2, - 'Received unexpected status code'); + 'Received unexpected FullDuplexCall status code: ' . + $status->code); hardAssert($status->details === 'test status message', - 'Received unexpected status details'); + 'Received unexpected FullDuplexCall status details: ' . + $status->details); } function unimplementedMethod($stub) |