Merge remote-tracking branch 'origin/0.2'

francisbesset · francisbesset · commit 27ebf0fbce93 · 2015-06-01T16:04:32.000+02:00
diff --git a/src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php b/src/BeSimple/SoapBundle/EventListener/SoapExceptionListener.php
@@ -51,7 +51,9 @@ public function onKernelException(GetResponseForExceptionEvent $event)
         }
 
         $request = $event->getRequest();
-        if ('soap' !== $request->getRequestFormat()) {
+        if (!in_array($request->getRequestFormat(), array('soap', 'xml'))) {
+            return;
+        } elseif ('xml' === $request->getRequestFormat() && '_webservice_call' !== $request->attributes->get('_route')) {
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,9 @@ public function onKernelException(GetResponseForExceptionEvent $event)`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`$request = $event->getRequest();`
`54`		`- if ('soap' !== $request->getRequestFormat()) {`
	`54`	`+ if (!in_array($request->getRequestFormat(), array('soap', 'xml'))) {`
	`55`	`+ return;`
	`56`	`+ } elseif ('xml' === $request->getRequestFormat() && '_webservice_call' !== $request->attributes->get('_route')) {`
`55`	`57`	`return;`
`56`	`58`	`}`
`57`	`59`