Fix typing errors in settings tests

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
nextcloud · Dec 30, 2022 · 1e0bd04 · 1e0bd04
1 parent 7d5e9c2
commit 1e0bd04
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/apps/settings/tests/Controller/UsersControllerTest.php b/apps/settings/tests/Controller/UsersControllerTest.php
@@ -635,8 +635,8 @@ public function dataTestSetUserSettingsSubset() {
 	 * @dataProvider dataTestSaveUserSettings
 	 *
 	 * @param array $data
-	 * @param string $oldEmailAddress
-	 * @param string $oldDisplayName
+	 * @param ?string $oldEmailAddress
+	 * @param ?string $oldDisplayName
 	 */
 	public function testSaveUserSettings($data,
 										 $oldEmailAddress,
@@ -649,16 +649,14 @@ public function testSaveUserSettings($data,
 		$user->method('getSystemEMailAddress')->willReturn($oldEmailAddress);
 		$user->method('canChangeDisplayName')->willReturn(true);
 
-		if (strtolower($data[IAccountManager::PROPERTY_EMAIL]['value']) === strtolower($oldEmailAddress) ||
-			($oldEmailAddress === null && $data[IAccountManager::PROPERTY_EMAIL]['value'] === '')) {
+		if (strtolower($data[IAccountManager::PROPERTY_EMAIL]['value']) === strtolower($oldEmailAddress ?? '')) {
 			$user->expects($this->never())->method('setSystemEMailAddress');
 		} else {
 			$user->expects($this->once())->method('setSystemEMailAddress')
 				->with($data[IAccountManager::PROPERTY_EMAIL]['value']);
 		}
 
-		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName ||
-			($oldDisplayName === null && $data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === '')) {
+		if ($data[IAccountManager::PROPERTY_DISPLAYNAME]['value'] === $oldDisplayName ?? '') {
 			$user->expects($this->never())->method('setDisplayName');
 		} else {
 			$user->expects($this->once())->method('setDisplayName')