Merge pull request #6 from WyriHaximus/patch-2

Swapped needle and haystack arguments

Author: clue

src/Socket.php

@@ -104,10 +104,10 @@ private function sanitizeAddress($address)
     {
         // doc comment suggests IPv6 address is not enclosed in square brackets?
 
-        $pos = strrpos(':', $address);
+        $pos = strrpos($address, ':');
         // this is an IPv6 address which includes colons but no square brackets
         if ($pos !== false && substr($address, 0, 1) !== '[') {
-            if (strpos(':', $address) < $pos) {
+            if (strpos($address, ':') < $pos) {
                 $port = substr($address, $pos + 1);
                 $address = '[' . substr($address, 0, $pos) . ']:' . $port;
             }

tests/SocketTest.php

@@ -141,4 +141,46 @@ public function testCreatePair()
 
         $this->loop->run();
     }
+
+    public function provideSanitizeAddress()
+    {
+        return array(
+            array(
+                '127.0.0.1:1337',
+            ),
+            array(
+                '[::1]:1337',
+            ),
+        );
+    }
+
+    /**
+     * @dataProvider provideSanitizeAddress
+     */
+    public function testSanitizeAddress($address)
+    {
+        $promise = $this->factory->createServer($address);
+        $server = $this->getValueFromResolvedPromise($promise);
+        
+        $promise = $this->factory->createClient($server->getLocalAddress());
+        $client = $this->getValueFromResolvedPromise($promise);
+
+        $that = $this;
+        $server->on('message', function ($message, $remote, $server) use ($that) {
+            // once the server receives a message, send it pack to client and stop server
+            $server->send('response:' . $message, $remote);
+            $server->end();
+        });
+
+        $client->on('message', function ($message, $remote, $client) use ($that, $address) {
+            $that->assertEquals($address, $remote);
+
+            // once the client receives a message, stop client
+            $client->end();
+        });
+
+        $client->send('test');
+
+        $this->loop->run();
+    }
 }