diff options
Diffstat (limited to 'vendor/aws/aws-sdk-php/src/Api')
| -rw-r--r-- | vendor/aws/aws-sdk-php/src/Api/DocModel.php | 12 | ||||
| -rw-r--r-- | vendor/aws/aws-sdk-php/src/Api/ErrorParser/JsonParserTrait.php | 2 | ||||
| -rw-r--r-- | vendor/aws/aws-sdk-php/src/Api/Service.php | 34 | ||||
| -rw-r--r-- | vendor/aws/aws-sdk-php/src/Api/Shape.php | 26 | ||||
| -rw-r--r-- | vendor/aws/aws-sdk-php/src/Api/TimestampShape.php | 2 |
5 files changed, 41 insertions, 35 deletions
diff --git a/vendor/aws/aws-sdk-php/src/Api/DocModel.php b/vendor/aws/aws-sdk-php/src/Api/DocModel.php index 3cc4da6..8bebc80 100644 --- a/vendor/aws/aws-sdk-php/src/Api/DocModel.php +++ b/vendor/aws/aws-sdk-php/src/Api/DocModel.php @@ -97,7 +97,17 @@ class DocModel } if (isset($d['append'])) { - $result .= $d['append']; + if (!isset($d['excludeAppend']) + || !in_array($parentName, $d['excludeAppend']) + ) { + $result .= $d['append']; + } + } + + if (isset($d['appendOnly']) + && in_array($parentName, $d['appendOnly']['shapes']) + ) { + $result .= $d['appendOnly']['message']; } return $this->clean($result); diff --git a/vendor/aws/aws-sdk-php/src/Api/ErrorParser/JsonParserTrait.php b/vendor/aws/aws-sdk-php/src/Api/ErrorParser/JsonParserTrait.php index 92b447c..da82597 100644 --- a/vendor/aws/aws-sdk-php/src/Api/ErrorParser/JsonParserTrait.php +++ b/vendor/aws/aws-sdk-php/src/Api/ErrorParser/JsonParserTrait.php @@ -16,7 +16,7 @@ trait JsonParserTrait { $code = (string) $response->getStatusCode(); if ($this->api - && $this->api->getMetadata('awsQueryCompatible') + && !is_null($this->api->getMetadata('awsQueryCompatible')) && $response->getHeaderLine('x-amzn-query-error') ) { $queryError = $response->getHeaderLine('x-amzn-query-error'); diff --git a/vendor/aws/aws-sdk-php/src/Api/Service.php b/vendor/aws/aws-sdk-php/src/Api/Service.php index c5c25a3..0945d92 100644 --- a/vendor/aws/aws-sdk-php/src/Api/Service.php +++ b/vendor/aws/aws-sdk-php/src/Api/Service.php @@ -1,10 +1,6 @@ <?php namespace Aws\Api; -use Aws\Api\Serializer\QuerySerializer; -use Aws\Api\Serializer\Ec2ParamBuilder; -use Aws\Api\Parser\QueryParser; - /** * Represents a web service API model. */ @@ -87,10 +83,10 @@ class Service extends AbstractModel public static function createSerializer(Service $api, $endpoint) { static $mapping = [ - 'json' => 'Aws\Api\Serializer\JsonRpcSerializer', - 'query' => 'Aws\Api\Serializer\QuerySerializer', - 'rest-json' => 'Aws\Api\Serializer\RestJsonSerializer', - 'rest-xml' => 'Aws\Api\Serializer\RestXmlSerializer' + 'json' => Serializer\JsonRpcSerializer::class, + 'query' => Serializer\QuerySerializer::class, + 'rest-json' => Serializer\RestJsonSerializer::class, + 'rest-xml' => Serializer\RestXmlSerializer::class ]; $proto = $api->getProtocol(); @@ -100,7 +96,7 @@ class Service extends AbstractModel } if ($proto == 'ec2') { - return new QuerySerializer($api, $endpoint, new Ec2ParamBuilder()); + return new Serializer\QuerySerializer($api, $endpoint, new Serializer\Ec2ParamBuilder()); } throw new \UnexpectedValueException( @@ -121,11 +117,11 @@ class Service extends AbstractModel public static function createErrorParser($protocol, Service $api = null) { static $mapping = [ - 'json' => 'Aws\Api\ErrorParser\JsonRpcErrorParser', - 'query' => 'Aws\Api\ErrorParser\XmlErrorParser', - 'rest-json' => 'Aws\Api\ErrorParser\RestJsonErrorParser', - 'rest-xml' => 'Aws\Api\ErrorParser\XmlErrorParser', - 'ec2' => 'Aws\Api\ErrorParser\XmlErrorParser' + 'json' => ErrorParser\JsonRpcErrorParser::class, + 'query' => ErrorParser\XmlErrorParser::class, + 'rest-json' => ErrorParser\RestJsonErrorParser::class, + 'rest-xml' => ErrorParser\XmlErrorParser::class, + 'ec2' => ErrorParser\XmlErrorParser::class ]; if (isset($mapping[$protocol])) { @@ -145,10 +141,10 @@ class Service extends AbstractModel public static function createParser(Service $api) { static $mapping = [ - 'json' => 'Aws\Api\Parser\JsonRpcParser', - 'query' => 'Aws\Api\Parser\QueryParser', - 'rest-json' => 'Aws\Api\Parser\RestJsonParser', - 'rest-xml' => 'Aws\Api\Parser\RestXmlParser' + 'json' => Parser\JsonRpcParser::class, + 'query' => Parser\QueryParser::class, + 'rest-json' => Parser\RestJsonParser::class, + 'rest-xml' => Parser\RestXmlParser::class ]; $proto = $api->getProtocol(); @@ -157,7 +153,7 @@ class Service extends AbstractModel } if ($proto == 'ec2') { - return new QueryParser($api, null, false); + return new Parser\QueryParser($api, null, false); } throw new \UnexpectedValueException( diff --git a/vendor/aws/aws-sdk-php/src/Api/Shape.php b/vendor/aws/aws-sdk-php/src/Api/Shape.php index b1b8071..765efc0 100644 --- a/vendor/aws/aws-sdk-php/src/Api/Shape.php +++ b/vendor/aws/aws-sdk-php/src/Api/Shape.php @@ -18,19 +18,19 @@ class Shape extends AbstractModel public static function create(array $definition, ShapeMap $shapeMap) { static $map = [ - 'structure' => 'Aws\Api\StructureShape', - 'map' => 'Aws\Api\MapShape', - 'list' => 'Aws\Api\ListShape', - 'timestamp' => 'Aws\Api\TimestampShape', - 'integer' => 'Aws\Api\Shape', - 'double' => 'Aws\Api\Shape', - 'float' => 'Aws\Api\Shape', - 'long' => 'Aws\Api\Shape', - 'string' => 'Aws\Api\Shape', - 'byte' => 'Aws\Api\Shape', - 'character' => 'Aws\Api\Shape', - 'blob' => 'Aws\Api\Shape', - 'boolean' => 'Aws\Api\Shape' + 'structure' => StructureShape::class, + 'map' => MapShape::class, + 'list' => ListShape::class, + 'timestamp' => TimestampShape::class, + 'integer' => Shape::class, + 'double' => Shape::class, + 'float' => Shape::class, + 'long' => Shape::class, + 'string' => Shape::class, + 'byte' => Shape::class, + 'character' => Shape::class, + 'blob' => Shape::class, + 'boolean' => Shape::class ]; if (isset($definition['shape'])) { diff --git a/vendor/aws/aws-sdk-php/src/Api/TimestampShape.php b/vendor/aws/aws-sdk-php/src/Api/TimestampShape.php index 7ef2646..464f92f 100644 --- a/vendor/aws/aws-sdk-php/src/Api/TimestampShape.php +++ b/vendor/aws/aws-sdk-php/src/Api/TimestampShape.php @@ -24,7 +24,7 @@ class TimestampShape extends Shape */ public static function format($value, $format) { - if ($value instanceof \DateTime) { + if ($value instanceof \DateTimeInterface) { $value = $value->getTimestamp(); } elseif (is_string($value)) { $value = strtotime($value); |