Fix more psalm issues

Signed-off-by: Carl Schwan <[email protected]>
nextcloud · May 16, 2022 · f7be761 · f7be761
1 parent 829490a
commit f7be761
Show file tree

Hide file tree

Showing 29 changed files with 93 additions and 296 deletions.
diff --git a/apps/dav/appinfo/v1/caldav.php b/apps/dav/appinfo/v1/caldav.php
@@ -100,7 +100,7 @@
 
 // Add plugins
 $server->addPlugin(new MaintenancePlugin(\OC::$server->getConfig(), \OC::$server->getL10N('dav')));
-$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, 'ownCloud'));
+$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 $server->addPlugin(new \Sabre\CalDAV\Plugin());
 
 $server->addPlugin(new LegacyDAVACL());

diff --git a/apps/dav/appinfo/v1/carddav.php b/apps/dav/appinfo/v1/carddav.php
@@ -38,7 +38,6 @@
 use OCP\App\IAppManager;
 use Psr\Log\LoggerInterface;
 use Sabre\CardDAV\Plugin;
-use Psr\Log\LoggerInterface;
 
 $authBackend = new Auth(
 	\OC::$server->getSession(),

diff --git a/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php b/apps/dav/lib/BackgroundJob/BuildReminderIndexBackgroundJob.php
@@ -71,12 +71,9 @@ public function __construct(IDBConnection $db,
 		$this->timeFactory = $timeFactory;
 	}
 
-	/**
-	 * @param $arguments
-	 */
-	public function run($arguments) {
-		$offset = (int) $arguments['offset'];
-		$stopAt = (int) $arguments['stopAt'];
+	public function run($argument) {
+		$offset = (int) $argument['offset'];
+		$stopAt = (int) $argument['stopAt'];
 
 		$this->logger->info('Building calendar reminder index (' . $offset .'/' . $stopAt . ')');
 

diff --git a/apps/dav/lib/BackgroundJob/EventReminderJob.php b/apps/dav/lib/BackgroundJob/EventReminderJob.php
@@ -52,12 +52,11 @@ public function __construct(ITimeFactory $time,
 	}
 
 	/**
-	 * @param $arg
 	 * @throws \OCA\DAV\CalDAV\Reminder\NotificationProvider\ProviderNotAvailableException
 	 * @throws \OCA\DAV\CalDAV\Reminder\NotificationTypeDoesNotExistException
 	 * @throws \OC\User\NoUserException
 	 */
-	public function run($arg):void {
+	public function run($argument):void {
 		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
 			return;
 		}

diff --git a/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php b/apps/dav/lib/BackgroundJob/GenerateBirthdayCalendarBackgroundJob.php
@@ -47,12 +47,9 @@ public function __construct(ITimeFactory $time,
 		$this->config = $config;
 	}
 
-	/**
-	 * @param array $arguments
-	 */
-	public function run($arguments) {
-		$userId = $arguments['userId'];
-		$purgeBeforeGenerating = $arguments['purgeBeforeGenerating'] ?? false;
+	public function run($argument) {
+		$userId = $argument['userId'];
+		$purgeBeforeGenerating = $argument['purgeBeforeGenerating'] ?? false;
 
 		// make sure admin didn't change his mind
 		$isGloballyEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');

diff --git a/apps/dav/lib/BackgroundJob/UploadCleanup.php b/apps/dav/lib/BackgroundJob/UploadCleanup.php
@@ -32,18 +32,15 @@
 use OCP\BackgroundJob\IJob;
 use OCP\BackgroundJob\IJobList;
 use OCP\BackgroundJob\TimedJob;
+use OCP\Files\Node;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 
 class UploadCleanup extends TimedJob {
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IJobList */
-	private $jobList;
+	private IRootFolder $rootFolder;
+	private IJobList $jobList;
 
 	public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList) {
 		parent::__construct($time);
@@ -71,6 +68,7 @@ protected function run($argument) {
 			return;
 		}
 
+		/** @var File[] $files */
 		$files = $uploadFolder->getDirectoryListing();
 
 		// Remove if all files have an mtime of more than a day

diff --git a/apps/dav/lib/CalDAV/BirthdayService.php b/apps/dav/lib/CalDAV/BirthdayService.php
@@ -53,34 +53,15 @@
  */
 class BirthdayService {
 	public const BIRTHDAY_CALENDAR_URI = 'contact_birthdays';
-
-	/** @var GroupPrincipalBackend */
-	private $principalBackend;
-
-	/** @var CalDavBackend  */
-	private $calDavBackEnd;
-
-	/** @var CardDavBackend  */
-	private $cardDavBackEnd;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IDBConnection */
-	private $dbConnection;
-
-	/** @var IL10N */
-	private $l10n;
+	private GroupPrincipalBackend $principalBackend;
+	private CalDavBackend $calDavBackEnd;
+	private CardDavBackend $cardDavBackEnd;
+	private IConfig $config;
+	private IDBConnection $dbConnection;
+	private IL10N $l10n;
 
 	/**
 	 * BirthdayService constructor.
-	 *
-	 * @param CalDavBackend $calDavBackEnd
-	 * @param CardDavBackend $cardDavBackEnd
-	 * @param GroupPrincipalBackend $principalBackend
-	 * @param IConfig $config
-	 * @param IDBConnection $dbConnection
-	 * @param IL10N $l10n
 	 */
 	public function __construct(CalDavBackend $calDavBackEnd,
 								CardDavBackend $cardDavBackEnd,
@@ -96,14 +77,9 @@ public function __construct(CalDavBackend $calDavBackEnd,
 		$this->l10n = $l10n;
 	}
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param string $cardData
-	 */
 	public function onCardChanged(int $addressBookId,
 								  string $cardUri,
-								  string $cardData) {
+								  string $cardData): void {
 		if (!$this->isGloballyEnabled()) {
 			return;
 		}
@@ -129,12 +105,8 @@ public function onCardChanged(int $addressBookId,
 		}
 	}
 
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
 	public function onCardDeleted(int $addressBookId,
-								  string $cardUri) {
+								  string $cardUri): void {
 		if (!$this->isGloballyEnabled()) {
 			return;
 		}
@@ -156,11 +128,9 @@ public function onCardDeleted(int $addressBookId,
 	}
 
 	/**
-	 * @param string $principal
-	 * @return array|null
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 */
-	public function ensureCalendarExists(string $principal):?array {
+	public function ensureCalendarExists(string $principal): ?array {
 		$calendar = $this->calDavBackEnd->getCalendarByUri($principal, self::BIRTHDAY_CALENDAR_URI);
 		if (!is_null($calendar)) {
 			return $calendar;

diff --git a/apps/dav/lib/CalDAV/CachedSubscription.php b/apps/dav/lib/CalDAV/CachedSubscription.php
@@ -31,6 +31,7 @@
 use Sabre\CalDAV\Backend\BackendInterface;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
+use Sabre\DAV\INode;
 use Sabre\DAV\PropPatch;
 
 /**
@@ -51,7 +52,7 @@ public function getPrincipalURI():string {
 	/**
 	 * @return array
 	 */
-	public function getACL():array {
+	public function getACL() {
 		return [
 			[
 				'privilege' => '{DAV:}read',
@@ -79,7 +80,7 @@ public function getACL():array {
 	/**
 	 * @return array
 	 */
-	public function getChildACL():array {
+	public function getChildACL() {
 		return [
 			[
 				'privilege' => '{DAV:}read',
@@ -139,9 +140,9 @@ public function getChild($name) {
 	}
 
 	/**
-	 * @return array
+	 * @return INode[]
 	 */
-	public function getChildren():array {
+	public function getChildren(): array {
 		$objs = $this->caldavBackend->getCalendarObjects($this->calendarInfo['id'], CalDavBackend::CALENDAR_TYPE_SUBSCRIPTION);
 
 		$children = [];
@@ -169,8 +170,8 @@ public function getMultipleChildren(array $paths):array {
 
 	/**
 	 * @param string $name
-	 * @param null $calendarData
-	 * @return null|string|void
+	 * @param null|resource|string $calendarData
+	 * @return null|string
 	 * @throws MethodNotAllowed
 	 */
 	public function createFile($name, $calendarData = null) {

diff --git a/apps/dav/lib/CalDAV/CachedSubscriptionObject.php b/apps/dav/lib/CalDAV/CachedSubscriptionObject.php
@@ -50,7 +50,7 @@ public function get() {
 
 	/**
 	 * @param resource|string $calendarData
-	 * @return string|void
+	 * @return string
 	 * @throws MethodNotAllowed
 	 */
 	public function put($calendarData) {

diff --git a/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php b/apps/dav/lib/CalDAV/ICSExportPlugin/ICSExportPlugin.php
@@ -23,11 +23,11 @@
 namespace OCA\DAV\CalDAV\ICSExportPlugin;
 
 use OCP\IConfig;
+use Psr\Log\LoggerInterface;
 use Sabre\HTTP\ResponseInterface;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property\ICalendar\Duration;
-use Psr\Log\LoggerInterface;
 
 /**
  * Class ICSExportPlugin

diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
@@ -37,7 +37,6 @@
 use OCP\EventDispatcher\IEventDispatcher;
 use Psr\Log\LoggerInterface;
 use Sabre\VObject\ITip\Message;
-use Psr\Log\LoggerInterface;
 
 class InvitationResponseServer {
 

diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php
@@ -134,8 +134,8 @@ public function propFind(PropFind $propFind, INode $node) {
 				$canPublish = (!$node->isSubscription() && $node->canWrite());
 
 				if ($this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes') {
-					$canShare &= ($node->getOwner() === $node->getPrincipalURI());
-					$canPublish &= ($node->getOwner() === $node->getPrincipalURI());
+					$canShare = $canShare && ($node->getOwner() === $node->getPrincipalURI());
+					$canPublish = $canPublish && ($node->getOwner() === $node->getPrincipalURI());
 				}
 
 				return new AllowedSharingModes($canShare, $canPublish);