Merge pull request #9416 from thinkerou/update_method_property_visibility
PHP: Update the visibility property of method
diff --git a/src/php/lib/Grpc/AbstractCall.php b/src/php/lib/Grpc/AbstractCall.php
index 1d51a8e..40387ab 100644
--- a/src/php/lib/Grpc/AbstractCall.php
+++ b/src/php/lib/Grpc/AbstractCall.php
@@ -126,7 +126,7 @@
*
* @return string The protobuf binary format
*/
- protected function serializeMessage($data)
+ protected function _serializeMessage($data)
{
// Proto3 implementation
if (method_exists($data, 'encode')) {
@@ -144,7 +144,7 @@
*
* @return mixed The deserialized value
*/
- protected function deserializeResponse($value)
+ protected function _deserializeResponse($value)
{
if ($value === null) {
return;
diff --git a/src/php/lib/Grpc/BaseStub.php b/src/php/lib/Grpc/BaseStub.php
index a9e77b9..ed504f8 100644
--- a/src/php/lib/Grpc/BaseStub.php
+++ b/src/php/lib/Grpc/BaseStub.php
@@ -146,6 +146,14 @@
}
/**
+ * Close the communication channel associated with this stub.
+ */
+ public function close()
+ {
+ $this->channel->close();
+ }
+
+ /**
* @param $new_state Connect state
*
* @return bool true if state is CHANNEL_READY
@@ -164,14 +172,6 @@
}
/**
- * Close the communication channel associated with this stub.
- */
- public function close()
- {
- $this->channel->close();
- }
-
- /**
* constructs the auth uri for the jwt.
*
* @param string $method The method string
@@ -235,7 +235,7 @@
*
* @return SimpleSurfaceActiveCall The active call object
*/
- public function _simpleRequest($method,
+ protected function _simpleRequest($method,
$argument,
$deserialize,
array $metadata = [],
@@ -270,7 +270,7 @@
*
* @return ClientStreamingSurfaceActiveCall The active call object
*/
- public function _clientStreamRequest($method,
+ protected function _clientStreamRequest($method,
$deserialize,
array $metadata = [],
array $options = [])
@@ -305,7 +305,7 @@
*
* @return ServerStreamingSurfaceActiveCall The active call object
*/
- public function _serverStreamRequest($method,
+ protected function _serverStreamRequest($method,
$argument,
$deserialize,
array $metadata = [],
@@ -339,7 +339,7 @@
*
* @return BidiStreamingSurfaceActiveCall The active call object
*/
- public function _bidiRequest($method,
+ protected function _bidiRequest($method,
$deserialize,
array $metadata = [],
array $options = [])
diff --git a/src/php/lib/Grpc/BidiStreamingCall.php b/src/php/lib/Grpc/BidiStreamingCall.php
index b03bbd2..7cb200d 100644
--- a/src/php/lib/Grpc/BidiStreamingCall.php
+++ b/src/php/lib/Grpc/BidiStreamingCall.php
@@ -69,7 +69,7 @@
$this->metadata = $read_event->metadata;
}
- return $this->deserializeResponse($read_event->message);
+ return $this->_deserializeResponse($read_event->message);
}
/**
@@ -82,7 +82,7 @@
*/
public function write($data, array $options = [])
{
- $message_array = ['message' => $this->serializeMessage($data)];
+ $message_array = ['message' => $this->_serializeMessage($data)];
if (array_key_exists('flags', $options)) {
$message_array['flags'] = $options['flags'];
}
diff --git a/src/php/lib/Grpc/ClientStreamingCall.php b/src/php/lib/Grpc/ClientStreamingCall.php
index c542f08..6454cbc 100644
--- a/src/php/lib/Grpc/ClientStreamingCall.php
+++ b/src/php/lib/Grpc/ClientStreamingCall.php
@@ -63,7 +63,7 @@
*/
public function write($data, array $options = [])
{
- $message_array = ['message' => $this->serializeMessage($data)];
+ $message_array = ['message' => $this->_serializeMessage($data)];
if (array_key_exists('flags', $options)) {
$message_array['flags'] = $options['flags'];
}
@@ -90,6 +90,6 @@
$status = $event->status;
$this->trailing_metadata = $status->metadata;
- return [$this->deserializeResponse($event->message), $status];
+ return [$this->_deserializeResponse($event->message), $status];
}
}
diff --git a/src/php/lib/Grpc/ServerStreamingCall.php b/src/php/lib/Grpc/ServerStreamingCall.php
index 406512b..8659f6b 100644
--- a/src/php/lib/Grpc/ServerStreamingCall.php
+++ b/src/php/lib/Grpc/ServerStreamingCall.php
@@ -51,7 +51,7 @@
*/
public function start($data, array $metadata = [], array $options = [])
{
- $message_array = ['message' => $this->serializeMessage($data)];
+ $message_array = ['message' => $this->_serializeMessage($data)];
if (array_key_exists('flags', $options)) {
$message_array['flags'] = $options['flags'];
}
@@ -73,7 +73,7 @@
OP_RECV_MESSAGE => true,
])->message;
while ($response !== null) {
- yield $this->deserializeResponse($response);
+ yield $this->_deserializeResponse($response);
$response = $this->call->startBatch([
OP_RECV_MESSAGE => true,
])->message;
diff --git a/src/php/lib/Grpc/UnaryCall.php b/src/php/lib/Grpc/UnaryCall.php
index 3c1cb15..b8b1ed6 100644
--- a/src/php/lib/Grpc/UnaryCall.php
+++ b/src/php/lib/Grpc/UnaryCall.php
@@ -51,7 +51,7 @@
*/
public function start($data, array $metadata = [], array $options = [])
{
- $message_array = ['message' => $this->serializeMessage($data)];
+ $message_array = ['message' => $this->_serializeMessage($data)];
if (isset($options['flags'])) {
$message_array['flags'] = $options['flags'];
}
@@ -79,6 +79,6 @@
$status = $event->status;
$this->trailing_metadata = $status->metadata;
- return [$this->deserializeResponse($event->message), $status];
+ return [$this->_deserializeResponse($event->message), $status];
}
}