Merge pull request php-vcr#141 from laland/master

adds SOAPAction header for soap 1.1

Author: adri

src/VCR/LibraryHooks/SoapHook.php

@@ -69,8 +69,15 @@ public function doRequest($request, $location, $action, $version, $one_way = 0,
  }
 
  $vcrRequest = new Request('POST', $location);
- $contentType = ($version == SOAP_1_2) ? 'application/soap+xml' : 'text/xml';
- $vcrRequest->setHeader('Content-Type', $contentType . '; charset=utf-8; action="' . $action . '"');
+
+ if ($version === SOAP_1_1) {
+ $vcrRequest->setHeader('Content-Type', 'text/xml; charset=utf-8;');
+ $vcrRequest->setHeader('SOAPAction', $action);
+
+ } else { // >= SOAP_1_2
+ $vcrRequest->setHeader('Content-Type', sprintf('application/soap+xml; charset=utf-8; action="%s"', $action));
+ }
+
  $vcrRequest->setBody($request);
 
  if (!empty($options['login'])) {

tests/VCR/LibraryHooks/SoapHookTest.php

@@ -42,8 +42,11 @@ public function testShouldInterceptCallWhenEnabled()
 
  public function testShouldHandleSOAPVersion11()
  {
- $expectedHeader = 'text/xml; charset=utf-8; action="http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP"';
- $this->soapHook->enable($this->getHeaderCheckCallback($expectedHeader));
+ $expectedHeaders = array(
+ 'Content-Type' => 'text/xml; charset=utf-8;',
+ 'SOAPAction' => 'http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP',
+ );
+ $this->soapHook->enable($this->getHeadersCheckCallback($expectedHeaders));
 
  $client = new \SoapClient(
  'http://wsf.cdyne.com/WeatherWS/Weather.asmx?WSDL',
@@ -55,8 +58,11 @@ public function testShouldHandleSOAPVersion11()
 
  public function testShouldHandleSOAPVersion12()
  {
- $expectedHeader = 'application/soap+xml; charset=utf-8; action="http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP"';
- $this->soapHook->enable($this->getHeaderCheckCallback($expectedHeader));
+ $expectedHeaders = array(
+ 'Content-Type' => 'application/soap+xml; charset=utf-8; action="http://ws.cdyne.com/WeatherWS/GetCityWeatherByZIP"',
+ );
+
+ $this->soapHook->enable($this->getHeadersCheckCallback($expectedHeaders));
 
  $client = new \SoapClient(
  'http://wsf.cdyne.com/WeatherWS/Weather.asmx?WSDL',
@@ -78,14 +84,16 @@ protected function getContentCheckCallback()
  }
 
  /**
- * @param string $expectedHeader
+ * @param array $expectedHeaders
  * @return \callable
  */
- protected function getHeaderCheckCallback($expectedHeader)
+ protected function getHeadersCheckCallback(array $expectedHeaders)
  {
  $test = $this;
- return function (Request $request) use ($test, $expectedHeader) {
- $test->assertEquals($expectedHeader, $request->getHeader('Content-Type'));
+ return function (Request $request) use ($test, $expectedHeaders) {
+ foreach ($expectedHeaders as $expectedHeaderName => $expectedHeader) {
+ $test->assertEquals($expectedHeader, $request->getHeader($expectedHeaderName));
+ }
  return new Response(200, array(), '');
  };
  }