Merge pull request #5389 from nextcloud/enhancement/remove-imap-port

Remove port 585

lib/Service/AutoConfig/ImapConnectivityTester.php

@@ -70,7 +70,7 @@ class ImapConnectivityTester {
 			$users = [$users];
 		}
 
-		$ports = [143, 585, 993];
+		$ports = [143, 993];
 		$encryptionProtocols = ['ssl', 'tls', 'none'];
 		$hostPrefixes = ['', 'imap.'];
 		foreach ($hostPrefixes as $hostPrefix) {

tests/Unit/Service/Autoconfig/ImapConnectivityTesterTest.php

@@ -66,10 +66,10 @@ class ImapConnectivityTesterTest extends TestCase {
 		$users = ['user'];
 		$password = 'mypassword';
 		$name = 'User';
-		$this->connectivityTester->expects($this->exactly(6))
+		$this->connectivityTester->expects($this->exactly(4))
 			->method('canConnect')
 			->willReturn(true);
-		$this->imapConnector->expects($this->exactly(18))
+		$this->imapConnector->expects($this->exactly(12))
 			->method('connect')
 			->with($email, $password, $name, $host, $this->anything(), $this->anything(), $users[0])
 			->willThrowException(new Horde_Imap_Client_Exception());