Simplify internal Client constructor initialization

Author: clue

src/Client.php

@@ -20,34 +20,23 @@
  */
 final class Client
 {
-    private $wsdl;
     private $browser;
     private $encoder;
     private $decoder;
 
     /**
-     * [internal] Instantiate new SOAP client, see Factory instead
+     * Instantiate new SOAP client
      *
-     * @param string $wsdl
      * @param Browser $browser
-     * @param ClientEncoder $encoder
-     * @param ClientDecoder $decoder
-     * @internal
+     * @param string  $wsdlContents
      */
-    public function __construct($wsdl, Browser $browser, ClientEncoder $encoder = null, ClientDecoder $decoder = null)
+    public function __construct(Browser $browser, $wsdlContents)
     {
-        if ($encoder === null) {
-            $encoder = new ClientEncoder($wsdl);
-        }
-
-        if ($decoder === null) {
-            $decoder = new ClientDecoder($wsdl);
-        }
-
-        $this->wsdl = $wsdl;
         $this->browser = $browser;
-        $this->encoder = $encoder;
-        $this->decoder = $decoder;
+        $this->encoder = new ClientEncoder(
+            'data://text/plain;base64,' . base64_encode($wsdlContents)
+        );
+        $this->decoder = new ClientDecoder();
     }
 
     /**

src/Factory.php

@@ -27,15 +27,13 @@
  */
 final class Factory
 {
-    private $loop;
     private $browser;
 
     public function __construct(LoopInterface $loop, Browser $browser = null)
     {
         if ($browser === null) {
             $browser = new Browser($loop);
         }
-        $this->loop = $loop;
         $this->browser = $browser;
     }
 
@@ -53,15 +51,18 @@ public function __construct(LoopInterface $loop, Browser $browser = null)
      * );
      * ```
      *
-     * @param string $wsdl
+     * @param string $wsdlUri
      * @return PromiseInterface Returns a Promise<Client, Exception>
      */
-    public function createClient($wsdl)
+    public function createClient($wsdlUri)
     {
-        $that = $this;
+        $browser = $this->browser;
 
-        return $this->browser->get($wsdl)->then(function (ResponseInterface $response) use ($that) {
-            return $that->createClientFromWsdl((string)$response->getBody());
+        return $this->browser->get($wsdlUri)->then(function (ResponseInterface $response) use ($browser) {
+            return new Client(
+                $browser,
+                (string)$response->getBody()
+            );
         });
     }
 
@@ -76,9 +77,6 @@ public function createClient($wsdl)
      */
     public function createClientFromWsdl($wsdlContents)
     {
-        $browser = $this->browser;
-        $url     = 'data://text/plain;base64,' . base64_encode($wsdlContents);
-
-        return new Client($url, $browser);
+        return new Client($this->browser, $wsdlContents);
     }
 }

tests/ClientTest.php

@@ -0,0 +1,19 @@
+<?php
+
+use Clue\React\Soap\Client;
+use PHPUnit\Framework\TestCase;
+
+class ClientTest extends TestCase
+{
+    public function testConstructorThrowsWhenUrlIsInvalid()
+    {
+        if (extension_loaded('xdebug')) {
+            $this->markTestSkipped('Invalid WSDL causes a fatal error when ext-xdebug is loaded');
+        }
+
+        $browser = $this->getMockBuilder('Clue\React\Buzz\Browser')->disableOriginalConstructor()->getMock();
+        $wsdl = 'invalid';
+
+        $client = new Client($browser, $wsdl);
+    }
+}