Merge pull request #3634 from nextcloud/automated/noid/rector-changes

Apply rector changes

Author: Chartman123

lib/Service/CirclesService.php

@@ -70,9 +70,7 @@ public function isUserInCircle(string $circleId, string $userId): bool {
 			$member = $circle->getInitiator();
 			$isUserInCircle = $member !== null && $member->getLevel() >= Member::LEVEL_MEMBER;
 
-			if (!isset($this->userCircleCache[$circleId])) {
-				$this->userCircleCache[$circleId] = [];
-			}
+			$this->userCircleCache[$circleId] ??= [];
 			$this->userCircleCache[$circleId][$userId] = $isUserInCircle;
 
 			return $isUserInCircle;

lib/Service/SubmissionService.php

@@ -501,10 +501,7 @@ private function exportData(array $header, array $data, string $fileFormat, ?Fil
 			$submissionId = (string)$rowData[$submissionIdColIndex];
 			$row = $existingSubmissionIds[$submissionId] ?? null;
 
-			if ($row === null) {
-				// Append new row
-				$row = $activeWorksheet->getHighestRow() + 1;
-			}
+			$row ??= $activeWorksheet->getHighestRow() + 1;
 
 			$dataIndex = 0;
 			$columnIndex = 1;

tests/Integration/IntegrationBase.php

@@ -43,9 +43,7 @@ public function setUp(): void {
 		$userManager = \OCP\Server::get(IUserManager::class);
 		foreach ($this->users as $userId => $displayName) {
 			$user = $userManager->get($userId);
-			if ($user === null) {
-				$user = $userManager->createUser($userId, $userId);
-			}
+			$user ??= $userManager->createUser($userId, $userId);
 			$user->setDisplayName($displayName);
 		}