Merge pull request #44622 from nextcloud/backport/44534/stable29

[stable29] build(deps): bump nextcloud/coding-standard from 1.1.1 to 1.2.1 in /vendor-bin/cs-fixer

apps/admin_audit/lib/AuditLogger.php

@@ -49,39 +49,39 @@ public function __construct(ILogFactory $logFactory, IConfig $config) {
 		$this->parentLogger = $logFactory->getCustomPsrLogger($logFile, $auditType, $auditTag);
 	}
 
-	public function emergency($message, array $context = array()): void {
+	public function emergency($message, array $context = []): void {
 		$this->parentLogger->emergency($message, $context);
 	}
 
-	public function alert($message, array $context = array()): void {
+	public function alert($message, array $context = []): void {
 		$this->parentLogger->alert($message, $context);
 	}
 
-	public function critical($message, array $context = array()): void {
+	public function critical($message, array $context = []): void {
 		$this->parentLogger->critical($message, $context);
 	}
 
-	public function error($message, array $context = array()): void {
+	public function error($message, array $context = []): void {
 		$this->parentLogger->error($message, $context);
 	}
 
-	public function warning($message, array $context = array()): void {
+	public function warning($message, array $context = []): void {
 		$this->parentLogger->warning($message, $context);
 	}
 
-	public function notice($message, array $context = array()): void {
+	public function notice($message, array $context = []): void {
 		$this->parentLogger->notice($message, $context);
 	}
 
-	public function info($message, array $context = array()): void {
+	public function info($message, array $context = []): void {
 		$this->parentLogger->info($message, $context);
 	}
 
-	public function debug($message, array $context = array()): void {
+	public function debug($message, array $context = []): void {
 		$this->parentLogger->debug($message, $context);
 	}
 
-	public function log($level, $message, array $context = array()): void {
+	public function log($level, $message, array $context = []): void {
 		$this->parentLogger->log($level, $message, $context);
 	}
 }

apps/cloud_federation_api/lib/Capabilities.php

@@ -66,7 +66,7 @@ public function getCapabilities() {
 		$this->provider->setApiVersion(self::API_VERSION);
 
 		$pos = strrpos($url, '/');
-		if (false === $pos) {
+		if ($pos === false) {
 			throw new OCMArgumentException('generated route should contains a slash character');
 		}
 

apps/comments/lib/Activity/Provider.php

@@ -54,7 +54,7 @@ public function __construct(
 	 * @throws \InvalidArgumentException
 	 * @since 11.0.0
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
 		if ($event->getApp() !== 'comments') {
 			throw new \InvalidArgumentException();
 		}

apps/contactsinteraction/tests/Db/RecentContactMapperTest.php

@@ -107,7 +107,7 @@ public function testCleanUp(): void {
 		$this->assertCount(0, $this->recentContactMapper->findAll('admin'));
 	}
 
-	protected function createRecentContact(string $email = null, string $federatedCloudId = null): RecentContact {
+	protected function createRecentContact(?string $email = null, ?string $federatedCloudId = null): RecentContact {
 		$props = [
 			'URI' => UUIDUtil::getUUID(),
 			'FN' => 'Foo Bar',

apps/dav/appinfo/v2/direct.php

@@ -24,7 +24,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
-use \OCA\DAV\Direct\ServerFactory;
+use OCA\DAV\Direct\ServerFactory;
 
 // no php execution timeout for webdav
 if (!str_contains(@ini_get('disable_functions'), 'set_time_limit')) {

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

@@ -83,7 +83,7 @@ public function __construct(IFactory $languageFactory, IURLGenerator $url, IMana
 	 * @throws \InvalidArgumentException
 	 * @since 11.0.0
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
 			throw new \InvalidArgumentException();
 		}

apps/dav/lib/CalDAV/Activity/Provider/Event.php

@@ -121,7 +121,7 @@ protected function generateObjectParameter(array $eventData) {
 	 * @throws \InvalidArgumentException
 	 * @since 11.0.0
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
 			throw new \InvalidArgumentException();
 		}

apps/dav/lib/CalDAV/Activity/Provider/Todo.php

@@ -36,7 +36,7 @@ class Todo extends Event {
 	 * @throws \InvalidArgumentException
 	 * @since 11.0.0
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_todo') {
 			throw new \InvalidArgumentException();
 		}

apps/dav/lib/CalDAV/BirthdayService.php

@@ -470,7 +470,7 @@ private function getReminderOffsetForUser(string $userPrincipal):?string {
 	 */
 	private function formatTitle(string $field,
 		string $name,
-		int $year = null,
+		?int $year = null,
 		bool $supports4Byte = true):string {
 		if ($supports4Byte) {
 			switch ($field) {

apps/dav/lib/CalDAV/CalDavBackend.php

@@ -2169,7 +2169,7 @@ public function searchPrincipalUri(string $principalUri,
 				->andWhere($searchOr)
 				->andWhere($calendarObjectIdQuery->expr()->isNull('deleted_at'));
 
-			if ('' !== $pattern) {
+			if ($pattern !== '') {
 				if (!$escapePattern) {
 					$calendarObjectIdQuery->andWhere($calendarObjectIdQuery->expr()->ilike('cob.value', $calendarObjectIdQuery->createNamedParameter($pattern)));
 				} else {

apps/dav/lib/CalDAV/Reminder/ReminderService.php

@@ -392,8 +392,8 @@ public function onCalendarObjectDelete(array $objectData):void {
 	private function getRemindersForVAlarm(VAlarm $valarm,
 		array $objectData,
 		DateTimeZone $calendarTimeZone,
-		string $eventHash = null,
-		string $alarmHash = null,
+		?string $eventHash = null,
+		?string $alarmHash = null,
 		bool $isRecurring = false,
 		bool $isRecurrenceException = false):array {
 		if ($eventHash === null) {

apps/dav/lib/CalDAV/Schedule/Plugin.php

@@ -57,7 +57,7 @@
 use Sabre\VObject\Parameter;
 use Sabre\VObject\Property;
 use Sabre\VObject\Reader;
-use function \Sabre\Uri\split;
+use function Sabre\Uri\split;
 
 class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 
@@ -457,7 +457,7 @@ private function getCurrentAttendee(ITip\Message $iTipMessage):?Property {
 	 * @param Property|null $attendee
 	 * @return bool
 	 */
-	private function getAttendeeRSVP(Property $attendee = null):bool {
+	private function getAttendeeRSVP(?Property $attendee = null):bool {
 		if ($attendee !== null) {
 			$rsvp = $attendee->offsetGet('RSVP');
 			if (($rsvp instanceof Parameter) && (strcasecmp($rsvp->getValue(), 'TRUE') === 0)) {

apps/dav/lib/CalDAV/Status/StatusService.php

@@ -154,7 +154,7 @@ private function getCalendarEvents(User $user): array {
 			}
 
 			$sct = $calendarObject->getSchedulingTransparency();
-			if ($sct !== null && ScheduleCalendarTransp::TRANSPARENT == strtolower($sct->getValue())) {
+			if ($sct !== null && strtolower($sct->getValue()) == ScheduleCalendarTransp::TRANSPARENT) {
 				// If a calendar is marked as 'transparent', it means we must
 				// ignore it for free-busy purposes.
 				continue;

apps/dav/lib/CardDAV/Activity/Provider/Addressbook.php

@@ -71,7 +71,7 @@ public function __construct(IFactory $languageFactory,
 	 * @return IEvent
 	 * @throws \InvalidArgumentException
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
 			throw new \InvalidArgumentException();
 		}

apps/dav/lib/CardDAV/Activity/Provider/Card.php

@@ -73,7 +73,7 @@ public function __construct(IFactory $languageFactory,
 	 * @return IEvent
 	 * @throws \InvalidArgumentException
 	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null): IEvent {
+	public function parse($language, IEvent $event, ?IEvent $previousEvent = null): IEvent {
 		if ($event->getApp() !== 'dav' || $event->getType() !== 'contacts') {
 			throw new \InvalidArgumentException();
 		}

apps/dav/lib/CardDAV/CardDavBackend.php

@@ -1151,7 +1151,7 @@ private function searchByAddressBookIds(array $addressBookIds,
 			->andWhere($query2->expr()->in('cp.name', $query2->createNamedParameter($searchProperties, IQueryBuilder::PARAM_STR_ARRAY)));
 
 		// No need for like when the pattern is empty
-		if ('' !== $pattern) {
+		if ($pattern !== '') {
 			if (!$useWildcards) {
 				$query2->andWhere($query2->expr()->eq('cp.value', $query2->createNamedParameter($pattern)));
 			} elseif (!$escapePattern) {

apps/dav/lib/CardDAV/SyncService.php

@@ -271,7 +271,10 @@ public function getLocalSystemAddressBook() {
 		return $this->localSystemAddressBook;
 	}
 
-	public function syncInstance(\Closure $progressCallback = null) {
+	/**
+	 * @return void
+	 */
+	public function syncInstance(?\Closure $progressCallback = null) {
 		$systemAddressBook = $this->getLocalSystemAddressBook();
 		$this->userManager->callForAllUsers(function ($user) use ($systemAddressBook, $progressCallback) {
 			$this->updateUser($user);

apps/dav/lib/Command/MoveCalendar.php

@@ -93,7 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 		$calendar = $this->calDav->getCalendarByUri(self::URI_USERS . $userOrigin, $name);
 
-		if (null === $calendar) {
+		if ($calendar === null) {
 			throw new \InvalidArgumentException("User <$userOrigin> has no calendar named <$name>. You can run occ dav:list-calendars to list calendars URIs for this user.");
 		}
 
@@ -133,7 +133,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 	 * Check if the calendar exists for user
 	 */
 	protected function calendarExists(string $userDestination, string $name): bool {
-		return null !== $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name);
+		return $this->calDav->getCalendarByUri(self::URI_USERS . $userDestination, $name) !== null;
 	}
 
 	/**
@@ -172,7 +172,7 @@ private function checkShares(array $calendar, string $userOrigin, string $userDe
 			 * Check that user destination is member of the groups which whom the calendar was shared
 			 * If we ask to force the migration, the share with the group is dropped
 			 */
-			if ($this->shareManager->shareWithGroupMembersOnly() === true && 'groups' === $prefix && !$this->groupManager->isInGroup($userDestination, $userOrGroup)) {
+			if ($this->shareManager->shareWithGroupMembersOnly() === true && $prefix === 'groups' && !$this->groupManager->isInGroup($userDestination, $userOrGroup)) {
 				if ($force) {
 					$this->calDav->updateShares(new Calendar($this->calDav, $calendar, $this->l10n, $this->config, $this->logger), [], ['principal:principals/groups/' . $userOrGroup]);
 				} else {

apps/dav/lib/Comments/EntityCollection.php

@@ -130,7 +130,7 @@ public function getChildren() {
 	 * @param \DateTime|null $datetime
 	 * @return CommentNode[]
 	 */
-	public function findChildren($limit = 0, $offset = 0, \DateTime $datetime = null) {
+	public function findChildren($limit = 0, $offset = 0, ?\DateTime $datetime = null) {
 		$comments = $this->commentsManager->getForObject($this->name, $this->id, $limit, $offset, $datetime);
 		$result = [];
 		foreach ($comments as $comment) {

apps/dav/lib/Connector/Sabre/CachingTree.php

@@ -46,7 +46,7 @@ public function markDirty($path) {
 		$path = trim($path, '/');
 		foreach ($this->cache as $nodePath => $node) {
 			$nodePath = (string) $nodePath;
-			if ('' === $path || $nodePath == $path || str_starts_with($nodePath, $path . '/')) {
+			if ($path === '' || $nodePath == $path || str_starts_with($nodePath, $path . '/')) {
 				unset($this->cache[$nodePath]);
 			}
 		}

apps/dav/lib/Connector/Sabre/Directory.php

@@ -72,7 +72,7 @@ class Directory extends \OCA\DAV\Connector\Sabre\Node implements \Sabre\DAV\ICol
 	/**
 	 * Sets up the node, expects a full path name
 	 */
-	public function __construct(View $view, FileInfo $info, ?CachingTree $tree = null, IShareManager $shareManager = null) {
+	public function __construct(View $view, FileInfo $info, ?CachingTree $tree = null, ?IShareManager $shareManager = null) {
 		parent::__construct($view, $info, $shareManager);
 		$this->tree = $tree;
 	}
@@ -202,7 +202,7 @@ public function createDirectory($name) {
 	 * @throws \Sabre\DAV\Exception\NotFound
 	 * @throws \Sabre\DAV\Exception\ServiceUnavailable
 	 */
-	public function getChild($name, $info = null, IRequest $request = null, IL10N $l10n = null) {
+	public function getChild($name, $info = null, ?IRequest $request = null, ?IL10N $l10n = null) {
 		if (!$this->info->isReadable()) {
 			// avoid detecting files through this way
 			throw new NotFound();

apps/dav/lib/Connector/Sabre/Exception/FileLocked.php

@@ -29,7 +29,11 @@
 use Exception;
 
 class FileLocked extends \Sabre\DAV\Exception {
-	public function __construct($message = "", $code = 0, Exception $previous = null) {
+	/**
+	 * @param string $message
+	 * @param int $code
+	 */
+	public function __construct($message = "", $code = 0, ?Exception $previous = null) {
 		if ($previous instanceof \OCP\Files\LockNotAcquiredException) {
 			$message = sprintf('Target file %s is locked by another process.', $previous->path);
 		}

apps/dav/lib/Connector/Sabre/Exception/Forbidden.php

@@ -35,7 +35,7 @@ class Forbidden extends \Sabre\DAV\Exception\Forbidden {
 	 * @param bool $retry
 	 * @param \Exception $previous
 	 */
-	public function __construct($message, $retry = false, \Exception $previous = null) {
+	public function __construct($message, $retry = false, ?\Exception $previous = null) {
 		parent::__construct($message, 0, $previous);
 		$this->retry = $retry;
 	}

apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php

@@ -38,7 +38,7 @@ class InvalidPath extends Exception {
 	 * @param bool $retry
 	 * @param \Exception|null $previous
 	 */
-	public function __construct($message, $retry = false, \Exception $previous = null) {
+	public function __construct($message, $retry = false, ?\Exception $previous = null) {
 		parent::__construct($message, 0, $previous);
 		$this->retry = $retry;
 	}

apps/dav/lib/Connector/Sabre/File.php

@@ -89,7 +89,7 @@ class File extends Node implements IFile {
 	 * @param ?IRequest $request
 	 * @param ?IL10N $l10n
 	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null, IRequest $request = null, IL10N $l10n = null) {
+	public function __construct(View $view, FileInfo $info, ?IManager $shareManager = null, ?IRequest $request = null, ?IL10N $l10n = null) {
 		parent::__construct($view, $info, $shareManager);
 
 		if ($l10n) {

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -563,7 +563,7 @@ public function handleUpdateProperties($path, PropPatch $propPatch) {
 	 */
 	private function handleUpdatePropertiesMetadata(PropPatch $propPatch, Node $node): void {
 		$userId = $this->userSession->getUser()?->getUID();
-		if (null === $userId) {
+		if ($userId === null) {
 			return;
 		}
 
@@ -664,10 +664,11 @@ private function getMetadataFileAccessRight(Node $node, string $userId): int {
 
 	/**
 	 * @param string $filePath
-	 * @param \Sabre\DAV\INode $node
+	 * @param ?\Sabre\DAV\INode $node
+	 * @return void
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 */
-	public function sendFileIdHeader($filePath, \Sabre\DAV\INode $node = null) {
+	public function sendFileIdHeader($filePath, ?\Sabre\DAV\INode $node = null) {
 		// chunked upload handling
 		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 			[$path, $name] = \Sabre\Uri\split($filePath);

apps/dav/lib/Connector/Sabre/Node.php

@@ -79,7 +79,7 @@ abstract class Node implements \Sabre\DAV\INode {
 	/**
 	 * Sets up the node, expects a full path name
 	 */
-	public function __construct(View $view, FileInfo $info, IManager $shareManager = null) {
+	public function __construct(View $view, FileInfo $info, ?IManager $shareManager = null) {
 		$this->fileView = $view;
 		$this->path = $this->fileView->getRelativePath($info->getPath());
 		$this->info = $info;

apps/dav/lib/DAV/Sharing/Xml/Invite.php

@@ -85,7 +85,7 @@ class Invite implements XmlSerializable {
 	 *
 	 * @param array $users
 	 */
-	public function __construct(array $users, array $organizer = null) {
+	public function __construct(array $users, ?array $organizer = null) {
 		$this->users = $users;
 		$this->organizer = $organizer;
 	}

apps/dav/lib/HookManager.php

@@ -163,7 +163,10 @@ public function changeUser($params) {
 		}
 	}
 
-	public function firstLogin(IUser $user = null) {
+	/**
+	 * @return void
+	 */
+	public function firstLogin(?IUser $user = null) {
 		if (!is_null($user)) {
 			$principal = 'principals/users/' . $user->getUID();
 			if ($this->calDav->getCalendarsForUserCount($principal) === 0) {

apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php

@@ -367,7 +367,7 @@ private function getTemplateMock():IEMailTemplate {
 	 * @param array|null $replyTo
 	 * @return IMessage
 	 */
-	private function getMessageMock(string $toMail, IEMailTemplate $templateMock, array $replyTo = null):IMessage {
+	private function getMessageMock(string $toMail, IEMailTemplate $templateMock, ?array $replyTo = null):IMessage {
 		$message = $this->createMock(IMessage::class);
 		$i = 0;