Merge remote-tracking branch 'origin/request_headers'
This commit is contained in:
@ -43,6 +43,11 @@ class SoapWebServiceController extends ContainerAware
|
||||
*/
|
||||
protected $serviceBinder;
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $headers = array();
|
||||
|
||||
/**
|
||||
* @return \BeSimple\SoapBundle\Soap\SoapResponse
|
||||
*/
|
||||
@ -96,12 +101,15 @@ class SoapWebServiceController extends ContainerAware
|
||||
*/
|
||||
public function __call($method, $arguments)
|
||||
{
|
||||
if ($this->serviceBinder->isServiceHeader($method)) {
|
||||
// collect request soap headers
|
||||
$this->soapRequest->getSoapHeaders()->add(
|
||||
$this->serviceBinder->processServiceHeader($method, $arguments[0])
|
||||
);
|
||||
} elseif ($this->serviceBinder->isServiceMethod($method)) {
|
||||
if ($this->serviceBinder->isServiceMethod($method)) {
|
||||
// @TODO Add all SoapHeaders in SoapRequest
|
||||
foreach ($this->headers as $name => $value) {
|
||||
if ($this->serviceBinder->isServiceHeader($method, $name)) {
|
||||
$this->soapRequest->getSoapHeaders()->add($this->serviceBinder->processServiceHeader($method, $name, $value));
|
||||
}
|
||||
}
|
||||
$this->headers = null;
|
||||
|
||||
$this->soapRequest->attributes->add(
|
||||
$this->serviceBinder->processServiceMethodArguments($method, $arguments)
|
||||
);
|
||||
@ -127,9 +135,28 @@ class SoapWebServiceController extends ContainerAware
|
||||
$method,
|
||||
$this->soapResponse->getReturnValue()
|
||||
);
|
||||
} else {
|
||||
// collect request soap headers
|
||||
$this->headers[$method] = $arguments[0];
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \BeSimple\SoapBundle\Soap\SoapRequest
|
||||
*/
|
||||
public function getRequest()
|
||||
{
|
||||
return $this->soapRequest;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \BeSimple\SoapBundle\Soap\SoapResponse
|
||||
*/
|
||||
public function getResponse()
|
||||
{
|
||||
return $this->soapResponse;
|
||||
}
|
||||
|
||||
/**
|
||||
* Checks that the given Response is a SoapResponse.
|
||||
*
|
||||
@ -148,28 +175,12 @@ class SoapWebServiceController extends ContainerAware
|
||||
return $response;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \BeSimple\SoapBundle\Soap\SoapRequest
|
||||
*/
|
||||
public function getRequest()
|
||||
{
|
||||
return $this->soapRequest;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \BeSimple\SoapBundle\Soap\SoapResponse
|
||||
*/
|
||||
public function getResponse()
|
||||
{
|
||||
return $this->soapResponse;
|
||||
}
|
||||
|
||||
private function getWebServiceContext($webservice)
|
||||
{
|
||||
if(!$this->container->has('besimple.soap.context.'.$webservice))
|
||||
{
|
||||
if (!$this->container->has('besimple.soap.context.'.$webservice)) {
|
||||
throw new NotFoundHttpException(sprintf('No webservice with name "%s" found.', $webservice));
|
||||
}
|
||||
|
||||
return $this->container->get('besimple.soap.context.'.$webservice);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user