composer update
This commit is contained in:
@@ -60,8 +60,9 @@ class AmbiguousSuccessParser extends AbstractParser
|
||||
|
||||
public function parseMemberFromStream(
|
||||
StreamInterface $stream,
|
||||
StructureShape $member
|
||||
StructureShape $member,
|
||||
$response
|
||||
) {
|
||||
return $this->parser->parseMemberFromStream($stream, $member);
|
||||
return $this->parser->parseMemberFromStream($stream, $member, $response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,6 +22,9 @@ class ApplyChecksumMiddleware
|
||||
'PutBucketPolicy',
|
||||
'PutBucketTagging',
|
||||
'PutBucketReplication',
|
||||
'PutObjectLegalHold',
|
||||
'PutObjectRetention',
|
||||
'PutObjectLockConfiguration',
|
||||
];
|
||||
|
||||
private static $sha256 = [
|
||||
|
||||
@@ -1,12 +1,18 @@
|
||||
<?php
|
||||
namespace Aws\S3\Exception;
|
||||
|
||||
use Aws\HasMonitoringEventsTrait;
|
||||
use Aws\MonitoringEventsInterface;
|
||||
|
||||
/**
|
||||
* Exception thrown when errors occur while deleting objects using a
|
||||
* {@see S3\BatchDelete} object.
|
||||
*/
|
||||
class DeleteMultipleObjectsException extends \Exception
|
||||
class DeleteMultipleObjectsException extends \Exception implements
|
||||
MonitoringEventsInterface
|
||||
{
|
||||
use HasMonitoringEventsTrait;
|
||||
|
||||
private $deleted = [];
|
||||
private $errors = [];
|
||||
|
||||
|
||||
@@ -41,8 +41,9 @@ class GetBucketLocationParser extends AbstractParser
|
||||
|
||||
public function parseMemberFromStream(
|
||||
StreamInterface $stream,
|
||||
StructureShape $member
|
||||
StructureShape $member,
|
||||
$response
|
||||
) {
|
||||
return $this->parser->parseMemberFromStream($stream, $member);
|
||||
return $this->parser->parseMemberFromStream($stream, $member, $response);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,8 +48,9 @@ class RetryableMalformedResponseParser extends AbstractParser
|
||||
|
||||
public function parseMemberFromStream(
|
||||
StreamInterface $stream,
|
||||
StructureShape $member
|
||||
StructureShape $member,
|
||||
$response
|
||||
) {
|
||||
return $this->parser->parseMemberFromStream($stream, $member);
|
||||
return $this->parser->parseMemberFromStream($stream, $member, $response);
|
||||
}
|
||||
}
|
||||
|
||||
20
vendor/aws/aws-sdk-php/src/S3/S3Client.php
vendored
20
vendor/aws/aws-sdk-php/src/S3/S3Client.php
vendored
@@ -57,6 +57,8 @@ use Psr\Http\Message\RequestInterface;
|
||||
* @method \GuzzleHttp\Promise\Promise deleteObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result deleteObjects(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise deleteObjectsAsync(array $args = [])
|
||||
* @method \Aws\Result deletePublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise deletePublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketAccelerateConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketAccelerateConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketAcl(array $args = [])
|
||||
@@ -85,6 +87,8 @@ use Psr\Http\Message\RequestInterface;
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketNotificationConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketPolicy(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketPolicyAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketPolicyStatus(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketPolicyStatusAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketReplication(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketReplicationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketRequestPayment(array $args = [])
|
||||
@@ -99,10 +103,18 @@ use Psr\Http\Message\RequestInterface;
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectAcl(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectAclAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectLegalHold(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectLegalHoldAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectLockConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectLockConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectRetention(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectRetentionAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectTagging(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectTorrent(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectTorrentAsync(array $args = [])
|
||||
* @method \Aws\Result getPublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getPublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result headBucket(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise headBucketAsync(array $args = [])
|
||||
* @method \Aws\Result headObject(array $args = [])
|
||||
@@ -165,8 +177,16 @@ use Psr\Http\Message\RequestInterface;
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectAcl(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectAclAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectLegalHold(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectLegalHoldAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectLockConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectLockConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectRetention(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectRetentionAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectTagging(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result putPublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putPublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result restoreObject(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise restoreObjectAsync(array $args = [])
|
||||
* @method \Aws\Result selectObjectContent(array $args = [])
|
||||
|
||||
@@ -9,6 +9,7 @@ use Aws\ResultInterface;
|
||||
use Aws\S3\Exception\S3Exception;
|
||||
use GuzzleHttp\Promise\PromiseInterface;
|
||||
use GuzzleHttp\Promise\RejectedPromise;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
|
||||
/**
|
||||
* A trait providing S3-specific functionality. This is meant to be used in
|
||||
@@ -224,7 +225,7 @@ trait S3ClientTrait
|
||||
|
||||
if ($e->getAwsErrorCode() === 'AuthorizationHeaderMalformed') {
|
||||
$region = $this->determineBucketRegionFromExceptionBody(
|
||||
$response->getBody()
|
||||
$response
|
||||
);
|
||||
if (!empty($region)) {
|
||||
return $region;
|
||||
@@ -236,10 +237,10 @@ trait S3ClientTrait
|
||||
});
|
||||
}
|
||||
|
||||
private function determineBucketRegionFromExceptionBody($responseBody)
|
||||
private function determineBucketRegionFromExceptionBody(ResponseInterface $response)
|
||||
{
|
||||
try {
|
||||
$element = $this->parseXml($responseBody);
|
||||
$element = $this->parseXml($response->getBody(), $response);
|
||||
if (!empty($element->Region)) {
|
||||
return (string)$element->Region;
|
||||
}
|
||||
|
||||
@@ -50,6 +50,8 @@ use GuzzleHttp\Promise;
|
||||
* @method \GuzzleHttp\Promise\Promise deleteObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result deleteObjects(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise deleteObjectsAsync(array $args = [])
|
||||
* @method \Aws\Result deletePublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise deletePublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketAccelerateConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketAccelerateConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketAcl(array $args = [])
|
||||
@@ -78,6 +80,8 @@ use GuzzleHttp\Promise;
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketNotificationConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketPolicy(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketPolicyAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketPolicyStatus(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketPolicyStatusAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketReplication(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getBucketReplicationAsync(array $args = [])
|
||||
* @method \Aws\Result getBucketRequestPayment(array $args = [])
|
||||
@@ -92,10 +96,18 @@ use GuzzleHttp\Promise;
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectAcl(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectAclAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectLegalHold(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectLegalHoldAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectLockConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectLockConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectRetention(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectRetentionAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectTagging(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result getObjectTorrent(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getObjectTorrentAsync(array $args = [])
|
||||
* @method \Aws\Result getPublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise getPublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result headBucket(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise headBucketAsync(array $args = [])
|
||||
* @method \Aws\Result headObject(array $args = [])
|
||||
@@ -158,8 +170,16 @@ use GuzzleHttp\Promise;
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectAcl(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectAclAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectLegalHold(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectLegalHoldAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectLockConfiguration(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectLockConfigurationAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectRetention(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectRetentionAsync(array $args = [])
|
||||
* @method \Aws\Result putObjectTagging(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putObjectTaggingAsync(array $args = [])
|
||||
* @method \Aws\Result putPublicAccessBlock(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise putPublicAccessBlockAsync(array $args = [])
|
||||
* @method \Aws\Result restoreObject(array $args = [])
|
||||
* @method \GuzzleHttp\Promise\Promise restoreObjectAsync(array $args = [])
|
||||
* @method \Aws\Result selectObjectContent(array $args = [])
|
||||
@@ -246,7 +266,7 @@ class S3MultiRegionClient extends BaseClient implements S3ClientInterface
|
||||
} catch (AwsException $e) {
|
||||
if ($e->getAwsErrorCode() === 'AuthorizationHeaderMalformed') {
|
||||
$region = $this->determineBucketRegionFromExceptionBody(
|
||||
$e->getResponse()->getBody()
|
||||
$e->getResponse()
|
||||
);
|
||||
if (!empty($region)) {
|
||||
$this->cache->set($cacheKey, $region);
|
||||
|
||||
Reference in New Issue
Block a user