Merge pull request #3 from jwage/fix/connect-exception

jwage · jwage · commit a0ac892e43c0 · 2014-01-07T13:15:10.000-08:00
Allow ErrorException to be thrown when stream_socket_client() fails to c...
diff --git a/src/JWage/APNS/SocketClient.php b/src/JWage/APNS/SocketClient.php
@@ -106,7 +106,7 @@ protected function createStreamClient()
     {
         $address = $this->getSocketAddress();
 
-        $client = stream_socket_client(
+        $client = @stream_socket_client(
             $address,
             $this->error,
             $this->errorString,
diff --git a/tests/JWage/APNS/Tests/SocketClientTest.php b/tests/JWage/APNS/Tests/SocketClientTest.php
@@ -74,6 +74,16 @@ public function testGetSocketAddress()
     {
         $this->assertEquals('ssl://host:1234', $this->socketClient->getTestSocketAddress());
     }
+
+    /**
+     * @expectedException ErrorException
+     * @expectedExceptionMessage Failed to create stream socket client to "ssl://somethingthatdoesnotexist:100". php_network_getaddresses: getaddrinfo failed: Name or service not known
+     */
+    public function testConnectThrowsException()
+    {
+        $socketClient = new SocketClient($this->certificate, 'somethingthatdoesnotexist', 100);
+        $socketClient->write('test');
+    }
 }
 
 class SocketClientStub extends SocketClient

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ protected function createStreamClient()`
`106`	`106`	`{`
`107`	`107`	`$address = $this->getSocketAddress();`
`108`	`108`
`109`		`- $client = stream_socket_client(`
	`109`	`+ $client = @stream_socket_client(`
`110`	`110`	`$address,`
`111`	`111`	`$this->error,`
`112`	`112`	`$this->errorString,`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,16 @@ public function testGetSocketAddress()`
`74`	`74`	`{`
`75`	`75`	`$this->assertEquals('ssl://host:1234', $this->socketClient->getTestSocketAddress());`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ /**`
	`79`	`+ * @expectedException ErrorException`
	`80`	`+ * @expectedExceptionMessage Failed to create stream socket client to "ssl://somethingthatdoesnotexist:100". php_network_getaddresses: getaddrinfo failed: Name or service not known`
	`81`	`+ */`
	`82`	`+ public function testConnectThrowsException()`
	`83`	`+ {`
	`84`	`+ $socketClient = new SocketClient($this->certificate, 'somethingthatdoesnotexist', 100);`
	`85`	`+ $socketClient->write('test');`
	`86`	`+ }`
`77`	`87`	`}`
`78`	`88`
`79`	`89`	`class SocketClientStub extends SocketClient`