Merge pull request clue#66 from clue-labs/deps

clue · web-flow · commit 6116ca5b1e2f · 2017-09-25T09:54:01.000+02:00
Update Socket dependency to support hosts file on all platforms
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
         "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3",
         "react/promise": "^2.0 || ^1.1",
-        "react/socket": "^1.0 || ^0.8 || ^0.7"
+        "react/socket": "^1.0 || ^0.8.3"
     },
     "autoload": {
         "psr-4": { "Clue\\React\\Redis\\": "src/" }
diff --git a/src/Factory.php b/src/Factory.php
@@ -107,10 +107,6 @@ private function parseUrl($target)
             $parts['port'] = 6379;
         }
 
-        if ($parts['host'] === 'localhost') {
-            $parts['host'] = '127.0.0.1';
-        }
-
         if (isset($parts['pass'])) {
             $parts['auth'] = rawurldecode($parts['pass']);
         }
diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php
@@ -27,9 +27,9 @@ public function testWillConnectWithDefaultPort()
         $this->factory->createClient('redis.example.com');
     }
 
-    public function testWillConnectToLocalIpWhenTargetIsLocalhost()
+    public function testWillConnectToLocalhost()
     {
-        $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:1337')->willReturn(Promise\reject(new \RuntimeException()));
+        $this->connector->expects($this->once())->method('connect')->with('localhost:1337')->willReturn(Promise\reject(new \RuntimeException()));
         $this->factory->createClient('localhost:1337');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,10 +107,6 @@ private function parseUrl($target)`
`107`	`107`	`$parts['port'] = 6379;`
`108`	`108`	`}`
`109`	`109`
`110`		`- if ($parts['host'] === 'localhost') {`
`111`		`- $parts['host'] = '127.0.0.1';`
`112`		`- }`
`113`		`-`
`114`	`110`	`if (isset($parts['pass'])) {`
`115`	`111`	`$parts['auth'] = rawurldecode($parts['pass']);`
`116`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,9 @@ public function testWillConnectWithDefaultPort()`
`27`	`27`	`$this->factory->createClient('redis.example.com');`
`28`	`28`	`}`
`29`	`29`
`30`		`- public function testWillConnectToLocalIpWhenTargetIsLocalhost()`
	`30`	`+ public function testWillConnectToLocalhost()`
`31`	`31`	`{`
`32`		`- $this->connector->expects($this->once())->method('connect')->with('127.0.0.1:1337')->willReturn(Promise\reject(new \RuntimeException()));`
	`32`	`+ $this->connector->expects($this->once())->method('connect')->with('localhost:1337')->willReturn(Promise\reject(new \RuntimeException()));`
`33`	`33`	`$this->factory->createClient('localhost:1337');`
`34`	`34`	`}`
`35`	`35`