Merge branch 'hotfix/116' into develop

Forward port #116

CHANGELOG.md

@@ -42,6 +42,9 @@ All notable changes to this project will be documented in this file, in reverse
   transport.
 - [#105](https://github.com/zendframework/zend-mail/pull/105) fixes the header
   implementation to allow zero (`0`) values for header values.
+- [#116](https://github.com/zendframework/zend-mail/pull/116) fixes how the
+  `AbstractProtocol` handles `stream_socket_client()` errors, ensuring an
+  exception is thrown with detailed information regarding the failure.
 
 ## 2.7.2 - 2016-12-19
 

src/Protocol/AbstractProtocol.php

@@ -206,7 +206,14 @@ protected function _connect($remote)
         $errorStr = '';
 
         // open connection
-        $this->socket = @stream_socket_client($remote, $errorNum, $errorStr, self::TIMEOUT_CONNECTION);
+        set_error_handler(
+            function ($error, $message = '') {
+                throw new Exception\RuntimeException(sprintf('Could not open socket: %s', $message), $error);
+            },
+            E_WARNING
+        );
+        $this->socket = stream_socket_client($remote, $errorNum, $errorStr, self::TIMEOUT_CONNECTION);
+        restore_error_handler();
 
         if ($this->socket === false) {
             if ($errorNum == 0) {

test/Protocol/SmtpTest.php

@@ -102,4 +102,13 @@ public function testDisconnectResetsAuthFlag()
         $this->connection->disconnect();
         $this->assertFalse($this->connection->getAuth());
     }
+
+    public function testConnectHasVerboseErrors()
+    {
+        $smtp = new TestAsset\ErroneousSmtp();
+
+        $this->setExpectedExceptionRegExp('Zend\Mail\Protocol\Exception\RuntimeException', '/nonexistentremote/');
+
+        $smtp->connect('nonexistentremote');
+    }
 }

test/Protocol/TestAsset/ErroneousSmtp.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-mail for the canonical source repository
+ * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-mail/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Mail\Protocol\TestAsset;
+
+use Zend\Mail\Protocol\AbstractProtocol;
+
+/**
+ * Expose AbstractProtocol behaviour
+ */
+final class ErroneousSmtp extends AbstractProtocol
+{
+    public function connect($customRemote = null)
+    {
+        return $this->_connect($customRemote);
+    }
+}