Skip to content

Commit b41c982

Browse files
committed
update annotations and improve methods
1 parent 31534f3 commit b41c982

File tree

1 file changed

+51
-47
lines changed

1 file changed

+51
-47
lines changed

AbstractSoapClientBase.php

Lines changed: 51 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@ abstract class AbstractSoapClientBase
149149
private $lastError;
150150
/**
151151
* Constructor
152-
* @uses ApiWsdlClass::setLastError()
153-
* @uses ApiWsdlClass::initSoapClient()
154-
* @param array $wsdlOptions SoapClient options
152+
* @uses AbstractSoapClientBase::setLastError()
153+
* @uses AbstractSoapClientBase::initSoapClient()
154+
* @param array $wsdlOptions
155155
* @param bool $resetSoapClient allows to disable the SoapClient redefinition
156156
*/
157157
public function __construct(array $wsdlOptions = array(), $resetSoapClient = true)
@@ -185,9 +185,9 @@ public static function setSoapClient(\SoapClient $soapClient)
185185
/**
186186
* Method initiating SoapClient
187187
* @uses ApiClassMap::classMap()
188-
* @uses ApiWsdlClass::getDefaultWsdlOptions()
189-
* @uses ApiWsdlClass::getSoapClientClassName()
190-
* @uses ApiWsdlClass::setSoapClient()
188+
* @uses AbstractSoapClientBase::getDefaultWsdlOptions()
189+
* @uses AbstractSoapClientBase::getSoapClientClassName()
190+
* @uses AbstractSoapClientBase::setSoapClient()
191191
* @param array $options WSDL options
192192
* @return void
193193
*/
@@ -228,30 +228,30 @@ public function getSoapClientClassName($soapClientClassName = null)
228228
}
229229
/**
230230
* Method returning all default options values
231-
* @uses ApiWsdlClass::WSDL_CLASSMAP
232-
* @uses ApiWsdlClass::WSDL_CACHE_WSDL
233-
* @uses ApiWsdlClass::WSDL_COMPRESSION
234-
* @uses ApiWsdlClass::WSDL_CONNECTION_TIMEOUT
235-
* @uses ApiWsdlClass::WSDL_ENCODING
236-
* @uses ApiWsdlClass::WSDL_EXCEPTIONS
237-
* @uses ApiWsdlClass::WSDL_FEATURES
238-
* @uses ApiWsdlClass::WSDL_LOGIN
239-
* @uses ApiWsdlClass::WSDL_PASSWORD
240-
* @uses ApiWsdlClass::WSDL_SOAP_VERSION
241-
* @uses ApiWsdlClass::WSDL_STREAM_CONTEXT
242-
* @uses ApiWsdlClass::WSDL_TRACE
243-
* @uses ApiWsdlClass::WSDL_TYPEMAP
244-
* @uses ApiWsdlClass::WSDL_URL
245-
* @uses ApiWsdlClass::VALUE_WSDL_URL
246-
* @uses ApiWsdlClass::WSDL_USER_AGENT
247-
* @uses ApiWsdlClass::WSDL_PROXY_HOST
248-
* @uses ApiWsdlClass::WSDL_PROXY_PORT
249-
* @uses ApiWsdlClass::WSDL_PROXY_LOGIN
250-
* @uses ApiWsdlClass::WSDL_PROXY_PASSWORD
251-
* @uses ApiWsdlClass::WSDL_LOCAL_CERT
252-
* @uses ApiWsdlClass::WSDL_PASSPHRASE
253-
* @uses ApiWsdlClass::WSDL_AUTHENTICATION
254-
* @uses ApiWsdlClass::WSDL_SSL_METHOD
231+
* @uses AbstractSoapClientBase::WSDL_CLASSMAP
232+
* @uses AbstractSoapClientBase::WSDL_CACHE_WSDL
233+
* @uses AbstractSoapClientBase::WSDL_COMPRESSION
234+
* @uses AbstractSoapClientBase::WSDL_CONNECTION_TIMEOUT
235+
* @uses AbstractSoapClientBase::WSDL_ENCODING
236+
* @uses AbstractSoapClientBase::WSDL_EXCEPTIONS
237+
* @uses AbstractSoapClientBase::WSDL_FEATURES
238+
* @uses AbstractSoapClientBase::WSDL_LOGIN
239+
* @uses AbstractSoapClientBase::WSDL_PASSWORD
240+
* @uses AbstractSoapClientBase::WSDL_SOAP_VERSION
241+
* @uses AbstractSoapClientBase::WSDL_STREAM_CONTEXT
242+
* @uses AbstractSoapClientBase::WSDL_TRACE
243+
* @uses AbstractSoapClientBase::WSDL_TYPEMAP
244+
* @uses AbstractSoapClientBase::WSDL_URL
245+
* @uses AbstractSoapClientBase::VALUE_WSDL_URL
246+
* @uses AbstractSoapClientBase::WSDL_USER_AGENT
247+
* @uses AbstractSoapClientBase::WSDL_PROXY_HOST
248+
* @uses AbstractSoapClientBase::WSDL_PROXY_PORT
249+
* @uses AbstractSoapClientBase::WSDL_PROXY_LOGIN
250+
* @uses AbstractSoapClientBase::WSDL_PROXY_PASSWORD
251+
* @uses AbstractSoapClientBase::WSDL_LOCAL_CERT
252+
* @uses AbstractSoapClientBase::WSDL_PASSPHRASE
253+
* @uses AbstractSoapClientBase::WSDL_AUTHENTICATION
254+
* @uses AbstractSoapClientBase::WSDL_SSL_METHOD
255255
* @uses SOAP_SINGLE_ELEMENT_ARRAYS
256256
* @uses SOAP_USE_XSI_ARRAY_TYPE
257257
* @return array
@@ -285,7 +285,7 @@ public static function getDefaultWsdlOptions()
285285
}
286286
/**
287287
* Allows to set the SoapClient location to call
288-
* @uses ApiWsdlClass::getSoapClient()
288+
* @uses AbstractSoapClientBase::getSoapClient()
289289
* @uses SoapClient::__setLocation()
290290
* @param string $location
291291
* @return AbstractSoapClientBase
@@ -300,8 +300,8 @@ public function setLocation($location)
300300
/**
301301
* Returns the last request content as a DOMDocument or as a formated XML String
302302
* @see SoapClient::__getLastRequest()
303-
* @uses ApiWsdlClass::getSoapClient()
304-
* @uses ApiWsdlClass::getFormatedXml()
303+
* @uses AbstractSoapClientBase::getSoapClient()
304+
* @uses AbstractSoapClientBase::getFormatedXml()
305305
* @uses SoapClient::__getLastRequest()
306306
* @param bool $asDomDocument
307307
* @return \DOMDocument|string|null
@@ -317,8 +317,8 @@ public function getLastRequest($asDomDocument = false)
317317
/**
318318
* Returns the last response content as a DOMDocument or as a formated XML String
319319
* @see SoapClient::__getLastResponse()
320-
* @uses ApiWsdlClass::getSoapClient()
321-
* @uses ApiWsdlClass::getFormatedXml()
320+
* @uses AbstractSoapClientBase::getSoapClient()
321+
* @uses AbstractSoapClientBase::getFormatedXml()
322322
* @uses SoapClient::__getLastResponse()
323323
* @param bool $asDomDocument
324324
* @return \DOMDocument|string|null
@@ -333,32 +333,36 @@ public function getLastResponse($asDomDocument = false)
333333
/**
334334
* Returns the last request headers used by the SoapClient object as the original value or an array
335335
* @see SoapClient::__getLastRequestHeaders()
336-
* @uses ApiWsdlClass::getSoapClient()
337-
* @uses ApiWsdlClass::convertStringHeadersToArray()
336+
* @uses AbstractSoapClientBase::getSoapClient()
337+
* @uses AbstractSoapClientBase::convertStringHeadersToArray()
338338
* @uses SoapClient::__getLastRequestHeaders()
339339
* @param bool $asArray allows to get the headers in an associative array
340340
* @return null|string|array
341341
*/
342342
public function getLastRequestHeaders($asArray = false)
343343
{
344-
$headers = self::getSoapClient() instanceof \SoapClient ? self::getSoapClient()->__getLastRequestHeaders() : null;
345-
if (is_string($headers) && $asArray) {
346-
return self::convertStringHeadersToArray($headers);
347-
}
348-
return $headers;
344+
return $this->getLastHeaders('__getLastRequestHeaders');
349345
}
350346
/**
351347
* Returns the last response headers used by the SoapClient object as the original value or an array
352348
* @see SoapClient::__getLastResponseHeaders()
353-
* @uses ApiWsdlClass::getSoapClient()
354-
* @uses ApiWsdlClass::convertStringHeadersToArray()
349+
* @uses AbstractSoapClientBase::getSoapClient()
350+
* @uses AbstractSoapClientBase::convertStringHeadersToArray()
355351
* @uses SoapClient::__getLastRequestHeaders()
356352
* @param bool $asArray allows to get the headers in an associative array
357353
* @return null|string|array
358354
*/
359355
public function getLastResponseHeaders($asArray = false)
360356
{
361-
$headers = self::getSoapClient() instanceof \SoapClient ? self::getSoapClient()->__getLastResponseHeaders() : null;
357+
return $this->getLastHeaders('__getLastResponseHeaders');
358+
}
359+
/**
360+
* @param string $method
361+
* @return string[]|null
362+
*/
363+
protected function getLastHeaders($method)
364+
{
365+
$headers = self::getSoapClient() instanceof \SoapClient ? self::getSoapClient()->$method() : null;
362366
if (is_string($headers) && $asArray) {
363367
return self::convertStringHeadersToArray($headers);
364368
}
@@ -396,7 +400,7 @@ public static function convertStringHeadersToArray($headers)
396400
/**
397401
* Sets a SoapHeader to send
398402
* For more information, please read the online documentation on {@link http://www.php.net/manual/en/class.soapheader.php}
399-
* @uses ApiWsdlClass::getSoapClient()
403+
* @uses AbstractSoapClientBase::getSoapClient()
400404
* @uses SoapClient::__setSoapheaders()
401405
* @param string $nameSpace SoapHeader namespace
402406
* @param string $name SoapHeader name
@@ -429,7 +433,7 @@ public function setSoapHeader($nameSpace, $name, $data, $mustUnderstand = false,
429433
* Sets the SoapClient Stream context HTTP Header name according to its value
430434
* If a context already exists, it tries to modify it
431435
* It the context does not exist, it then creates it with the header name and its value
432-
* @uses ApiWsdlClass::getSoapClient()
436+
* @uses AbstractSoapClientBase::getSoapClient()
433437
* @param string $headerName
434438
* @param mixed $headerValue
435439
* @return bool

0 commit comments

Comments
 (0)