Skip to content

[wip] Guzzle request options #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jamiehannaford merged 3 commits into from
Jun 22, 2016
Merged

[wip] Guzzle request options #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
285fff8
Custom Guzzle request options
haphan Jun 22, 2016
754da95
Correct php docblock s/requestOption/requestOptions/
haphan Jun 22, 2016
d6e4f42
Bump up composer.json
haphan Jun 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
}
],
"require": {
"php-opencloud/common": "~1.0"
"php-opencloud/common": "^1.0.5"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"sami/sami": "dev-master",
"psr/log": "~1.0",
"satooshi/php-coveralls": "~1.0",
"jakub-onderka/php-parallel-lint": "0.*",
"fabpot/php-cs-fixer": "~1.0"
"friendsofphp/php-cs-fixer": "^1.0"
}
}
15 changes: 12 additions & 3 deletions src/OpenStack.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class OpenStack
private $builder;

/**
* @param array $options User-defined options
* @param array $options User-defined options
*
* $options['username'] = (string) Your OpenStack username [REQUIRED]
* ['password'] = (string) Your OpenStack password [REQUIRED]
Expand All @@ -30,6 +30,9 @@ class OpenStack
* ['debugLog'] = (bool) Whether to enable HTTP logging [OPTIONAL]
* ['logger'] = (LoggerInterface) Must set if debugLog is true [OPTIONAL]
* ['messageFormatter'] = (MessageFormatter) Must set if debugLog is true [OPTIONAL]
* ['requestOptions'] = (array) Guzzle Http request options [OPTIONAL]
*
* @param Builder $builder
*/
public function __construct(array $options = [], Builder $builder = null)
{
Expand All @@ -51,10 +54,16 @@ private function getDefaultIdentityService(array $options): Service
throw new \InvalidArgumentException("'authUrl' is a required option");
}

return Service::factory(new Client([
$clientOptions = [
'base_uri' => Utils::normalizeUrl($options['authUrl']),
'handler' => HandlerStack::create(),
]));
];

if (isset($options['requestOptions'])) {
$clientOptions = array_merge($options['requestOptions'], $clientOptions);
}

return Service::factory(new Client($clientOptions));
}

/**
Expand Down