.google.protobuf.Duration duration_value = 6;
@@ -340,7 +342,7 @@ public function clearInt64Value()
*/
public function getInt64ValueUnwrapped()
{
- return $this->readWrapperValue("int64_value");
+ return $this->readWrapperValue('int64_value');
}
/**
@@ -365,8 +367,9 @@ public function setInt64Value($var)
*/
public function setInt64ValueUnwrapped($var)
{
- $this->writeWrapperValue("int64_value", $var);
- return $this;}
+ $this->writeWrapperValue('int64_value', $var);
+ return $this;
+ }
/**
* Generated from protobuf field .google.protobuf.ListValue list_value = 9;
@@ -427,7 +430,7 @@ public function clearStringValue()
*/
public function getStringValueUnwrapped()
{
- return $this->readWrapperValue("string_value");
+ return $this->readWrapperValue('string_value');
}
/**
@@ -452,8 +455,9 @@ public function setStringValue($var)
*/
public function setStringValueUnwrapped($var)
{
- $this->writeWrapperValue("string_value", $var);
- return $this;}
+ $this->writeWrapperValue('string_value', $var);
+ return $this;
+ }
/**
* Generated from protobuf field .google.protobuf.Struct struct_value = 11;
@@ -572,7 +576,7 @@ public function hasField1()
*/
public function setField1($var)
{
- GPBUtil::checkString($var, True);
+ GPBUtil::checkString($var, true);
$this->writeOneof(14, $var);
return $this;
@@ -599,7 +603,7 @@ public function hasField2()
*/
public function setField2($var)
{
- GPBUtil::checkString($var, True);
+ GPBUtil::checkString($var, true);
$this->writeOneof(15, $var);
return $this;
@@ -626,7 +630,7 @@ public function hasField3()
*/
public function setField3($var)
{
- GPBUtil::checkString($var, True);
+ GPBUtil::checkString($var, true);
$this->writeOneof(16, $var);
return $this;
@@ -637,8 +641,7 @@ public function setField3($var)
*/
public function getOneofField()
{
- return $this->whichOneof("oneof_field");
+ return $this->whichOneof('oneof_field');
}
}
-
diff --git a/lib/Google/vendor/google/gax/src/Testing/MockResponse.php b/lib/Google/vendor/google/gax/src/Testing/MockResponse.php
index fa9c75570..cbe7ba659 100644
--- a/lib/Google/vendor/google/gax/src/Testing/MockResponse.php
+++ b/lib/Google/vendor/google/gax/src/Testing/MockResponse.php
@@ -47,7 +47,8 @@ class MockResponse extends \Google\Protobuf\Internal\Message
* @type array|\Google\Protobuf\Internal\MapField $resources_map
* }
*/
- public function __construct($data = NULL) {
+ public function __construct($data = null)
+ {
\GPBMetadata\ApiCore\Testing\Mocks::initOnce();
parent::__construct($data);
}
@@ -68,7 +69,7 @@ public function getName()
*/
public function setName($var)
{
- GPBUtil::checkString($var, True);
+ GPBUtil::checkString($var, true);
$this->name = $var;
return $this;
@@ -134,7 +135,7 @@ public function getNextPageToken()
*/
public function setNextPageToken($var)
{
- GPBUtil::checkString($var, True);
+ GPBUtil::checkString($var, true);
$this->next_page_token = $var;
return $this;
@@ -163,4 +164,3 @@ public function setResourcesMap($var)
}
}
-
diff --git a/lib/Google/vendor/google/gax/src/Testing/MockServerStreamingCall.php b/lib/Google/vendor/google/gax/src/Testing/MockServerStreamingCall.php
index dd6378bef..d0dcead5d 100644
--- a/lib/Google/vendor/google/gax/src/Testing/MockServerStreamingCall.php
+++ b/lib/Google/vendor/google/gax/src/Testing/MockServerStreamingCall.php
@@ -57,7 +57,7 @@ class MockServerStreamingCall extends \Grpc\ServerStreamingCall implements Serve
* @param callable|array|null $deserialize An optional deserialize method for the response object.
* @param stdClass|null $status An optional status object. If set to null, a status of OK is used.
*/
- public function __construct(array $responses, $deserialize = null, stdClass $status = null)
+ public function __construct(array $responses, $deserialize = null, ?stdClass $status = null)
{
$this->responses = $responses;
$this->deserialize = $deserialize;
@@ -88,7 +88,7 @@ public function getStatus()
{
if (count($this->responses) > 0) {
throw new ApiException(
- "Calls to getStatus() will block if all responses are not read",
+ 'Calls to getStatus() will block if all responses are not read',
Code::INTERNAL,
ApiStatus::INTERNAL
);
diff --git a/lib/Google/vendor/google/gax/src/Testing/MockStatus.php b/lib/Google/vendor/google/gax/src/Testing/MockStatus.php
index fb5ea340e..6f2906356 100644
--- a/lib/Google/vendor/google/gax/src/Testing/MockStatus.php
+++ b/lib/Google/vendor/google/gax/src/Testing/MockStatus.php
@@ -44,7 +44,7 @@ class MockStatus extends stdClass
public $code;
public $details;
public $metadata;
- public function __construct($code, string $details = null, array $metadata = [])
+ public function __construct($code, ?string $details = null, array $metadata = [])
{
$this->code = $code;
$this->details = $details;
diff --git a/lib/Google/vendor/google/gax/src/Testing/MockStubTrait.php b/lib/Google/vendor/google/gax/src/Testing/MockStubTrait.php
index 7d7e58ae0..db69910aa 100644
--- a/lib/Google/vendor/google/gax/src/Testing/MockStubTrait.php
+++ b/lib/Google/vendor/google/gax/src/Testing/MockStubTrait.php
@@ -33,8 +33,8 @@
namespace Google\ApiCore\Testing;
use Google\Protobuf\Internal\Message;
-use UnderflowException;
use stdClass;
+use UnderflowException;
/**
* The MockStubTrait is used by generated mock stub classes which extent \Grpc\BaseStub
@@ -52,7 +52,7 @@ trait MockStubTrait
private $callObjects = [];
private $deserialize;
- public function __construct(callable $deserialize = null)
+ public function __construct(?callable $deserialize = null)
{
$this->deserialize = $deserialize;
}
@@ -77,7 +77,7 @@ public function _simpleRequest(
) {
$this->receivedFuncCalls[] = new ReceivedRequest($method, $argument, $deserialize, $metadata, $options);
if (count($this->responses) < 1) {
- throw new UnderflowException("ran out of responses");
+ throw new UnderflowException('ran out of responses');
}
list($response, $status) = array_shift($this->responses);
$call = new MockUnaryCall($response, $deserialize, $status);
@@ -106,7 +106,7 @@ public function _clientStreamRequest(
) {
$this->receivedFuncCalls[] = new ReceivedRequest($method, null, $deserialize, $metadata, $options);
if (count($this->responses) < 1) {
- throw new UnderflowException("ran out of responses");
+ throw new UnderflowException('ran out of responses');
}
list($response, $status) = array_shift($this->responses);
$call = new MockClientStreamingCall($response, $deserialize, $status);
@@ -196,7 +196,7 @@ public static function stripStatusFromResponses($responses)
* @param \Google\Protobuf\Internal\Message $response
* @param stdClass $status
*/
- public function addResponse($response, stdClass $status = null)
+ public function addResponse($response, ?stdClass $status = null)
{
if (!$this->deserialize && $response) {
$this->deserialize = [get_class($response), 'decode'];
@@ -263,7 +263,7 @@ public function isExhausted()
* @param callable $deserialize
* @return static An instance of the current class type.
*/
- public static function create($responseObject, stdClass $status = null, callable $deserialize = null)
+ public static function create($responseObject, ?stdClass $status = null, ?callable $deserialize = null)
{
$stub = new static($deserialize); // @phpstan-ignore-line
$stub->addResponse($responseObject, $status);
@@ -277,7 +277,7 @@ public static function create($responseObject, stdClass $status = null, callable
* @param stdClass $finalStatus
* @return static An instance of the current class type.
*/
- public static function createWithResponseSequence(array $sequence, callable $deserialize = null, stdClass $finalStatus = null)
+ public static function createWithResponseSequence(array $sequence, ?callable $deserialize = null, ?stdClass $finalStatus = null)
{
$stub = new static($deserialize); // @phpstan-ignore-line
foreach ($sequence as $elem) {
diff --git a/lib/Google/vendor/google/gax/src/Testing/MockUnaryCall.php b/lib/Google/vendor/google/gax/src/Testing/MockUnaryCall.php
index 99afce996..431b041bf 100644
--- a/lib/Google/vendor/google/gax/src/Testing/MockUnaryCall.php
+++ b/lib/Google/vendor/google/gax/src/Testing/MockUnaryCall.php
@@ -32,8 +32,8 @@
namespace Google\ApiCore\Testing;
-use Google\Rpc\Code;
use Google\Protobuf\Internal\Message;
+use Google\Rpc\Code;
use stdClass;
/**
@@ -59,7 +59,7 @@ class MockUnaryCall extends \Grpc\UnaryCall
* @param callable|array|null $deserialize An optional deserialize method for the response object.
* @param stdClass|null $status An optional status object. If set to null, a status of OK is used.
*/
- public function __construct($response = null, $deserialize = null, stdClass $status = null)
+ public function __construct($response = null, $deserialize = null, ?stdClass $status = null)
{
$this->response = $response;
$this->deserialize = $deserialize;
diff --git a/lib/Google/vendor/google/gax/src/Testing/ProtobufGPBEmptyComparator.php b/lib/Google/vendor/google/gax/src/Testing/ProtobufGPBEmptyComparator.php
index 834a7f91a..b6871a8e4 100644
--- a/lib/Google/vendor/google/gax/src/Testing/ProtobufGPBEmptyComparator.php
+++ b/lib/Google/vendor/google/gax/src/Testing/ProtobufGPBEmptyComparator.php
@@ -36,7 +36,7 @@ class ProtobufGPBEmptyComparator extends Comparator
*/
public function accepts($expected, $actual)
{
- return $expected instanceof GPBEmpty && $actual instanceof GPBEmpty;
+ return $expected instanceof GPBEmpty && $actual instanceof GPBEmpty;
}
/**
@@ -54,7 +54,7 @@ public function accepts($expected, $actual)
* fails. Contains information about the
* specific errors that lead to the failure.
*/
- public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = false, $ignoreCase = false)
{
// No need to do anything here.
}
diff --git a/lib/Google/vendor/google/gax/src/Testing/ProtobufMessageComparator.php b/lib/Google/vendor/google/gax/src/Testing/ProtobufMessageComparator.php
index 472e941f2..55fb21367 100644
--- a/lib/Google/vendor/google/gax/src/Testing/ProtobufMessageComparator.php
+++ b/lib/Google/vendor/google/gax/src/Testing/ProtobufMessageComparator.php
@@ -63,7 +63,7 @@ public function accepts($expected, $actual)
* fails. Contains information about the
* specific errors that lead to the failure.
*/
- public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
+ public function assertEquals($expected, $actual, $delta = 0, $canonicalize = false, $ignoreCase = false)
{
if ($expected->serializeToString() !== $actual->serializeToString()) {
throw new ComparisonFailure(
diff --git a/lib/Google/vendor/google/gax/src/Transport/GrpcFallbackTransport.php b/lib/Google/vendor/google/gax/src/Transport/GrpcFallbackTransport.php
index 1cd48376e..b248b052e 100644
--- a/lib/Google/vendor/google/gax/src/Transport/GrpcFallbackTransport.php
+++ b/lib/Google/vendor/google/gax/src/Transport/GrpcFallbackTransport.php
@@ -62,7 +62,7 @@ class GrpcFallbackTransport implements TransportInterface
*/
public function __construct(
string $baseUri,
- callable $httpHandler
+ callable $httpHandler,
) {
$this->baseUri = $baseUri;
$this->httpHandler = $httpHandler;
@@ -87,9 +87,10 @@ public static function build(string $apiEndpoint, array $config = [])
$config += [
'httpHandler' => null,
'clientCertSource' => null,
+ 'logger' => null,
];
list($baseUri, $port) = self::normalizeServiceAddress($apiEndpoint);
- $httpHandler = $config['httpHandler'] ?: self::buildHttpHandlerAsync();
+ $httpHandler = $config['httpHandler'] ?: self::buildHttpHandlerAsync(logger: $config['logger']);
$transport = new GrpcFallbackTransport("$baseUri:$port", $httpHandler);
if ($config['clientCertSource']) {
$transport->configureMtlsChannel($config['clientCertSource']);
@@ -103,6 +104,9 @@ public static function build(string $apiEndpoint, array $config = [])
public function startUnaryCall(Call $call, array $options)
{
$httpHandler = $this->httpHandler;
+
+ $options['requestId'] = crc32((string) spl_object_id($call) . getmypid());
+
return $httpHandler(
$this->buildRequest($call, $options),
$this->getCallOptions($options)
@@ -159,8 +163,8 @@ private function unpackResponse(Call $call, ResponseInterface $response)
{
$decodeType = $call->getDecodeType();
/** @var Message $responseMessage */
- $responseMessage = new $decodeType;
- $responseMessage->mergeFromString((string)$response->getBody());
+ $responseMessage = new $decodeType();
+ $responseMessage->mergeFromString((string) $response->getBody());
return $responseMessage;
}
@@ -176,6 +180,14 @@ private function getCallOptions(array $options)
$callOptions['timeout'] = $options['timeoutMillis'] / 1000;
}
+ if (isset($options['retryAttempt'])) {
+ $callOptions['retryAttempt'] = $options['retryAttempt'];
+ }
+
+ if (isset($options['requestId'])) {
+ $callOptions['requestId'] = $options['requestId'];
+ }
+
if ($this->clientCertSource) {
list($cert, $key) = self::loadClientCertSource($this->clientCertSource);
$callOptions['cert'] = $cert;
diff --git a/lib/Google/vendor/google/gax/src/Transport/GrpcTransport.php b/lib/Google/vendor/google/gax/src/Transport/GrpcTransport.php
index 3bc3328e8..ebcbc07b2 100644
--- a/lib/Google/vendor/google/gax/src/Transport/GrpcTransport.php
+++ b/lib/Google/vendor/google/gax/src/Transport/GrpcTransport.php
@@ -44,12 +44,15 @@
use Google\ApiCore\Transport\Grpc\UnaryInterceptorInterface;
use Google\ApiCore\ValidationException;
use Google\ApiCore\ValidationTrait;
+use Google\Auth\Logging\LoggingTrait;
+use Google\Auth\Logging\RpcLogEvent;
use Google\Rpc\Code;
use Grpc\BaseStub;
use Grpc\Channel;
use Grpc\ChannelCredentials;
use Grpc\Interceptor;
use GuzzleHttp\Promise\Promise;
+use Psr\Log\LoggerInterface;
/**
* A gRPC based transport implementation.
@@ -59,6 +62,9 @@ class GrpcTransport extends BaseStub implements TransportInterface
use ValidationTrait;
use GrpcSupportTrait;
use ServiceAddressTrait;
+ use LoggingTrait;
+
+ private null|LoggerInterface $logger;
/**
* @param string $hostname
@@ -75,10 +81,16 @@ class GrpcTransport extends BaseStub implements TransportInterface
* release. To prepare for this, please take the time to convert
* `UnaryInterceptorInterface` implementations over to a class which
* extends {@see Grpc\Interceptor}.
+ * @param null|false|LoggerInterface $logger A PSR-3 Compliant logger.
* @throws Exception
*/
- public function __construct(string $hostname, array $opts, Channel $channel = null, array $interceptors = [])
- {
+ public function __construct(
+ string $hostname,
+ array $opts,
+ ?Channel $channel = null,
+ array $interceptors = [],
+ null|false|LoggerInterface $logger = null
+ ) {
if ($interceptors) {
$channel = Interceptor::intercept(
$channel ?: new Channel($hostname, $opts),
@@ -87,6 +99,7 @@ public function __construct(string $hostname, array $opts, Channel $channel = nu
}
parent::__construct($hostname, $opts, $channel);
+ $this->logger = $logger;
}
/**
@@ -122,6 +135,7 @@ public static function build(string $apiEndpoint, array $config = [])
'channel' => null,
'interceptors' => [],
'clientCertSource' => null,
+ 'logger' => null,
];
list($addr, $port) = self::normalizeServiceAddress($apiEndpoint);
$host = "$addr:$port";
@@ -140,14 +154,17 @@ public static function build(string $apiEndpoint, array $config = [])
if (!is_null($channel) && !($channel instanceof Channel)) {
throw new ValidationException(
"Channel argument to GrpcTransport must be of type \Grpc\Channel, " .
- "instead got: " . print_r($channel, true)
+ 'instead got: ' . print_r($channel, true)
);
}
try {
- return new GrpcTransport($host, $stubOpts, $channel, $config['interceptors']);
+ if ($config['logger'] === false) {
+ $config['logger'] = null;
+ }
+ return new GrpcTransport($host, $stubOpts, $channel, $config['interceptors'], $config['logger']);
} catch (Exception $ex) {
throw new ValidationException(
- "Failed to build GrpcTransport: " . $ex->getMessage(),
+ 'Failed to build GrpcTransport: ' . $ex->getMessage(),
$ex->getCode(),
$ex
);
@@ -168,7 +185,8 @@ public function startBidiStreamingCall(Call $call, array $options)
isset($options['headers']) ? $options['headers'] : [],
$this->getCallOptions($options)
),
- $call->getDescriptor()
+ $call->getDescriptor(),
+ $this->logger
);
}
@@ -187,7 +205,8 @@ public function startClientStreamingCall(Call $call, array $options)
isset($options['headers']) ? $options['headers'] : [],
$this->getCallOptions($options)
),
- $call->getDescriptor()
+ $call->getDescriptor(),
+ $this->logger
);
}
@@ -212,10 +231,28 @@ public function startServerStreamingCall(Call $call, array $options)
isset($options['headers']) ? $options['headers'] : [],
$this->getCallOptions($options)
);
- return new ServerStream(
+
+ $serverStream = new ServerStream(
new ServerStreamingCallWrapper($stream),
- $call->getDescriptor()
+ $call->getDescriptor(),
+ $this->logger
);
+
+ if ($this->logger) {
+ $requestEvent = new RpcLogEvent();
+
+ $requestEvent->headers = $options['headers'];
+ $requestEvent->payload = $call->getMessage()->serializeToJsonString();
+ $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
+ $requestEvent->serviceName = $options['serviceName'] ?? null;
+ $requestEvent->rpcName = $call->getMethod();
+ $requestEvent->processId = (int) getmypid();
+ $requestEvent->requestId = crc32((string) spl_object_id($serverStream) . getmypid());
+
+ $this->logRequest($requestEvent);
+ }
+
+ return $serverStream;
}
/**
@@ -224,6 +261,8 @@ public function startServerStreamingCall(Call $call, array $options)
public function startUnaryCall(Call $call, array $options)
{
$this->verifyUniverseDomain($options);
+ $headers = $options['headers'] ?? [];
+ $requestEvent = null;
$unaryCall = $this->_simpleRequest(
'/' . $call->getMethod(),
@@ -233,11 +272,37 @@ public function startUnaryCall(Call $call, array $options)
$this->getCallOptions($options)
);
+ if ($this->logger) {
+ $requestEvent = new RpcLogEvent();
+
+ $requestEvent->headers = $headers;
+ $requestEvent->payload = $call->getMessage()->serializeToJsonString();
+ $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
+ $requestEvent->serviceName = $options['serviceName'] ?? null;
+ $requestEvent->rpcName = $call->getMethod();
+ $requestEvent->processId = (int) getmypid();
+ $requestEvent->requestId = crc32((string) spl_object_id($call) . getmypid());
+
+ $this->logRequest($requestEvent);
+ }
+
/** @var Promise $promise */
$promise = new Promise(
- function () use ($unaryCall, $options, &$promise) {
+ function () use ($unaryCall, $options, &$promise, $requestEvent) {
list($response, $status) = $unaryCall->wait();
+ if ($this->logger) {
+ $responseEvent = new RpcLogEvent($requestEvent->milliseconds);
+
+ $responseEvent->headers = $status->metadata;
+ $responseEvent->payload = ($response) ? $response->serializeToJsonString() : null;
+ $responseEvent->status = $status->code;
+ $responseEvent->processId = $requestEvent->processId;
+ $responseEvent->requestId = $requestEvent->requestId;
+
+ $this->logResponse($responseEvent);
+ }
+
if ($status->code == Code::OK) {
if (isset($options['metadataCallback'])) {
$metadataCallback = $options['metadataCallback'];
diff --git a/lib/Google/vendor/google/gax/src/Transport/HttpUnaryTransportTrait.php b/lib/Google/vendor/google/gax/src/Transport/HttpUnaryTransportTrait.php
index 1bcc686b5..38c4ca1f5 100644
--- a/lib/Google/vendor/google/gax/src/Transport/HttpUnaryTransportTrait.php
+++ b/lib/Google/vendor/google/gax/src/Transport/HttpUnaryTransportTrait.php
@@ -35,6 +35,7 @@
use Google\ApiCore\Call;
use Google\ApiCore\ValidationException;
use Google\Auth\HttpHandler\HttpHandlerFactory;
+use Psr\Log\LoggerInterface;
/**
* A trait for shared functionality between transports that support only unary RPCs using simple
@@ -126,12 +127,12 @@ private static function buildCommonHeaders(array $options)
* @return callable
* @throws ValidationException
*/
- private static function buildHttpHandlerAsync()
+ private static function buildHttpHandlerAsync(null|false|LoggerInterface $logger = null)
{
try {
- return [HttpHandlerFactory::build(), 'async'];
+ return [HttpHandlerFactory::build(logger: $logger), 'async'];
} catch (Exception $ex) {
- throw new ValidationException("Failed to build HttpHandler", $ex->getCode(), $ex);
+ throw new ValidationException('Failed to build HttpHandler', $ex->getCode(), $ex);
}
}
diff --git a/lib/Google/vendor/google/gax/src/Transport/Rest/JsonStreamDecoder.php b/lib/Google/vendor/google/gax/src/Transport/Rest/JsonStreamDecoder.php
index b173cf3a1..c01f21135 100644
--- a/lib/Google/vendor/google/gax/src/Transport/Rest/JsonStreamDecoder.php
+++ b/lib/Google/vendor/google/gax/src/Transport/Rest/JsonStreamDecoder.php
@@ -164,7 +164,7 @@ private function _decode()
if ($b === '}' && !$str) {
$level--;
if ($level === 1) {
- $end = $cursor+1;
+ $end = $cursor + 1;
}
}
// Track the closing of an array if not in a string value.
@@ -195,7 +195,7 @@ private function _decode()
// Dump the part of the chunk used for parsing the message
// and use the remaining for the next message.
- $remaining = $chunkLength-$length;
+ $remaining = $chunkLength - $length;
$chunk = substr($chunk, $end, $remaining);
// Reset all indices and exit chunk processing.
diff --git a/lib/Google/vendor/google/gax/src/Transport/RestTransport.php b/lib/Google/vendor/google/gax/src/Transport/RestTransport.php
index 294879807..296937fa4 100644
--- a/lib/Google/vendor/google/gax/src/Transport/RestTransport.php
+++ b/lib/Google/vendor/google/gax/src/Transport/RestTransport.php
@@ -31,9 +31,9 @@
*/
namespace Google\ApiCore\Transport;
-use BadMethodCallException;
use Google\ApiCore\ApiException;
use Google\ApiCore\Call;
+use Google\ApiCore\InsecureRequestBuilder;
use Google\ApiCore\RequestBuilder;
use Google\ApiCore\ServerStream;
use Google\ApiCore\ServiceAddressTrait;
@@ -84,6 +84,7 @@ public function __construct(
*
* @type callable $httpHandler A handler used to deliver PSR-7 requests.
* @type callable $clientCertSource A callable which returns the client cert as a string.
+ * @type bool $hasEmulator True if the emulator is enabled.
* }
* @return RestTransport
* @throws ValidationException
@@ -93,10 +94,14 @@ public static function build(string $apiEndpoint, string $restConfigPath, array
$config += [
'httpHandler' => null,
'clientCertSource' => null,
+ 'hasEmulator' => false,
+ 'logger' => null,
];
list($baseUri, $port) = self::normalizeServiceAddress($apiEndpoint);
- $requestBuilder = new RequestBuilder("$baseUri:$port", $restConfigPath);
- $httpHandler = $config['httpHandler'] ?: self::buildHttpHandlerAsync();
+ $requestBuilder = $config['hasEmulator']
+ ? new InsecureRequestBuilder("$baseUri:$port", $restConfigPath)
+ : new RequestBuilder("$baseUri:$port", $restConfigPath);
+ $httpHandler = $config['httpHandler'] ?: self::buildHttpHandlerAsync($config['logger']);
$transport = new RestTransport($requestBuilder, $httpHandler);
if ($config['clientCertSource']) {
$transport->configureMtlsChannel($config['clientCertSource']);
@@ -111,6 +116,9 @@ public function startUnaryCall(Call $call, array $options)
{
$headers = self::buildCommonHeaders($options);
+ // Add the $call object ID for logging
+ $options['requestId'] = crc32((string) spl_object_id($call) . getmypid());
+
// call the HTTP handler
$httpHandler = $this->httpHandler;
return $httpHandler(
@@ -124,7 +132,7 @@ public function startUnaryCall(Call $call, array $options)
function (ResponseInterface $response) use ($call, $options) {
$decodeType = $call->getDecodeType();
/** @var Message $return */
- $return = new $decodeType;
+ $return = new $decodeType();
$body = (string) $response->getBody();
// In some rare cases LRO response metadata may not be loaded
@@ -262,6 +270,14 @@ private function getCallOptions(array $options)
$callOptions['key'] = $key;
}
+ if (isset($options['retryAttempt'])) {
+ $callOptions['retryAttempt'] = $options['retryAttempt'];
+ }
+
+ if (isset($options['requestId'])) {
+ $callOptions['requestId'] = $options['requestId'];
+ }
+
return $callOptions;
}
}
diff --git a/lib/Google/vendor/google/gax/src/Version.php b/lib/Google/vendor/google/gax/src/Version.php
index 0d2f44928..f181dd874 100644
--- a/lib/Google/vendor/google/gax/src/Version.php
+++ b/lib/Google/vendor/google/gax/src/Version.php
@@ -64,7 +64,7 @@ public static function readVersionFile(string $file)
{
$versionString = file_exists($file)
? (string) file_get_contents($file)
- : "";
+ : '';
return trim($versionString);
}
diff --git a/lib/Google/vendor/google/longrunning/README.md b/lib/Google/vendor/google/longrunning/README.md
index 47c49d302..2b34d4f29 100644
--- a/lib/Google/vendor/google/longrunning/README.md
+++ b/lib/Google/vendor/google/longrunning/README.md
@@ -28,6 +28,11 @@ please see our [gRPC installation guide](https://cloud.google.com/php/grpc).
Please see our [Authentication guide](https://github.com/googleapis/google-cloud-php/blob/main/AUTHENTICATION.md) for more information
on authenticating your client. Once authenticated, you'll be ready to start making requests.
+### Debugging
+
+Please see our [Debugging guide](https://github.com/googleapis/google-cloud-php/blob/main/DEBUG.md)
+for more information about the debugging tools.
+
### Version
This component is considered beta. As such, it should be expected to be mostly
diff --git a/lib/Google/vendor/google/longrunning/VERSION b/lib/Google/vendor/google/longrunning/VERSION
index 17b2ccd9b..ef52a6480 100644
--- a/lib/Google/vendor/google/longrunning/VERSION
+++ b/lib/Google/vendor/google/longrunning/VERSION
@@ -1 +1 @@
-0.4.3
+0.4.6
diff --git a/lib/Google/vendor/google/longrunning/composer.json b/lib/Google/vendor/google/longrunning/composer.json
index ac162baf4..bec78c5d0 100644
--- a/lib/Google/vendor/google/longrunning/composer.json
+++ b/lib/Google/vendor/google/longrunning/composer.json
@@ -3,7 +3,7 @@
"description": "Google LongRunning Client for PHP",
"license": "Apache-2.0",
"minimum-stability": "stable",
- "version": "0.4.3",
+ "version": "0.4.6",
"autoload": {
"psr-4": {
"Google\\ApiCore\\LongRunning\\": "src/ApiCore/LongRunning",
@@ -20,7 +20,7 @@
}
},
"require-dev": {
- "google/gax": "^1.34.0",
+ "google/gax": "^1.36.0",
"phpunit/phpunit": "^9.0"
}
}
diff --git a/lib/Google/vendor/google/longrunning/metadata/Longrunning/Operations.php b/lib/Google/vendor/google/longrunning/metadata/Longrunning/Operations.php
index 2ed35d918..0dcf976e5 100644
Binary files a/lib/Google/vendor/google/longrunning/metadata/Longrunning/Operations.php and b/lib/Google/vendor/google/longrunning/metadata/Longrunning/Operations.php differ
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/CancelOperationRequest.php b/lib/Google/vendor/google/longrunning/src/LongRunning/CancelOperationRequest.php
index d596e8a80..3bd2d1328 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/CancelOperationRequest.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/CancelOperationRequest.php
@@ -9,7 +9,8 @@
use Google\Protobuf\Internal\GPBUtil;
/**
- * The request message for [Operations.CancelOperation][google.longrunning.Operations.CancelOperation].
+ * The request message for
+ * [Operations.CancelOperation][google.longrunning.Operations.CancelOperation].
*
* Generated from protobuf message google.longrunning.CancelOperationRequest
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/Client/OperationsClient.php b/lib/Google/vendor/google/longrunning/src/LongRunning/Client/OperationsClient.php
index d3697fc93..e275b18af 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/Client/OperationsClient.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/Client/OperationsClient.php
@@ -39,26 +39,27 @@
use Google\LongRunning\Operation;
use Google\LongRunning\WaitOperationRequest;
use GuzzleHttp\Promise\PromiseInterface;
+use Psr\Log\LoggerInterface;
/**
* Service Description: Manages long-running operations with an API service.
*
* When an API method normally takes long time to complete, it can be designed
- * to return [Operation][google.longrunning.Operation] to the client, and the client can use this
- * interface to receive the real response asynchronously by polling the
- * operation resource, or pass the operation resource to another API (such as
- * Google Cloud Pub/Sub API) to receive the response. Any API service that
- * returns long-running operations should implement the `Operations` interface
- * so developers can have a consistent client experience.
+ * to return [Operation][google.longrunning.Operation] to the client, and the
+ * client can use this interface to receive the real response asynchronously by
+ * polling the operation resource, or pass the operation resource to another API
+ * (such as Pub/Sub API) to receive the response. Any API service that returns
+ * long-running operations should implement the `Operations` interface so
+ * developers can have a consistent client experience.
*
* This class provides the ability to make remote calls to the backing service through method
* calls that map to API methods.
*
- * @method PromiseInterface cancelOperationAsync(CancelOperationRequest $request, array $optionalArgs = [])
- * @method PromiseInterface deleteOperationAsync(DeleteOperationRequest $request, array $optionalArgs = [])
- * @method PromiseInterface getOperationAsync(GetOperationRequest $request, array $optionalArgs = [])
- * @method PromiseInterface listOperationsAsync(ListOperationsRequest $request, array $optionalArgs = [])
- * @method PromiseInterface waitOperationAsync(WaitOperationRequest $request, array $optionalArgs = [])
+ * @method PromiseInterfacegoogle.longrunning.DeleteOperationRequest
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/Gapic/OperationsGapicClient.php b/lib/Google/vendor/google/longrunning/src/LongRunning/Gapic/OperationsGapicClient.php
index c0de812ae..3c31a4fda 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/Gapic/OperationsGapicClient.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/Gapic/OperationsGapicClient.php
@@ -46,12 +46,12 @@
* Service Description: Manages long-running operations with an API service.
*
* When an API method normally takes long time to complete, it can be designed
- * to return [Operation][google.longrunning.Operation] to the client, and the client can use this
- * interface to receive the real response asynchronously by polling the
- * operation resource, or pass the operation resource to another API (such as
- * Google Cloud Pub/Sub API) to receive the response. Any API service that
- * returns long-running operations should implement the `Operations` interface
- * so developers can have a consistent client experience.
+ * to return [Operation][google.longrunning.Operation] to the client, and the
+ * client can use this interface to receive the real response asynchronously by
+ * polling the operation resource, or pass the operation resource to another API
+ * (such as Pub/Sub API) to receive the response. Any API service that returns
+ * long-running operations should implement the `Operations` interface so
+ * developers can have a consistent client experience.
*
* This class provides the ability to make remote calls to the backing service through method
* calls that map to API methods. Sample code to get started:
@@ -188,8 +188,9 @@ public function __construct(array $options = [])
* other methods to check whether the cancellation succeeded or whether the
* operation completed despite cancellation. On successful cancellation,
* the operation is not deleted; instead, it becomes an operation with
- * an [Operation.error][google.longrunning.Operation.error] value with a [google.rpc.Status.code][google.rpc.Status.code] of 1,
- * corresponding to `Code.CANCELLED`.
+ * an [Operation.error][google.longrunning.Operation.error] value with a
+ * [google.rpc.Status.code][google.rpc.Status.code] of `1`, corresponding to
+ * `Code.CANCELLED`.
*
* Sample code:
* ```
@@ -337,14 +338,6 @@ public function getOperation($name, array $optionalArgs = [])
* Lists operations that match the specified filter in the request. If the
* server doesn't support this method, it returns `UNIMPLEMENTED`.
*
- * NOTE: the `name` binding allows API services to override the binding
- * to use different resource name schemes, such as `users/*/operations`. To
- * override the binding, API services can add a binding such as
- * `"/v1/{name=users/*}/operations"` to their service configuration.
- * For backwards compatibility, the default name includes the operations
- * collection id, however overriding users must ensure the name binding
- * is the parent resource, without the operations collection id.
- *
* Sample code:
* ```
* $operationsClient = new OperationsClient();
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/GetOperationRequest.php b/lib/Google/vendor/google/longrunning/src/LongRunning/GetOperationRequest.php
index d89d75cc6..1fa48a5cf 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/GetOperationRequest.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/GetOperationRequest.php
@@ -9,7 +9,8 @@
use Google\Protobuf\Internal\GPBUtil;
/**
- * The request message for [Operations.GetOperation][google.longrunning.Operations.GetOperation].
+ * The request message for
+ * [Operations.GetOperation][google.longrunning.Operations.GetOperation].
*
* Generated from protobuf message google.longrunning.GetOperationRequest
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsRequest.php b/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsRequest.php
index 3ad0bebe8..08049d248 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsRequest.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsRequest.php
@@ -9,7 +9,8 @@
use Google\Protobuf\Internal\GPBUtil;
/**
- * The request message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
+ * The request message for
+ * [Operations.ListOperations][google.longrunning.Operations.ListOperations].
*
* Generated from protobuf message google.longrunning.ListOperationsRequest
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsResponse.php b/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsResponse.php
index 8da087dd2..4fd271861 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsResponse.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/ListOperationsResponse.php
@@ -9,7 +9,8 @@
use Google\Protobuf\Internal\GPBUtil;
/**
- * The response message for [Operations.ListOperations][google.longrunning.Operations.ListOperations].
+ * The response message for
+ * [Operations.ListOperations][google.longrunning.Operations.ListOperations].
*
* Generated from protobuf message google.longrunning.ListOperationsResponse
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/Operation.php b/lib/Google/vendor/google/longrunning/src/LongRunning/Operation.php
index 81f856c36..e8fec9e65 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/Operation.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/Operation.php
@@ -65,7 +65,7 @@ class Operation extends \Google\Protobuf\Internal\Message
* @type \Google\Rpc\Status $error
* The error result of the operation in case of failure or cancellation.
* @type \Google\Protobuf\Any $response
- * The normal response of the operation in case of success. If the original
+ * The normal, successful response of the operation. If the original
* method returns no data on success, such as `Delete`, the response is
* `google.protobuf.Empty`. If the original method is standard
* `Get`/`Create`/`Update`, the response should be the resource. For other
@@ -214,7 +214,7 @@ public function setError($var)
}
/**
- * The normal response of the operation in case of success. If the original
+ * The normal, successful response of the operation. If the original
* method returns no data on success, such as `Delete`, the response is
* `google.protobuf.Empty`. If the original method is standard
* `Get`/`Create`/`Update`, the response should be the resource. For other
@@ -237,7 +237,7 @@ public function hasResponse()
}
/**
- * The normal response of the operation in case of success. If the original
+ * The normal, successful response of the operation. If the original
* method returns no data on success, such as `Delete`, the response is
* `google.protobuf.Empty`. If the original method is standard
* `Get`/`Create`/`Update`, the response should be the resource. For other
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/OperationInfo.php b/lib/Google/vendor/google/longrunning/src/LongRunning/OperationInfo.php
index 35ebb15b5..c6533199a 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/OperationInfo.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/OperationInfo.php
@@ -11,13 +11,12 @@
/**
* A message representing the message types used by a long-running operation.
* Example:
- * rpc LongRunningRecognize(LongRunningRecognizeRequest)
- * returns (google.longrunning.Operation) {
- * option (google.longrunning.operation_info) = {
- * response_type: "LongRunningRecognizeResponse"
- * metadata_type: "LongRunningRecognizeMetadata"
- * };
- * }
+ * rpc Export(ExportRequest) returns (google.longrunning.Operation) {
+ * option (google.longrunning.operation_info) = {
+ * response_type: "ExportResponse"
+ * metadata_type: "ExportMetadata"
+ * };
+ * }
*
* Generated from protobuf message google.longrunning.OperationInfo
*/
diff --git a/lib/Google/vendor/google/longrunning/src/LongRunning/WaitOperationRequest.php b/lib/Google/vendor/google/longrunning/src/LongRunning/WaitOperationRequest.php
index 7da6bc734..07914090b 100644
--- a/lib/Google/vendor/google/longrunning/src/LongRunning/WaitOperationRequest.php
+++ b/lib/Google/vendor/google/longrunning/src/LongRunning/WaitOperationRequest.php
@@ -9,7 +9,8 @@
use Google\Protobuf\Internal\GPBUtil;
/**
- * The request message for [Operations.WaitOperation][google.longrunning.Operations.WaitOperation].
+ * The request message for
+ * [Operations.WaitOperation][google.longrunning.Operations.WaitOperation].
*
* Generated from protobuf message google.longrunning.WaitOperationRequest
*/
diff --git a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/AnyBase.php b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/AnyBase.php
index 5e9ab5705..7ae4ce669 100644
--- a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/AnyBase.php
+++ b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/AnyBase.php
@@ -29,14 +29,14 @@ public function unpack()
throw new \Exception(
"Type url needs to be type.googleapis.com/fully-qulified");
}
- $fully_qualifed_name =
+ $fully_qualified_name =
substr($this->type_url, $url_prifix_len);
// Create message according to fully qualified name.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
- $desc = $pool->getDescriptorByProtoName($fully_qualifed_name);
+ $desc = $pool->getDescriptorByProtoName($fully_qualified_name);
if (is_null($desc)) {
- throw new \Exception("Class ".$fully_qualifed_name
+ throw new \Exception("Class ".$fully_qualified_name
." hasn't been added to descriptor pool");
}
$klass = $desc->getClass();
@@ -66,8 +66,8 @@ public function pack($msg)
// Set type url.
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName(get_class($msg));
- $fully_qualifed_name = $desc->getFullName();
- $this->type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
+ $fully_qualified_name = $desc->getFullName();
+ $this->type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualified_name;
}
/**
@@ -79,8 +79,8 @@ public function is($klass)
{
$pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
$desc = $pool->getDescriptorByClassName($klass);
- $fully_qualifed_name = $desc->getFullName();
- $type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
+ $fully_qualified_name = $desc->getFullName();
+ $type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualified_name;
return $this->type_url === $type_url;
}
}
diff --git a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/FieldOptions.php b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/FieldOptions.php
index ea32e7f2a..6f1d54b7e 100644
--- a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/FieldOptions.php
+++ b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/FieldOptions.php
@@ -28,7 +28,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
* The packed option can be enabled for repeated primitive fields to enable
* a more efficient representation on the wire. Rather than repeatedly
* writing the tag and type for each element, the entire array is encoded as
- * a single length-delimited blob. In proto3, only explicit setting it to
+ * a single length-prefixed blob. In proto3, only explicit setting it to
* false will avoid using packed encoding.
*
* Generated from protobuf field optional bool packed = 2;
@@ -125,7 +125,7 @@ class FieldOptions extends \Google\Protobuf\Internal\Message
* The packed option can be enabled for repeated primitive fields to enable
* a more efficient representation on the wire. Rather than repeatedly
* writing the tag and type for each element, the entire array is encoded as
- * a single length-delimited blob. In proto3, only explicit setting it to
+ * a single length-prefixed blob. In proto3, only explicit setting it to
* false will avoid using packed encoding.
* @type int $jstype
* The jstype option determines the JavaScript type used for values of the
@@ -231,7 +231,7 @@ public function setCtype($var)
* The packed option can be enabled for repeated primitive fields to enable
* a more efficient representation on the wire. Rather than repeatedly
* writing the tag and type for each element, the entire array is encoded as
- * a single length-delimited blob. In proto3, only explicit setting it to
+ * a single length-prefixed blob. In proto3, only explicit setting it to
* false will avoid using packed encoding.
*
* Generated from protobuf field optional bool packed = 2;
diff --git a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/Message.php b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/Message.php
index 21d9c980e..31e2f29d3 100644
--- a/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/Message.php
+++ b/lib/Google/vendor/google/protobuf/src/Google/Protobuf/Internal/Message.php
@@ -394,7 +394,8 @@ private static function parseFieldFromStreamNoTag($input, $field, &$value)
}
break;
case GPBType::STRING:
- // TODO: Add utf-8 check.
+ // We don't check UTF-8 here; that will be validated by the
+ // setter later.
if (!GPBWire::readString($input, $value)) {
throw new GPBDecodeException(
"Unexpected EOF inside string field.");
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/CHANGELOG.md b/lib/Google/vendor/guzzlehttp/guzzle/CHANGELOG.md
index 13709d1b8..e0b621659 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/CHANGELOG.md
+++ b/lib/Google/vendor/guzzlehttp/guzzle/CHANGELOG.md
@@ -3,6 +3,37 @@
Please refer to [UPGRADING](UPGRADING.md) guide for upgrading to a major version.
+## 7.9.2 - 2024-07-24
+
+### Fixed
+
+- Adjusted handler selection to use cURL if its version is 7.21.2 or higher, rather than 7.34.0
+
+
+## 7.9.1 - 2024-07-19
+
+### Fixed
+
+- Fix TLS 1.3 check for HTTP/2 requests
+
+
+## 7.9.0 - 2024-07-18
+
+### Changed
+
+- Improve protocol version checks to provide feedback around unsupported protocols
+- Only select the cURL handler by default if 7.34.0 or higher is linked
+- Improved `CurlMultiHandler` to avoid busy wait if possible
+- Dropped support for EOL `guzzlehttp/psr7` v1
+- Improved URI user info redaction in errors
+
+## 7.8.2 - 2024-07-18
+
+### Added
+
+- Support for PHP 8.4
+
+
## 7.8.1 - 2023-12-03
### Changed
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/README.md b/lib/Google/vendor/guzzlehttp/guzzle/README.md
index 6d78a9309..cdaebee3f 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/README.md
+++ b/lib/Google/vendor/guzzlehttp/guzzle/README.md
@@ -62,11 +62,11 @@ composer require guzzlehttp/guzzle
| Version | Status | Packagist | Namespace | Repo | Docs | PSR-7 | PHP Version |
|---------|---------------------|---------------------|--------------|---------------------|---------------------|-------|--------------|
-| 3.x | EOL | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >=5.3.3,<7.0 |
-| 4.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >=5.4,<7.0 |
-| 5.x | EOL | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >=5.4,<7.4 |
-| 6.x | Security fixes only | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >=5.5,<8.0 |
-| 7.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes | >=7.2.5,<8.4 |
+| 3.x | EOL (2016-10-31) | `guzzle/guzzle` | `Guzzle` | [v3][guzzle-3-repo] | [v3][guzzle-3-docs] | No | >=5.3.3,<7.0 |
+| 4.x | EOL (2016-10-31) | `guzzlehttp/guzzle` | `GuzzleHttp` | [v4][guzzle-4-repo] | N/A | No | >=5.4,<7.0 |
+| 5.x | EOL (2019-10-31) | `guzzlehttp/guzzle` | `GuzzleHttp` | [v5][guzzle-5-repo] | [v5][guzzle-5-docs] | No | >=5.4,<7.4 |
+| 6.x | EOL (2023-10-31) | `guzzlehttp/guzzle` | `GuzzleHttp` | [v6][guzzle-6-repo] | [v6][guzzle-6-docs] | Yes | >=5.5,<8.0 |
+| 7.x | Latest | `guzzlehttp/guzzle` | `GuzzleHttp` | [v7][guzzle-7-repo] | [v7][guzzle-7-docs] | Yes | >=7.2.5,<8.5 |
[guzzle-3-repo]: https://github.com/guzzle/guzzle3
[guzzle-4-repo]: https://github.com/guzzle/guzzle/tree/4.x
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/composer.json b/lib/Google/vendor/guzzlehttp/guzzle/composer.json
index 69583d7cc..cbede149a 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/composer.json
+++ b/lib/Google/vendor/guzzlehttp/guzzle/composer.json
@@ -50,11 +50,39 @@
"homepage": "https://github.com/Tobion"
}
],
+ "repositories": [
+ {
+ "type": "package",
+ "package": {
+ "name": "guzzle/client-integration-tests",
+ "version": "v3.0.2",
+ "dist": {
+ "url": "https://codeload.github.com/guzzle/client-integration-tests/zip/2c025848417c1135031fdf9c728ee53d0a7ceaee",
+ "type": "zip"
+ },
+ "require": {
+ "php": "^7.2.5 || ^8.0",
+ "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.11",
+ "php-http/message": "^1.0 || ^2.0",
+ "guzzlehttp/psr7": "^1.7 || ^2.0",
+ "th3n3rd/cartesian-product": "^0.3"
+ },
+ "autoload": {
+ "psr-4": {
+ "Http\\Client\\Tests\\": "src/"
+ }
+ },
+ "bin": [
+ "bin/http_test_server"
+ ]
+ }
+ }
+ ],
"require": {
"php": "^7.2.5 || ^8.0",
"ext-json": "*",
- "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
- "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
+ "guzzlehttp/promises": "^1.5.3 || ^2.0.3",
+ "guzzlehttp/psr7": "^2.7.0",
"psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0"
},
@@ -64,9 +92,9 @@
"require-dev": {
"ext-curl": "*",
"bamarni/composer-bin-plugin": "^1.8.2",
- "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999",
+ "guzzle/client-integration-tests": "3.0.2",
"php-http/message-factory": "^1.1",
- "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+ "phpunit/phpunit": "^8.5.39 || ^9.6.20",
"psr/log": "^1.1 || ^2.0 || ^3.0"
},
"suggest": {
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/BodySummarizer.php b/lib/Google/vendor/guzzlehttp/guzzle/src/BodySummarizer.php
index 6eca94ef9..761506dd0 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/BodySummarizer.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/BodySummarizer.php
@@ -11,7 +11,7 @@ final class BodySummarizer implements BodySummarizerInterface
*/
private $truncateAt;
- public function __construct(int $truncateAt = null)
+ public function __construct(?int $truncateAt = null)
{
$this->truncateAt = $truncateAt;
}
@@ -22,7 +22,7 @@ public function __construct(int $truncateAt = null)
public function summarize(MessageInterface $message): ?string
{
return $this->truncateAt === null
- ? \GuzzleHttp\Psr7\Message::bodySummary($message)
- : \GuzzleHttp\Psr7\Message::bodySummary($message, $this->truncateAt);
+ ? Psr7\Message::bodySummary($message)
+ : Psr7\Message::bodySummary($message, $this->truncateAt);
}
}
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Client.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Client.php
index bc6efc90f..c78919a4f 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Client.php
@@ -52,7 +52,7 @@ class Client implements ClientInterface, \Psr\Http\Client\ClientInterface
*
* @param array $config Client configuration settings.
*
- * @see \GuzzleHttp\RequestOptions for a list of available request options.
+ * @see RequestOptions for a list of available request options.
*/
public function __construct(array $config = [])
{
@@ -202,7 +202,7 @@ public function request(string $method, $uri = '', array $options = []): Respons
*
* @deprecated Client::getConfig will be removed in guzzlehttp/guzzle:8.0.
*/
- public function getConfig(string $option = null)
+ public function getConfig(?string $option = null)
{
return $option === null
? $this->config
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/ClientInterface.php b/lib/Google/vendor/guzzlehttp/guzzle/src/ClientInterface.php
index 1788e16ab..6aaee61af 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/ClientInterface.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/ClientInterface.php
@@ -80,5 +80,5 @@ public function requestAsync(string $method, $uri, array $options = []): Promise
*
* @deprecated ClientInterface::getConfig will be removed in guzzlehttp/guzzle:8.0.
*/
- public function getConfig(string $option = null);
+ public function getConfig(?string $option = null);
}
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
index c29b4b7e9..b616cf2ed 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJar.php
@@ -103,7 +103,7 @@ public function toArray(): array
}, $this->getIterator()->getArrayCopy());
}
- public function clear(string $domain = null, string $path = null, string $name = null): void
+ public function clear(?string $domain = null, ?string $path = null, ?string $name = null): void
{
if (!$domain) {
$this->cookies = [];
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
index 8c55cc6f7..93ada58d2 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Cookie/CookieJarInterface.php
@@ -62,7 +62,7 @@ public function setCookie(SetCookie $cookie): bool;
* @param string|null $path Clears cookies matching a domain and path
* @param string|null $name Clears cookies matching a domain, path, and name
*/
- public function clear(string $domain = null, string $path = null, string $name = null): void;
+ public function clear(?string $domain = null, ?string $path = null, ?string $name = null): void;
/**
* Discard all sessions cookies.
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
index a80956c9d..ba67ad498 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/BadResponseException.php
@@ -14,7 +14,7 @@ public function __construct(
string $message,
RequestInterface $request,
ResponseInterface $response,
- \Throwable $previous = null,
+ ?\Throwable $previous = null,
array $handlerContext = []
) {
parent::__construct($message, $request, $response, $previous, $handlerContext);
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
index e1a31519c..eab51ca17 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/ConnectException.php
@@ -25,7 +25,7 @@ class ConnectException extends TransferException implements NetworkExceptionInte
public function __construct(
string $message,
RequestInterface $request,
- \Throwable $previous = null,
+ ?\Throwable $previous = null,
array $handlerContext = []
) {
parent::__construct($message, 0, $previous);
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
index c2d0a9ccc..b42c88abf 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Exception/RequestException.php
@@ -7,7 +7,6 @@
use Psr\Http\Client\RequestExceptionInterface;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\UriInterface;
/**
* HTTP Request exception
@@ -32,8 +31,8 @@ class RequestException extends TransferException implements RequestExceptionInte
public function __construct(
string $message,
RequestInterface $request,
- ResponseInterface $response = null,
- \Throwable $previous = null,
+ ?ResponseInterface $response = null,
+ ?\Throwable $previous = null,
array $handlerContext = []
) {
// Set the code of the exception if the response is set and not future.
@@ -63,10 +62,10 @@ public static function wrapException(RequestInterface $request, \Throwable $e):
*/
public static function create(
RequestInterface $request,
- ResponseInterface $response = null,
- \Throwable $previous = null,
+ ?ResponseInterface $response = null,
+ ?\Throwable $previous = null,
array $handlerContext = [],
- BodySummarizerInterface $bodySummarizer = null
+ ?BodySummarizerInterface $bodySummarizer = null
): self {
if (!$response) {
return new self(
@@ -90,8 +89,7 @@ public static function create(
$className = __CLASS__;
}
- $uri = $request->getUri();
- $uri = static::obfuscateUri($uri);
+ $uri = \GuzzleHttp\Psr7\Utils::redactUserInfo($request->getUri());
// Client Error: `GET /` resulted in a `404 Not Found` response:
// ... (truncated)
@@ -113,20 +111,6 @@ public static function create(
return new $className($message, $request, $response, $previous, $handlerContext);
}
- /**
- * Obfuscates URI if there is a username and a password present
- */
- private static function obfuscateUri(UriInterface $uri): UriInterface
- {
- $userInfo = $uri->getUserInfo();
-
- if (false !== ($pos = \strpos($userInfo, ':'))) {
- return $uri->withUserInfo(\substr($userInfo, 0, $pos), '***');
- }
-
- return $uri;
- }
-
/**
* Get the request that caused the exception
*/
diff --git a/lib/Google/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/lib/Google/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
index 16a942232..fe3613751 100644
--- a/lib/Google/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/lib/Google/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@@ -11,6 +11,7 @@
use GuzzleHttp\TransferStats;
use GuzzleHttp\Utils;
use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\UriInterface;
/**
* Creates curl resources from a request
@@ -46,6 +47,16 @@ public function __construct(int $maxHandles)
public function create(RequestInterface $request, array $options): EasyHandle
{
+ $protocolVersion = $request->getProtocolVersion();
+
+ if ('2' === $protocolVersion || '2.0' === $protocolVersion) {
+ if (!self::supportsHttp2()) {
+ throw new ConnectException('HTTP/2 is supported by the cURL handler, however libcurl is built without HTTP/2 support.', $request);
+ }
+ } elseif ('1.0' !== $protocolVersion && '1.1' !== $protocolVersion) {
+ throw new ConnectException(sprintf('HTTP/%s is not supported by the cURL handler.', $protocolVersion), $request);
+ }
+
if (isset($options['curl']['body_as_string'])) {
$options['_body_as_string'] = $options['curl']['body_as_string'];
unset($options['curl']['body_as_string']);
@@ -72,6 +83,42 @@ public function create(RequestInterface $request, array $options): EasyHandle
return $easy;
}
+ private static function supportsHttp2(): bool
+ {
+ static $supportsHttp2 = null;
+
+ if (null === $supportsHttp2) {
+ $supportsHttp2 = self::supportsTls12()
+ && defined('CURL_VERSION_HTTP2')
+ && (\CURL_VERSION_HTTP2 & \curl_version()['features']);
+ }
+
+ return $supportsHttp2;
+ }
+
+ private static function supportsTls12(): bool
+ {
+ static $supportsTls12 = null;
+
+ if (null === $supportsTls12) {
+ $supportsTls12 = \CURL_SSLVERSION_TLSv1_2 & \curl_version()['features'];
+ }
+
+ return $supportsTls12;
+ }
+
+ private static function supportsTls13(): bool
+ {
+ static $supportsTls13 = null;
+
+ if (null === $supportsTls13) {
+ $supportsTls13 = defined('CURL_SSLVERSION_TLSv1_3')
+ && (\CURL_SSLVERSION_TLSv1_3 & \curl_version()['features']);
+ }
+
+ return $supportsTls13;
+ }
+
public function release(EasyHandle $easy): void
{
$resource = $easy->handle;
@@ -147,7 +194,7 @@ private static function finishError(callable $handler, EasyHandle $easy, CurlFac
'error' => \curl_error($easy->handle),
'appconnect_time' => \curl_getinfo($easy->handle, \CURLINFO_APPCONNECT_TIME),
] + \curl_getinfo($easy->handle);
- $ctx[self::CURL_VERSION_STR] = \curl_version()['version'];
+ $ctx[self::CURL_VERSION_STR] = self::getCurlVersion();
$factory->release($easy);
// Retry when nothing is present or when curl failed to rewind.
@@ -158,6 +205,17 @@ private static function finishError(callable $handler, EasyHandle $easy, CurlFac
return self::createRejection($easy, $ctx);
}
+ private static function getCurlVersion(): string
+ {
+ static $curlVersion = null;
+
+ if (null === $curlVersion) {
+ $curlVersion = \curl_version()['version'];
+ }
+
+ return $curlVersion;
+ }
+
private static function createRejection(EasyHandle $easy, array $ctx): PromiseInterface
{
static $connectionErrors = [
@@ -194,15 +252,22 @@ private static function createRejection(EasyHandle $easy, array $ctx): PromiseIn
);
}
+ $uri = $easy->request->getUri();
+
+ $sanitizedError = self::sanitizeCurlError($ctx['error'] ?? '', $uri);
+
$message = \sprintf(
'cURL error %s: %s (%s)',
$ctx['errno'],
- $ctx['error'],
+ $sanitizedError,
'see https://curl.haxx.se/libcurl/c/libcurl-errors.html'
);
- $uriString = (string) $easy->request->getUri();
- if ($uriString !== '' && false === \strpos($ctx['error'], $uriString)) {
- $message .= \sprintf(' for %s', $uriString);
+
+ if ('' !== $sanitizedError) {
+ $redactedUriString = \GuzzleHttp\Psr7\Utils::redactUserInfo($uri)->__toString();
+ if ($redactedUriString !== '' && false === \strpos($sanitizedError, $redactedUriString)) {
+ $message .= \sprintf(' for %s', $redactedUriString);
+ }
}
// Create a connection exception if it was a specific error code.
@@ -213,6 +278,24 @@ private static function createRejection(EasyHandle $easy, array $ctx): PromiseIn
return P\Create::rejectionFor($error);
}
+ private static function sanitizeCurlError(string $error, UriInterface $uri): string
+ {
+ if ('' === $error) {
+ return $error;
+ }
+
+ $baseUri = $uri->withQuery('')->withFragment('');
+ $baseUriString = $baseUri->__toString();
+
+ if ('' === $baseUriString) {
+ return $error;
+ }
+
+ $redactedUriString = \GuzzleHttp\Psr7\Utils::redactUserInfo($baseUri)->__toString();
+
+ return str_replace($baseUriString, $redactedUriString, $error);
+ }
+
/**
* @return array