SmtpMailer: Fix for servers which sends 250-AUTH only through encrypted connections (#67)

Author: dg

src/Mail/SmtpMailer.php

@@ -155,13 +155,8 @@ protected function connect(): void
 		stream_set_timeout($this->connection, $this->timeout, 0);
 		$this->read(); // greeting
 
-		$this->write("EHLO $this->clientHost");
-		$ehloResponse = $this->read();
-		if ((int) $ehloResponse !== 250) {
-			$this->write("HELO $this->clientHost", 250);
-		}
-
 		if ($this->secure === 'tls') {
+			$this->write("EHLO $this->clientHost", 250);
 			$this->write('STARTTLS', 220);
 			if (!stream_socket_enable_crypto(
 				$this->connection,
@@ -170,7 +165,18 @@ protected function connect(): void
 			)) {
 				throw new SmtpException('Unable to connect via TLS.');
 			}
-			$this->write("EHLO $this->clientHost", 250);
+			$this->write("EHLO $this->clientHost");
+			$ehloResponse = $this->read();
+			if ((int) $ehloResponse !== 250) {
+				throw new SmtpException('SMTP server did not accept EHLO with error: ' . trim($response));
+			}
+
+		} else {
+			$this->write("EHLO $this->clientHost");
+			$ehloResponse = $this->read();
+			if ((int) $ehloResponse !== 250) {
+				$this->write("HELO $this->clientHost", 250);
+			}
 		}
 
 		if ($this->username != null && $this->password != null) {