Work around legacy HHVM < 3.8 (does not support TLS connections)

clue · clue · commit 345690cfcb5f · 2017-04-05T00:14:13.000+02:00
diff --git a/src/SecureConnector.php b/src/SecureConnector.php
@@ -22,7 +22,7 @@ public function __construct(ConnectorInterface $connector, LoopInterface $loop,
     public function connect($uri)
     {
         if (!function_exists('stream_socket_enable_crypto')) {
-            return Promise\reject(new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)'));
+            return Promise\reject(new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)')); // @codeCoverageIgnore
         }
 
         if (strpos($uri, '://') === false) {
diff --git a/src/SecureServer.php b/src/SecureServer.php
@@ -112,11 +112,16 @@ final class SecureServer extends EventEmitter implements ServerInterface
      * @param ServerInterface|Server $tcp
      * @param LoopInterface $loop
      * @param array $context
+     * @throws \BadMethodCallException for legacy HHVM < 3.8 due to lack of support
      * @see Server
      * @link http://php.net/manual/en/context.ssl.php for TLS context options
      */
     public function __construct(ServerInterface $tcp, LoopInterface $loop, array $context)
     {
+        if (!function_exists('stream_socket_enable_crypto')) {
+            throw new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)'); // @codeCoverageIgnore
+        }
+
         // default to empty passphrase to surpress blocking passphrase prompt
         $context += array(
             'passphrase' => ''
diff --git a/src/StreamEncryption.php b/src/StreamEncryption.php
@@ -26,10 +26,6 @@ class StreamEncryption
 
     public function __construct(LoopInterface $loop, $server = true)
     {
-        if (!function_exists('stream_socket_enable_crypto')) {
-            throw new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)');
-        }
-
         $this->loop = $loop;
         $this->server = $server;
 
diff --git a/src/TcpConnector.php b/src/TcpConnector.php
@@ -69,7 +69,7 @@ public function connect($uri)
         // HHVM fails to parse URIs with a query but no path, so let's add a dummy path
         // See also https://3v4l.org/jEhLF
         if (defined('HHVM_VERSION') && isset($parts['query']) && !isset($parts['path'])) {
-            $uri = str_replace('?', '/?', $uri);
+            $uri = str_replace('?', '/?', $uri); // @codeCoverageIgnore
         }
 
         $socket = @stream_socket_client(

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(ConnectorInterface $connector, LoopInterface $loop,`
`22`	`22`	`public function connect($uri)`
`23`	`23`	`{`
`24`	`24`	`if (!function_exists('stream_socket_enable_crypto')) {`
`25`		`- return Promise\reject(new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)'));`
	`25`	`+ return Promise\reject(new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)')); // @codeCoverageIgnore`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (strpos($uri, '://') === false) {`
Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,6 @@ class StreamEncryption`
`26`	`26`
`27`	`27`	`public function __construct(LoopInterface $loop, $server = true)`
`28`	`28`	`{`
`29`		`- if (!function_exists('stream_socket_enable_crypto')) {`
`30`		`- throw new \BadMethodCallException('Encryption not supported on your platform (HHVM < 3.8?)');`
`31`		`- }`
`32`		`-`
`33`	`29`	`$this->loop = $loop;`
`34`	`30`	`$this->server = $server;`
`35`	`31`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function connect($uri)`
`69`	`69`	`// HHVM fails to parse URIs with a query but no path, so let's add a dummy path`
`70`	`70`	`// See also https://3v4l.org/jEhLF`
`71`	`71`	`if (defined('HHVM_VERSION') && isset($parts['query']) && !isset($parts['path'])) {`
`72`		`- $uri = str_replace('?', '/?', $uri);`
	`72`	`+ $uri = str_replace('?', '/?', $uri); // @codeCoverageIgnore`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`$socket = @stream_socket_client(`