Clean up Factory interface

Author: clue

Datagram/Factory.php

@@ -8,10 +8,20 @@
 
 class Factory
 {
-    public function createClient(LoopInterface $loop, Resolver $resolver, $host, $port)
+    protected $loop;
+    protected $resolver;
+
+    public function __construct(LoopInterface $loop, Resolver $resolver = null)
+    {
+        $this->loop = $loop;
+        $this->resolver = $resolver;
+    }
+
+    public function createClient($host, $port)
     {
         $factory = $this;
-        return $this->resolve($resolver, $host)->then(function ($ip) use ($loop, $port, $factory) {
+        $loop = $this->loop;
+        return $this->resolve($host)->then(function ($ip) use ($loop, $port, $factory) {
             $address = $factory->createAddress($ip, $port);
             $socket = stream_socket_client('udp://' . $address, $errno, $errstr);
             if (!$socket) {
@@ -23,18 +33,18 @@ public function createClient(LoopInterface $loop, Resolver $resolver, $host, $po
         });
     }
 
-    public function createServer(LoopInterface $loop, $port, $host = '127.0.0.1')
+    public function createServer($port, $host = '127.0.0.1')
     {
         $address = $this->createAddress($host, $port);
 
         $socket = stream_socket_server("udp://" . $address, $errno, $errstr, STREAM_SERVER_BIND);
         if (!$socket) {
             die("$errstr ($errno)");
         }
-        return When::resolve(new Server($loop, $socket, $address));
+        return When::resolve(new Server($this->loop, $socket, $address));
     }
 
-    protected function resolve($resolver, $host)
+    protected function resolve($host)
     {
         // there's no need to resolve if the host is already given as an IP address
         if (false !== filter_var($host, FILTER_VALIDATE_IP)) {
@@ -44,7 +54,11 @@ protected function resolve($resolver, $host)
         if ($host === 'localhost') {
             return When::resolve('127.0.0.1');
         }
-        return $resolver->resolve($host);
+
+        if ($resolver === null) {
+            return When::reject(\Exception('No resolver given in order to get IP address for given hostname'));
+        }
+        return $this->resolver->resolve($host);
     }
 
     public function createAddress($host, $port)