From 48d0bf2c89c725408634de6c31ec16a8d97206b2 Mon Sep 17 00:00:00 2001 From: Mel McCann Date: Thu, 8 Nov 2018 08:38:58 +0000 Subject: [PATCH 1/2] Setting some default http options for RestConfigurableProducer --- .../Rest/RestConfigurableProducer.php | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Components/WebService/Rest/RestConfigurableProducer.php b/Components/WebService/Rest/RestConfigurableProducer.php index 0e66ee38..6052edbd 100644 --- a/Components/WebService/Rest/RestConfigurableProducer.php +++ b/Components/WebService/Rest/RestConfigurableProducer.php @@ -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 @@ -49,14 +51,13 @@ 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) { @@ -69,6 +70,15 @@ 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} */ @@ -374,4 +384,4 @@ public function getExternalSystemHTTPEvent($context, RequestInterface $request, return $event; } -} +} \ No newline at end of file From 033d1548ccf2e1571b8b304fe56ec3e6e6c28bf1 Mon Sep 17 00:00:00 2001 From: Mel McCann Date: Thu, 8 Nov 2018 08:40:29 +0000 Subject: [PATCH 2/2] php-cs-fixer fix RestConfigurableProducer.php --- .../Rest/RestConfigurableProducer.php | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Components/WebService/Rest/RestConfigurableProducer.php b/Components/WebService/Rest/RestConfigurableProducer.php index 6052edbd..f8006565 100644 --- a/Components/WebService/Rest/RestConfigurableProducer.php +++ b/Components/WebService/Rest/RestConfigurableProducer.php @@ -51,16 +51,16 @@ class RestConfigurableProducer extends AbstractWebServiceProducer */ protected function getBasicHTTPOptions($options, array &$endpointOptions) { - $result =$this->initializeBasicHTTPOptions(); - $result [RequestOptions::CONNECT_TIMEOUT] = $endpointOptions[ConfigurableWebserviceProtocol::OPTION_CONNECT_TIMEOUT]; - $result [RequestOptions::TIMEOUT] = $endpointOptions[ConfigurableWebserviceProtocol::OPTION_TIMEOUT]; - $result [RequestOptions::HEADERS] = array_merge( + $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], @@ -70,15 +70,16 @@ protected function getBasicHTTPOptions($options, array &$endpointOptions) return $result; } - protected function initializeBasicHTTPOptions(){ + 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] = []; + $result[RequestOptions::CONNECT_TIMEOUT] = self::BASIC_HTTP_OPTIONS_CONNECT_TIMEOUT; + $result[RequestOptions::TIMEOUT] = self::BASIC_HTTP_OPTIONS_TIMEOUT; + $result[RequestOptions::HEADERS] = []; + return $result; } - /** * {@inheritdoc} */ @@ -384,4 +385,4 @@ public function getExternalSystemHTTPEvent($context, RequestInterface $request, return $event; } -} \ No newline at end of file +}