Renamed withTarget to withRequestTarget, fixed unit tests and code style.

Author: pascal-hofmann

README.md

@@ -166,10 +166,10 @@ assert('http://example.com/soap/service' == $client->getLocation(0));
 
 Passing a `$function` not defined in the WSDL file will throw a `SoapFault`. 
 
-#### withTarget($newTarget)
+#### withRequestTarget($requestTarget)
 
-This method allows you to change the destination of your SOAP calls. It does not change the Client object, but returns a new
-Client with the overriden target.
+This method allows you to change the destination of your SOAP calls. It returns a new Client instance
+with the specified request-target.
 
 ### Proxy
 

src/Client.php

@@ -50,7 +50,7 @@ public function soapCall($name, $args)
 
     public function handleResponse(ResponseInterface $response)
     {
-        return $this->decoder->decode((string) $response->getBody());
+        return $this->decoder->decode((string)$response->getBody());
     }
 
     public function handleError(Exception $error)
@@ -103,10 +103,11 @@ public function getLocation($function)
         return (string)$this->encoder->encode($function, array())->getUri();
     }
 
-    public function withTarget($target)
+    public function withRequestTarget($requestTarget)
     {
         $copy = clone $this;
-        $copy->encoder = $this->encoder->withTarget($target);
+        $copy->encoder = $this->encoder->withRequestTarget($requestTarget);
+
         return $copy;
     }
 }

src/Protocol/ClientEncoder.php

@@ -7,8 +7,8 @@
 
 class ClientEncoder extends SoapClient
 {
-    private $request        = null;
-    private $targetOverride = null;
+    private $request       = null;
+    private $requestTarget = null;
 
     public function encode($name, $args)
     {
@@ -23,27 +23,28 @@ public function encode($name, $args)
     public function __doRequest($request, $location, $action, $version, $one_way = 0)
     {
 
-        $finalLocation = $this->targetOverride !== null ? $this->targetOverride : $location;
+        $requestTarget = $this->requestTarget !== null ? $this->requestTarget : $location;
 
         $this->request = new Request(
             'POST',
-            (string) $finalLocation,
-            new Headers(array(
-                'SOAPAction' => (string) $action,
+            (string)$requestTarget,
+            array(
+                'SOAPAction' => (string)$action,
                 'Content-Type' => 'text/xml; charset=utf-8',
                 'Content-Length' => strlen($request)
-            )),
-            new Body((string) $request)
+            ),
+            (string)$request
         );
 
         // do not actually block here, just pretend we're done...
         return '';
     }
 
-    public function withTarget($newTarget)
+    public function withRequestTarget($requestTarget)
     {
         $copy = clone $this;
-        $copy->targetOverride = $newTarget;
+        $copy->requestTarget = $requestTarget;
+
         return $copy;
     }
 }

tests/FunctionalTest.php

@@ -89,22 +89,26 @@ public function testGetLocationForUnknownFunctionNumberFails()
         $this->assertEquals('http://www.thomas-bayer.com/axis2/services/BLZService', $this->client->getLocation(100));
     }
 
-    public function testWrongLocationOverride()
+    public function testWrongRequestTarget()
     {
-        $api = new Proxy($this->client->withTarget('nonsense.not.existing'));
+        $api = new Proxy($this->client->withRequestTarget('nonsense.not.existing'));
 
         $promise = $api->getBank(array('blz' => '12070000'));
 
-        $this->expectPromiseReject($promise);
-
-        $this->setExpectedException('Exception');
+        $this->expectException('Exception');
         Block\await($promise, $this->loop);
     }
 
-    public function testCorrectLocationOverride()
+    public function testCorrectRequestTarget()
     {
-        $this->client->withTarget('nonsense.not.existing');
-        $this->client->withTarget('http://www.thomas-bayer.com/axis2/services/BLZService');
-        $this->testBlzService();
+        $client = $this->client->withRequestTarget('nonsense.not.existing');
+        $client = $client->withRequestTarget('http://www.thomas-bayer.com/axis2/services/BLZService');
+        $api = new Proxy($client);
+
+        $promise = $api->getBank(array('blz' => '12070000'));
+
+        $result = Block\await($promise, $this->loop);
+
+        $this->assertInternalType('object', $result);
     }
 }