Skip to content

Commit

Permalink
Updated composer dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
fredrikkarlsson-pervanovo committed Jun 19, 2019
1 parent 6ee9224 commit 2dd7d6f
Show file tree
Hide file tree
Showing 160 changed files with 1,459 additions and 437 deletions.
2 changes: 1 addition & 1 deletion vendor/autoload.php
Expand Up @@ -4,4 +4,4 @@

require_once __DIR__ . '/composer/autoload_real.php';

return ComposerAutoloaderInite77817f629e24a1497428bd37ff669bc::getLoader();
return ComposerAutoloaderInit8954ed7256e73f35375ec89aa30d09ba::getLoader();
Expand Up @@ -9,6 +9,8 @@
* @method \GuzzleHttp\Promise\Promise approveSkillAsync(array $args = [])
* @method \Aws\Result associateContactWithAddressBook(array $args = [])
* @method \GuzzleHttp\Promise\Promise associateContactWithAddressBookAsync(array $args = [])
* @method \Aws\Result associateDeviceWithNetworkProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise associateDeviceWithNetworkProfileAsync(array $args = [])
* @method \Aws\Result associateDeviceWithRoom(array $args = [])
* @method \GuzzleHttp\Promise\Promise associateDeviceWithRoomAsync(array $args = [])
* @method \Aws\Result associateSkillGroupWithRoom(array $args = [])
Expand All @@ -27,6 +29,8 @@
* @method \GuzzleHttp\Promise\Promise createContactAsync(array $args = [])
* @method \Aws\Result createGatewayGroup(array $args = [])
* @method \GuzzleHttp\Promise\Promise createGatewayGroupAsync(array $args = [])
* @method \Aws\Result createNetworkProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise createNetworkProfileAsync(array $args = [])
* @method \Aws\Result createProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise createProfileAsync(array $args = [])
* @method \Aws\Result createRoom(array $args = [])
Expand All @@ -49,6 +53,8 @@
* @method \GuzzleHttp\Promise\Promise deleteDeviceUsageDataAsync(array $args = [])
* @method \Aws\Result deleteGatewayGroup(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteGatewayGroupAsync(array $args = [])
* @method \Aws\Result deleteNetworkProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteNetworkProfileAsync(array $args = [])
* @method \Aws\Result deleteProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteProfileAsync(array $args = [])
* @method \Aws\Result deleteRoom(array $args = [])
Expand Down Expand Up @@ -89,6 +95,8 @@
* @method \GuzzleHttp\Promise\Promise getGatewayGroupAsync(array $args = [])
* @method \Aws\Result getInvitationConfiguration(array $args = [])
* @method \GuzzleHttp\Promise\Promise getInvitationConfigurationAsync(array $args = [])
* @method \Aws\Result getNetworkProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise getNetworkProfileAsync(array $args = [])
* @method \Aws\Result getProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise getProfileAsync(array $args = [])
* @method \Aws\Result getRoom(array $args = [])
Expand Down Expand Up @@ -139,6 +147,8 @@
* @method \GuzzleHttp\Promise\Promise searchContactsAsync(array $args = [])
* @method \Aws\Result searchDevices(array $args = [])
* @method \GuzzleHttp\Promise\Promise searchDevicesAsync(array $args = [])
* @method \Aws\Result searchNetworkProfiles(array $args = [])
* @method \GuzzleHttp\Promise\Promise searchNetworkProfilesAsync(array $args = [])
* @method \Aws\Result searchProfiles(array $args = [])
* @method \GuzzleHttp\Promise\Promise searchProfilesAsync(array $args = [])
* @method \Aws\Result searchRooms(array $args = [])
Expand Down Expand Up @@ -173,6 +183,8 @@
* @method \GuzzleHttp\Promise\Promise updateGatewayAsync(array $args = [])
* @method \Aws\Result updateGatewayGroup(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateGatewayGroupAsync(array $args = [])
* @method \Aws\Result updateNetworkProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateNetworkProfileAsync(array $args = [])
* @method \Aws\Result updateProfile(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateProfileAsync(array $args = [])
* @method \Aws\Result updateRoom(array $args = [])
Expand Down
17 changes: 14 additions & 3 deletions vendor/aws/aws-sdk-php/src/Api/Parser/AbstractRestParser.php
Expand Up @@ -128,10 +128,21 @@ private function extractHeader(
return;
}
case 'string':
if ($shape['jsonvalue']) {
$value = $this->parseJson(base64_decode($value), $response);
try {
if ($shape['jsonvalue']) {
$value = $this->parseJson(base64_decode($value), $response);
}

// If value is not set, do not add to output structure.
if (!isset($value)) {
return;
}
break;
} catch (\Exception $e) {
//If the value cannot be parsed, then do not add it to the
//output structure.
return;
}
break;
}

$result[$name] = $value;
Expand Down
Expand Up @@ -27,7 +27,7 @@ public function __construct(
JsonBody $jsonFormatter = null
) {
parent::__construct($api, $endpoint);
$this->contentType = JsonBody::getContentType($api);
$this->contentType = 'application/json';
$this->jsonFormatter = $jsonFormatter ?: new JsonBody($api);
}

Expand Down
6 changes: 6 additions & 0 deletions vendor/aws/aws-sdk-php/src/Api/Serializer/RestSerializer.php
Expand Up @@ -212,6 +212,12 @@ function (array $matches) use ($varspecs) {
$relative .= strpos($relative, '?') ? "&{$append}" : "?$append";
}

// If endpoint has path, remove leading '/' to preserve URI resolution.
$path = $this->endpoint->getPath();
if ($path && $relative[0] === '/') {
$relative = substr($relative, 1);
}

// Expand path place holders using Amazon's slightly different URI
// template syntax.
return UriResolver::resolve($this->endpoint, new Uri($relative));
Expand Down
2 changes: 1 addition & 1 deletion vendor/aws/aws-sdk-php/src/Api/Serializer/XmlBody.php
Expand Up @@ -80,7 +80,7 @@ private function format(Shape $shape, $name, $value, XMLWriter $xml)
private function defaultShape(Shape $shape, $name, $value, XMLWriter $xml)
{
$this->startElement($shape, $name, $xml);
$xml->writeRaw($value);
$xml->text($value);
$xml->endElement();
}

Expand Down
6 changes: 6 additions & 0 deletions vendor/aws/aws-sdk-php/src/Appstream/AppstreamClient.php
Expand Up @@ -25,6 +25,8 @@
* @method \GuzzleHttp\Promise\Promise createStackAsync(array $args = [])
* @method \Aws\Result createStreamingURL(array $args = [])
* @method \GuzzleHttp\Promise\Promise createStreamingURLAsync(array $args = [])
* @method \Aws\Result createUsageReportSubscription(array $args = [])
* @method \GuzzleHttp\Promise\Promise createUsageReportSubscriptionAsync(array $args = [])
* @method \Aws\Result createUser(array $args = [])
* @method \GuzzleHttp\Promise\Promise createUserAsync(array $args = [])
* @method \Aws\Result deleteDirectoryConfig(array $args = [])
Expand All @@ -39,6 +41,8 @@
* @method \GuzzleHttp\Promise\Promise deleteImagePermissionsAsync(array $args = [])
* @method \Aws\Result deleteStack(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteStackAsync(array $args = [])
* @method \Aws\Result deleteUsageReportSubscription(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteUsageReportSubscriptionAsync(array $args = [])
* @method \Aws\Result deleteUser(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteUserAsync(array $args = [])
* @method \Aws\Result describeDirectoryConfigs(array $args = [])
Expand All @@ -55,6 +59,8 @@
* @method \GuzzleHttp\Promise\Promise describeSessionsAsync(array $args = [])
* @method \Aws\Result describeStacks(array $args = [])
* @method \GuzzleHttp\Promise\Promise describeStacksAsync(array $args = [])
* @method \Aws\Result describeUsageReportSubscriptions(array $args = [])
* @method \GuzzleHttp\Promise\Promise describeUsageReportSubscriptionsAsync(array $args = [])
* @method \Aws\Result describeUserStackAssociations(array $args = [])
* @method \GuzzleHttp\Promise\Promise describeUserStackAssociationsAsync(array $args = [])
* @method \Aws\Result describeUsers(array $args = [])
Expand Down
45 changes: 45 additions & 0 deletions vendor/aws/aws-sdk-php/src/AwsClient.php
Expand Up @@ -18,6 +18,9 @@ class AwsClient implements AwsClientInterface
{
use AwsClientTrait;

/** @var array */
private $aliases;

/** @var array */
private $config;

Expand Down Expand Up @@ -184,6 +187,8 @@ public function __construct(array $args)
$this->addClientSideMonitoring($args);
$this->addEndpointParameterMiddleware($args);
$this->addEndpointDiscoveryMiddleware($config, $args);
$this->loadAliases();
$this->addStreamRequestPayload();

if (isset($args['with_resolved'])) {
$args['with_resolved']($config);
Expand Down Expand Up @@ -370,6 +375,32 @@ private function addClientSideMonitoring($args)
'ApiCallAttemptMonitoringMiddleware'
);
}
private function loadAliases($file = null)
{
if (!isset($this->aliases)) {
if (is_null($file)) {
$file = __DIR__ . '/data/aliases.json';
}
$aliases = \Aws\load_compiled_json($file);
$serviceId = $this->api->getServiceId();
$version = $this->getApi()->getApiVersion();
if (!empty($aliases['operations'][$serviceId][$version])) {
$this->aliases = array_flip($aliases['operations'][$serviceId][$version]);
}
}
}

private function addStreamRequestPayload()
{
$streamRequestPayloadMiddleware = StreamRequestPayloadMiddleware::wrap(
$this->api
);

$this->handlerList->prependSign(
$streamRequestPayloadMiddleware,
'StreamRequestPayloadMiddleware'
);
}

/**
* Returns a service model and doc model with any necessary changes
Expand All @@ -385,6 +416,20 @@ private function addClientSideMonitoring($args)
*/
public static function applyDocFilters(array $api, array $docs)
{
$aliases = \Aws\load_compiled_json(__DIR__ . '/data/aliases.json');
$serviceId = $api['metadata']['serviceId'];
$version = $api['metadata']['apiVersion'];

// Replace names for any operations with SDK aliases
if (!empty($aliases['operations'][$serviceId][$version])) {
foreach ($aliases['operations'][$serviceId][$version] as $op => $alias) {
$api['operations'][$alias] = $api['operations'][$op];
$docs['operations'][$alias] = $docs['operations'][$op];
unset($api['operations'][$op], $docs['operations'][$op]);
}
}
ksort($api['operations']);

return [
new Service($api, ApiProvider::defaultProvider()),
new DocModel($docs)
Expand Down
13 changes: 11 additions & 2 deletions vendor/aws/aws-sdk-php/src/AwsClientTrait.php
Expand Up @@ -66,11 +66,20 @@ public function executeAsync(CommandInterface $command)

public function __call($name, array $args)
{
if (substr($name, -5) === 'Async') {
$name = substr($name, 0, -5);
$isAsync = true;
}

if (!empty($this->aliases[ucfirst($name)])) {
$name = $this->aliases[ucfirst($name)];
}

$params = isset($args[0]) ? $args[0] : [];

if (substr($name, -5) === 'Async') {
if (!empty($isAsync)) {
return $this->executeAsync(
$this->getCommand(substr($name, 0, -5), $params)
$this->getCommand($name, $params)
);
}

Expand Down
16 changes: 16 additions & 0 deletions vendor/aws/aws-sdk-php/src/Chime/ChimeClient.php
Expand Up @@ -21,12 +21,16 @@
* @method \GuzzleHttp\Promise\Promise batchUpdateUserAsync(array $args = [])
* @method \Aws\Result createAccount(array $args = [])
* @method \GuzzleHttp\Promise\Promise createAccountAsync(array $args = [])
* @method \Aws\Result createBot(array $args = [])
* @method \GuzzleHttp\Promise\Promise createBotAsync(array $args = [])
* @method \Aws\Result createPhoneNumberOrder(array $args = [])
* @method \GuzzleHttp\Promise\Promise createPhoneNumberOrderAsync(array $args = [])
* @method \Aws\Result createVoiceConnector(array $args = [])
* @method \GuzzleHttp\Promise\Promise createVoiceConnectorAsync(array $args = [])
* @method \Aws\Result deleteAccount(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteAccountAsync(array $args = [])
* @method \Aws\Result deleteEventsConfiguration(array $args = [])
* @method \GuzzleHttp\Promise\Promise deleteEventsConfigurationAsync(array $args = [])
* @method \Aws\Result deletePhoneNumber(array $args = [])
* @method \GuzzleHttp\Promise\Promise deletePhoneNumberAsync(array $args = [])
* @method \Aws\Result deleteVoiceConnector(array $args = [])
Expand All @@ -45,6 +49,10 @@
* @method \GuzzleHttp\Promise\Promise getAccountAsync(array $args = [])
* @method \Aws\Result getAccountSettings(array $args = [])
* @method \GuzzleHttp\Promise\Promise getAccountSettingsAsync(array $args = [])
* @method \Aws\Result getBot(array $args = [])
* @method \GuzzleHttp\Promise\Promise getBotAsync(array $args = [])
* @method \Aws\Result getEventsConfiguration(array $args = [])
* @method \GuzzleHttp\Promise\Promise getEventsConfigurationAsync(array $args = [])
* @method \Aws\Result getGlobalSettings(array $args = [])
* @method \GuzzleHttp\Promise\Promise getGlobalSettingsAsync(array $args = [])
* @method \Aws\Result getPhoneNumber(array $args = [])
Expand All @@ -67,6 +75,8 @@
* @method \GuzzleHttp\Promise\Promise inviteUsersAsync(array $args = [])
* @method \Aws\Result listAccounts(array $args = [])
* @method \GuzzleHttp\Promise\Promise listAccountsAsync(array $args = [])
* @method \Aws\Result listBots(array $args = [])
* @method \GuzzleHttp\Promise\Promise listBotsAsync(array $args = [])
* @method \Aws\Result listPhoneNumberOrders(array $args = [])
* @method \GuzzleHttp\Promise\Promise listPhoneNumberOrdersAsync(array $args = [])
* @method \Aws\Result listPhoneNumbers(array $args = [])
Expand All @@ -79,12 +89,16 @@
* @method \GuzzleHttp\Promise\Promise listVoiceConnectorsAsync(array $args = [])
* @method \Aws\Result logoutUser(array $args = [])
* @method \GuzzleHttp\Promise\Promise logoutUserAsync(array $args = [])
* @method \Aws\Result putEventsConfiguration(array $args = [])
* @method \GuzzleHttp\Promise\Promise putEventsConfigurationAsync(array $args = [])
* @method \Aws\Result putVoiceConnectorOrigination(array $args = [])
* @method \GuzzleHttp\Promise\Promise putVoiceConnectorOriginationAsync(array $args = [])
* @method \Aws\Result putVoiceConnectorTermination(array $args = [])
* @method \GuzzleHttp\Promise\Promise putVoiceConnectorTerminationAsync(array $args = [])
* @method \Aws\Result putVoiceConnectorTerminationCredentials(array $args = [])
* @method \GuzzleHttp\Promise\Promise putVoiceConnectorTerminationCredentialsAsync(array $args = [])
* @method \Aws\Result regenerateSecurityToken(array $args = [])
* @method \GuzzleHttp\Promise\Promise regenerateSecurityTokenAsync(array $args = [])
* @method \Aws\Result resetPersonalPIN(array $args = [])
* @method \GuzzleHttp\Promise\Promise resetPersonalPINAsync(array $args = [])
* @method \Aws\Result restorePhoneNumber(array $args = [])
Expand All @@ -95,6 +109,8 @@
* @method \GuzzleHttp\Promise\Promise updateAccountAsync(array $args = [])
* @method \Aws\Result updateAccountSettings(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateAccountSettingsAsync(array $args = [])
* @method \Aws\Result updateBot(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateBotAsync(array $args = [])
* @method \Aws\Result updateGlobalSettings(array $args = [])
* @method \GuzzleHttp\Promise\Promise updateGlobalSettingsAsync(array $args = [])
* @method \Aws\Result updatePhoneNumber(array $args = [])
Expand Down
Expand Up @@ -64,7 +64,7 @@ protected static function getExceptionHeader(\Exception $e, $headerName)
*
* @param callable $handler
* @param callable $credentialProvider
* @param array $options
* @param $options
* @param $region
* @param $service
*/
Expand Down Expand Up @@ -268,7 +268,15 @@ private function sendEventData(array $eventData)
private function unwrappedOptions()
{
if (!($this->options instanceof ConfigurationInterface)) {
$this->options = ConfigurationProvider::unwrap($this->options);
try {
$this->options = ConfigurationProvider::unwrap($this->options);
} catch (\Exception $e) {
// Errors unwrapping CSM config defaults to disabling it
$this->options = new Configuration(
false,
ConfigurationProvider::DEFAULT_PORT
);
}
}
return $this->options;
}
Expand Down

0 comments on commit 2dd7d6f

Please sign in to comment.