[SoapBundle] Enhanced SoapFault management
This commit is contained in:
parent
fd5154a469
commit
3a2b8e32ee
|
@ -15,6 +15,7 @@ namespace BeSimple\SoapBundle\Controller;
|
|||
use BeSimple\SoapBundle\Handler\ExceptionHandler;
|
||||
use BeSimple\SoapBundle\Soap\SoapRequest;
|
||||
use BeSimple\SoapBundle\Soap\SoapResponse;
|
||||
use BeSimple\SoapServer\SoapServerBuilder;
|
||||
use Symfony\Component\DependencyInjection\ContainerAware;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
|
@ -128,16 +129,30 @@ class SoapWebServiceController extends ContainerAware
|
|||
'logger' => $logger,
|
||||
));
|
||||
|
||||
$server = $this
|
||||
->container
|
||||
->get(sprintf('besimple.soap.context.%s', $webservice))
|
||||
->getServerBuilder()
|
||||
->withHandler(new ExceptionHandler($exception, $details))
|
||||
$handler = new ExceptionHandler($exception, $details);
|
||||
if ($soapFault = $request->query->get('_besimple_soap_fault')) {
|
||||
$handler->setSoapFault($soapFault);
|
||||
|
||||
// Remove parameter from query because cannot be Serialized in Logger
|
||||
$request->query->remove('_besimple_soap_fault');
|
||||
}
|
||||
|
||||
$server = SoapServerBuilder::createWithDefaults()
|
||||
->withWsdl(__DIR__.'/../Handler/wsdl/exception.wsdl')
|
||||
->withWsdlCacheNone()
|
||||
->withHandler($handler)
|
||||
->build()
|
||||
;
|
||||
|
||||
ob_start();
|
||||
$server->handle($request->getContent());
|
||||
$server->handle(
|
||||
'<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns="http://besim.pl/soap/exception/1.0/">'.
|
||||
'<soapenv:Header/>'.
|
||||
'<soapenv:Body>'.
|
||||
'<ns:exception />'.
|
||||
'</soapenv:Body>'.
|
||||
'</soapenv:Envelope>'
|
||||
);
|
||||
|
||||
return new Response(ob_get_clean());
|
||||
}
|
||||
|
|
|
@ -67,12 +67,18 @@ class SoapExceptionListener extends ExceptionListener
|
|||
// hack to retrieve the current WebService name in the controller
|
||||
$request->query->set('_besimple_soap_webservice', $webservice);
|
||||
|
||||
$exception = $event->getException();
|
||||
if ($exception instanceof \SoapFault) {
|
||||
$request->query->set('_besimple_soap_fault', $exception);
|
||||
}
|
||||
|
||||
parent::onKernelException($event);
|
||||
}
|
||||
|
||||
public static function getSubscribedEvents()
|
||||
{
|
||||
return array(
|
||||
// Must be called before ExceptionListener of HttpKernel component
|
||||
KernelEvents::EXCEPTION => array('onKernelException', -64),
|
||||
);
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@ class ExceptionHandler
|
|||
{
|
||||
protected $exception;
|
||||
protected $details;
|
||||
protected $soapFault;
|
||||
|
||||
public function __construct(FlattenException $exception, $details = null)
|
||||
{
|
||||
|
@ -30,8 +31,17 @@ class ExceptionHandler
|
|||
$this->details = $details;
|
||||
}
|
||||
|
||||
public function setSoapFault(\SoapFault $soapFault)
|
||||
{
|
||||
$this->soapFault = $soapFault;
|
||||
}
|
||||
|
||||
public function __call($method, $arguments)
|
||||
{
|
||||
if (isset($this->soapFault)) {
|
||||
throw $this->soapFault;
|
||||
}
|
||||
|
||||
$code = $this->exception->getStatusCode();
|
||||
|
||||
throw new ReceiverSoapFault(
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://besim.pl/soap/exception/1.0/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="Exception" targetNamespace="http://besim.pl/soap/exception/1.0/">
|
||||
|
||||
<portType name="ExceptionPortType">
|
||||
<operation name="exception">
|
||||
<input message="tns:empty"/>
|
||||
<output message="tns:empty"/>
|
||||
</operation>
|
||||
</portType>
|
||||
|
||||
<message name="empty" />
|
||||
|
||||
<binding name="ExceptionBinding" type="tns:ExceptionPortType">
|
||||
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
|
||||
<operation name="exception">
|
||||
<soap:operation soapAction="http://besim.pl/soap/exception/1.0/exception"/>
|
||||
<input>
|
||||
<soap:body use="literal" namespace="http://besim.pl/soap/exception/1.0/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
|
||||
</input>
|
||||
<output>
|
||||
<soap:body use="literal" namespace="http://besim.pl/soap/exception/1.0/" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
|
||||
</output>
|
||||
</operation>
|
||||
</binding>
|
||||
|
||||
<service name="ExceptionService">
|
||||
<port name="ExceptionPort" binding="tns:ExceptionBinding">
|
||||
<soap:address location="http://localhost/soap/Exception"/>
|
||||
</port>
|
||||
</service>
|
||||
</definitions>
|
Loading…
Reference in New Issue