Skip to content

Feature/initialize basic http options #75

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

Open
melmccann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Feature/initialize basic http options #75

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48d0bf2
Setting some default http options for RestConfigurableProducer
melmccann Nov 8, 2018
033d154
php-cs-fixer fix RestConfigurableProducer.php
melmccann Nov 8, 2018
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
29 changes: 20 additions & 9 deletions Components/WebService/Rest/RestConfigurableProducer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class RestConfigurableProducer extends AbstractWebServiceProducer
const VALIDATION_DISPLAY_MESSAGE = 'display_message';
const VALIDATION_RECOVERABLE = 'recoverable';
const REQUEST_EXPECTED_RESPONSE_TYPE = 'response_type';
const BASIC_HTTP_OPTIONS_CONNECT_TIMEOUT = 5;
const BASIC_HTTP_OPTIONS_TIMEOUT = 5;

/**
* @param $options
Expand All @@ -49,17 +51,16 @@ class RestConfigurableProducer extends AbstractWebServiceProducer
*/
protected function getBasicHTTPOptions($options, array &$endpointOptions)
{
$result = [
RequestOptions::CONNECT_TIMEOUT => $endpointOptions[ConfigurableWebserviceProtocol::OPTION_CONNECT_TIMEOUT],
RequestOptions::TIMEOUT => $endpointOptions[ConfigurableWebserviceProtocol::OPTION_TIMEOUT],
RequestOptions::HEADERS => array_merge(
$endpointOptions[RestConfigurableProtocol::OPTION_HEADERS],
array_key_exists(RestConfigurableProtocol::OPTION_HEADERS, $options) ? $options[RestConfigurableProtocol::OPTION_HEADERS] : []
),
];
$result = $this->initializeBasicHTTPOptions();
$result[RequestOptions::CONNECT_TIMEOUT] = $endpointOptions[ConfigurableWebserviceProtocol::OPTION_CONNECT_TIMEOUT];
$result[RequestOptions::TIMEOUT] = $endpointOptions[ConfigurableWebserviceProtocol::OPTION_TIMEOUT];
$result[RequestOptions::HEADERS] = array_merge(
$endpointOptions[RestConfigurableProtocol::OPTION_HEADERS],
array_key_exists(RestConfigurableProtocol::OPTION_HEADERS, $options) ? $options[RestConfigurableProtocol::OPTION_HEADERS] : []
);

$auth = $endpointOptions[RestConfigurableProtocol::OPTION_AUTH];
if ($auth === RestConfigurableProtocol::AUTH_BASIC) {
if (RestConfigurableProtocol::AUTH_BASIC === $auth) {
$result['auth'] = [
$endpointOptions[Protocol::OPTION_USERNAME],
$endpointOptions[Protocol::OPTION_PASSWORD],
Expand All @@ -69,6 +70,16 @@ protected function getBasicHTTPOptions($options, array &$endpointOptions)
return $result;
}

protected function initializeBasicHTTPOptions()
{
$result = [];
$result[RequestOptions::CONNECT_TIMEOUT] = self::BASIC_HTTP_OPTIONS_CONNECT_TIMEOUT;
$result[RequestOptions::TIMEOUT] = self::BASIC_HTTP_OPTIONS_TIMEOUT;
$result[RequestOptions::HEADERS] = [];

return $result;
}

/**
* {@inheritdoc}
*/
Expand Down