Cadoles/BeSimpleSoap
21
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

cs fixes

Browse Source
This commit is contained in:
Andreas Schamberger
2011-10-02 12:23:59 +02:00
parent 06ff1ab707
commit 3040718c9d
3 changed files with 160 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/BeSimple/SoapClient/SoapClient.php
View File

@ -8,16 +8,16 @@
*
* This source file is subject to the MIT license that is bundled
* with this source code in the file LICENSE.
*
*
* @link https://github.com/BeSimple/BeSimpleSoapClient
*/
namespace BeSimple\SoapClient;
/**
* Extended SoapClient that uses a a cURL wrapper for all underlying HTTP
* requests in order to use proper authentication for all requests. This also
* adds NTLM support. A custom WSDL downloader resolves remote xsd:includes and
* Extended SoapClient that uses a a cURL wrapper for all underlying HTTP
* requests in order to use proper authentication for all requests. This also
* adds NTLM support. A custom WSDL downloader resolves remote xsd:includes and
* allows caching of all remote referenced items.
*
* @author Andreas Schamberger
@ -73,37 +73,30 @@ class SoapClient extends \SoapClient
* @param string $wsdl
* @param array(string=>mixed) $options
*/
public function __construct( $wsdl, array $options = array(), TypeConverterCollection $converters = null )
public function __construct($wsdl, array $options = array(), TypeConverterCollection $converters = null)
{
// we want the exceptions option to be set
$options['exceptions'] = true;
// set custom error handler that converts all php errors to ErrorExceptions
Helper::setCustomErrorHandler();
// we want to make sure we have the soap version to rely on it later
if ( !isset( $options['soap_version'] ) )
{
if (!isset($options['soap_version'])) {
$options['soap_version'] = SOAP_1_1;
}
// we want to make sure we have the features option
if ( !isset( $options['features'] ) )
{
if (!isset($options['features'])) {
$options['features'] = 0;
}
// set default option to resolve xsd includes
if ( !isset( $options['resolve_xsd_includes'] ) )
{
if (!isset($options['resolve_xsd_includes'])) {
$options['resolve_xsd_includes'] = true;
}
// add type converters from TypeConverterCollection
if ( !is_null( $converters ) )
{
if (!is_null($converters)) {
$convertersTypemap = $converters->getTypemap();
if ( isset( $options['typemap'] ) )
{
$options['typemap'] = array_merge( $options['typemap'], $convertersTypemap );
}
else
{
if (isset($options['typemap'])) {
$options['typemap'] = array_merge($options['typemap'], $convertersTypemap);
} else {
$options['typemap'] = $convertersTypemap;
}
}
@ -115,8 +108,8 @@ class SoapClient extends \SoapClient
$options['cache_wsdl'] = WSDL_CACHE_NONE;
// load WSDL and run parent constructor
// can't be loaded later as we need it already in the parent constructor
$this->wsdlFile = $this->loadWsdl( $wsdl );
parent::__construct( $this->wsdlFile, $options );
$this->wsdlFile = $this->loadWsdl($wsdl);
parent::__construct($this->wsdlFile, $options);
}
/**
@ -127,46 +120,40 @@ class SoapClient extends \SoapClient
* @param string $action
* @return string
*/
private function __doHttpRequest( $request, $location, $action )
private function __doHttpRequest($request, $location, $action)
{
// $request is if unmodified from SoapClient not a php string type!
$request = (string)$request;
if ( $this->options['soap_version'] == SOAP_1_2 )
{
if ($this->options['soap_version'] == SOAP_1_2) {
$headers = array(
'Content-Type: application/soap+xml; charset=utf-8',
);
}
else
{
);
} else {
$headers = array(
'Content-Type: text/xml; charset=utf-8',
);
);
}
// add SOAPAction header
$headers[] = 'SOAPAction: "' . $action . '"';
// new curl object for request
$curl = new Curl( $this->options );
$curl = new Curl($this->options);
// execute request
$responseSuccessfull = $curl->exec( $location, $request, $headers );
$responseSuccessfull = $curl->exec($location, $request, $headers);
// tracing enabled: store last request header and body
if ( isset( $this->options['trace'] ) && $this->options['trace'] === true )
{
if (isset($this->options['trace']) && $this->options['trace'] === true) {
$this->lastRequestHeaders = $curl->getRequestHeaders();
$this->lastRequest = $request;
}
// in case of an error while making the http request throw a soapFault
if ( $responseSuccessfull === false )
{
if ($responseSuccessfull === false) {
// get error message from curl
$faultstring = $curl->getErrorMessage();
// destruct curl object
unset( $curl );
throw new \SoapFault( 'HTTP', $faultstring );
unset($curl);
throw new \SoapFault('HTTP', $faultstring);
}
// tracing enabled: store last response header and body
if ( isset( $this->options['trace'] ) && $this->options['trace'] === true )
{
if (isset($this->options['trace']) && $this->options['trace'] === true) {
$this->lastResponseHeaders = $curl->getResponseHeaders();
$this->lastResponse = $curl->getResponseBody();
}
@ -174,43 +161,32 @@ class SoapClient extends \SoapClient
// check if we do have a proper soap status code (if not soapfault)
// // TODO
// $responseStatusCode = $curl->getResponseStatusCode();
// if ( $responseStatusCode >= 400 )
// {
// if ($responseStatusCode >= 400) {
// $isError = 0;
// $response = trim( $response );
// if ( strlen( $response ) == 0 )
// {
// $response = trim($response);
// if (strlen($response) == 0) {
// $isError = 1;
// }
// else
// {
// } else {
// $contentType = $curl->getResponseContentType();
// if ( $contentType != 'application/soap+xml'
// && $contentType != 'application/soap+xml' )
// {
// if ( strncmp( $response , "<?xml", 5 ) )
// {
// if ($contentType != 'application/soap+xml'
// && $contentType != 'application/soap+xml') {
// if (strncmp($response , "<?xml", 5)) {
// $isError = 1;
// }
// }
// }
// if ( $isError == 1 )
// {
// throw new \SoapFault( 'HTTP', $curl->getResponseStatusMessage() );
// if ($isError == 1) {
// throw new \SoapFault('HTTP', $curl->getResponseStatusMessage());
// }
// }
// // TODO
// elseif ( $responseStatusCode != 200 && $responseStatusCode != 202 )
// {
// $dom = new \DOMDocument( '1.0' );
// $dom->loadXML( $response );
// if ( $dom->getElementsByTagNameNS( $dom->documentElement->namespaceURI, 'Fault' )->length == 0 )
// {
// throw new \SoapFault( 'HTTP', 'HTTP response status must be 200 or 202' );
// } elseif ($responseStatusCode != 200 && $responseStatusCode != 202) {
// $dom = new \DOMDocument('1.0');
// $dom->loadXML($response);
// if ($dom->getElementsByTagNameNS($dom->documentElement->namespaceURI, 'Fault')->length == 0) {
// throw new \SoapFault('HTTP', 'HTTP response status must be 200 or 202');
// }
// }
// destruct curl object
unset( $curl );
unset($curl);
return $response;
}
@ -224,10 +200,10 @@ class SoapClient extends \SoapClient
* @param int $one_way 0|1
* @return string
*/
public function __doRequest( $request, $location, $action, $version, $one_way = 0 )
public function __doRequest($request, $location, $action, $version, $one_way = 0)
{
// http request
$response = $this->__doHttpRequest( $request, $location, $action );
$response = $this->__doHttpRequest($request, $location, $action);
// return SOAP response to ext/soap
return $response;
}
@ -281,16 +257,13 @@ class SoapClient extends \SoapClient
* @param string $wsdl
* @return string
*/
private function loadWsdl( $wsdl )
private function loadWsdl($wsdl)
{
$wsdlDownloader = new WsdlDownloader( $this->options );
try
{
$cacheFileName = $wsdlDownloader->download( $wsdl );
}
catch ( \RuntimeException $e )
{
throw new \SoapFault( 'WSDL', "SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl . "' : failed to load external entity \"" . $wsdl . "\"" );
$wsdlDownloader = new WsdlDownloader($this->options);
try {
$cacheFileName = $wsdlDownloader->download($wsdl);
} catch (\RuntimeException $e) {
throw new \SoapFault('WSDL', "SOAP-ERROR: Parsing WSDL: Couldn't load from '" . $wsdl . "' : failed to load external entity \"" . $wsdl . "\"");
}
return $cacheFileName;
}