[SoapHook] switches from switch statement to if in SOAP version resolution, removes getHeaderCheckCallback from SoapHookTest in favour of getHeadersCheckCallback

Author: laland

src/VCR/LibraryHooks/SoapHook.php

@@ -70,15 +70,12 @@ public function doRequest($request, $location, $action, $version, $one_way = 0,
 
  $vcrRequest = new Request('POST', $location);
 
- switch ($version) {
- case SOAP_1_1:
- $vcrRequest->setHeader('Content-Type', 'text/xml; charset=utf-8;');
- $vcrRequest->setHeader('SOAPAction', $action);
- break;
-
- case SOAP_1_2:
- $vcrRequest->setHeader('Content-Type', sprintf('application/soap+xml; charset=utf-8; action="%s"', $action));
- break;
+ 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);

tests/VCR/LibraryHooks/SoapHookTest.php

@@ -58,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',
@@ -80,19 +83,6 @@ protected function getContentCheckCallback()
  };
  }
 
- /**
- * @param string $expectedHeader
- * @return \callable
- */
- protected function getHeaderCheckCallback($expectedHeader)
- {
- $test = $this;
- return function (Request $request) use ($test, $expectedHeader) {
- $test->assertEquals($expectedHeader, $request->getHeader('Content-Type'));
- return new Response(200, array(), '');
- };
- }
-
  /**
  * @param array $expectedHeaders
  * @return \callable