Merge pull request #3751 from nextcloud/techdept/psalm-false-falseable-return

Fix invalid falsable returns detected by Psalm

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/Service/Avatar/AddressbookSource.php b/lib/Service/Avatar/AddressbookSource.php
index 12b76e8f7..f37034c44 100644
--- a/lib/Service/Avatar/AddressbookSource.php
+++ b/lib/Service/Avatar/AddressbookSource.php
@@ -56,7 +56,7 @@ class AddressbookSource implements IAvatarSource {
 	public function fetch(string $email, AvatarFactory $factory) {
 		$url = $this->contactsIntegration->getPhoto($email);
 
-		if (is_null($url)) {
+		if ($url === false || $url === null) {
 			return null;
 		}
 
diff --git a/lib/Service/ContactsIntegration.php b/lib/Service/ContactsIntegration.php
index cded586ed..2f5a1f139 100644
--- a/lib/Service/ContactsIntegration.php
+++ b/lib/Service/ContactsIntegration.php
@@ -92,7 +92,8 @@ class ContactsIntegration {
 
 	/**
 	 * @param string $email
-	 * @return null|string
+	 *
+	 * @return false|null|string
 	 */
 	public function getPhoto(string $email) {
 		$result = $this->contactsManager->search($email, ['EMAIL']);