mirror of
https://github.com/SociallyDev/Spaces-API.git
synced 2025-07-16 10:03:01 -07:00
v2: Updates
* Simplifies & beautifies everything * Introduces a new Class system. * Errors are defaulted to AWS's handler. * New function names & more efficient handling. * Should fix a majority of the errors. Please read the README for more!
This commit is contained in:
parent
ad0726e41e
commit
e6d7753dc8
1095 changed files with 45088 additions and 2911 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue