|
|
@ -152,7 +152,7 @@ class BaseStub { |
|
|
|
$timeout = $metadata['timeout']; |
|
|
|
$timeout = $metadata['timeout']; |
|
|
|
unset($metadata_copy['timeout']); |
|
|
|
unset($metadata_copy['timeout']); |
|
|
|
} |
|
|
|
} |
|
|
|
return array($metadata_copy, $timeout); |
|
|
|
return [$metadata_copy, $timeout]; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -162,7 +162,7 @@ class BaseStub { |
|
|
|
* @throw InvalidArgumentException if key contains invalid characters |
|
|
|
* @throw InvalidArgumentException if key contains invalid characters |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
private function _validate_and_normalize_metadata($metadata) { |
|
|
|
private function _validate_and_normalize_metadata($metadata) { |
|
|
|
$metadata_copy = array(); |
|
|
|
$metadata_copy = []; |
|
|
|
foreach ($metadata as $key => $value) { |
|
|
|
foreach ($metadata as $key => $value) { |
|
|
|
if (!preg_match('/^[A-Za-z\d_-]+$/', $key)) { |
|
|
|
if (!preg_match('/^[A-Za-z\d_-]+$/', $key)) { |
|
|
|
throw new \InvalidArgumentException( |
|
|
|
throw new \InvalidArgumentException( |
|
|
@ -189,8 +189,8 @@ class BaseStub { |
|
|
|
public function _simpleRequest($method, |
|
|
|
public function _simpleRequest($method, |
|
|
|
$argument, |
|
|
|
$argument, |
|
|
|
callable $deserialize, |
|
|
|
callable $deserialize, |
|
|
|
$metadata = array(), |
|
|
|
$metadata = [], |
|
|
|
$options = array()) { |
|
|
|
$options = []) { |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
$call = new UnaryCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$call = new UnaryCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
@ -217,7 +217,7 @@ class BaseStub { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function _clientStreamRequest($method, |
|
|
|
public function _clientStreamRequest($method, |
|
|
|
callable $deserialize, |
|
|
|
callable $deserialize, |
|
|
|
$metadata = array()) { |
|
|
|
$metadata = []) { |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
$call = new ClientStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$call = new ClientStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
@ -244,8 +244,8 @@ class BaseStub { |
|
|
|
public function _serverStreamRequest($method, |
|
|
|
public function _serverStreamRequest($method, |
|
|
|
$argument, |
|
|
|
$argument, |
|
|
|
callable $deserialize, |
|
|
|
callable $deserialize, |
|
|
|
$metadata = array(), |
|
|
|
$metadata = [], |
|
|
|
$options = array()) { |
|
|
|
$options = []) { |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
$call = new ServerStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$call = new ServerStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
@ -269,7 +269,7 @@ class BaseStub { |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function _bidiRequest($method, |
|
|
|
public function _bidiRequest($method, |
|
|
|
callable $deserialize, |
|
|
|
callable $deserialize, |
|
|
|
$metadata = array()) { |
|
|
|
$metadata = []) { |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
list($actual_metadata, $timeout) = $this->_extract_timeout_from_metadata($metadata); |
|
|
|
$call = new BidiStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$call = new BidiStreamingCall($this->channel, $method, $deserialize, $timeout); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
|
$jwt_aud_uri = $this->_get_jwt_aud_uri($method); |
|
|
|