Merge pull request #3750 from nextcloud/techdept/psalm-nullable-return

Fix nullable return types reported by Psalm

lib/IMAP/Threading/Container.php

@@ -89,7 +89,7 @@ class Container {
 	}
 
 	public function getParent(): Container {
-		if ($this->isRoot()) {
+		if ($this->isRoot() || $this->parent === null) {
 			throw new RuntimeException('Container root has no parent');
 		}
 		return $this->parent;

lib/Service/AutoConfig/IspDbConfigurationDetector.php

@@ -203,9 +203,10 @@ class IspDbConfigurationDetector {
 	 * @param MailAccount $account
 	 * @param string $email
 	 * @param string $password
-	 * @return boolean
+	 *
+	 * @return bool|null
 	 */
-	private function testSmtpConfiguration(array $smtp, MailAccount $account, string $email, string $password) {
+	private function testSmtpConfiguration(array $smtp, MailAccount $account, string $email, string $password): ?bool {
 		try {
 			if ($smtp['username'] === '%EMAILADDRESS%') {
 				$user = $email;