Try to fix some psalm things. No change to the code apart from that.

Signed-off-by: Claus-Justus Heine <himself@claus-justus-heine.de>
nextcloud · May 5, 2023 · b303189 · b303189
1 parent d0ec954
commit b303189
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -2203,6 +2203,11 @@ public function getCalendarObjectByUID($principalUri, $uid) {
 		$stmt->closeCursor();
 		if ($row) {
 			if ($row['principaluri'] != $principalUri) {
+				/**
+				 * This seeems to be a false positive: we have "use Sabre\Uri" and Uri\split() IS defined.
+				 *
+				 * @psalm-suppress UndefinedFunction
+				 */
 				[, $name] = Uri\split($row['principaluri']);
 				$calendarUri = $row['calendaruri'] . '_shared_by_' . $name;
 			} else {

diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -167,6 +167,7 @@ public function calendarObjectChange(RequestInterface $request, ResponseInterfac
 			return;
 		}
 
+		/** @var Calendar $calendarNode */
 		$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
 
 		// Original code in parent class:
@@ -180,13 +181,22 @@ public function calendarObjectChange(RequestInterface $request, ResponseInterfac
 			$calendarNode->getPrincipalURI()
 		);
 
+		/** @var VCalendar $oldObj */
 		if (!$isNew) {
+			/** @var \Sabre\CalDAV\CalendarObject $node */
 			$node = $this->server->tree->getNodeForPath($request->getPath());
 			$oldObj = Reader::read($node->get());
 		} else {
 			$oldObj = null;
 		}
 
+		/**
+		 * Sabre has several issues with faulty argument type specifications
+		 * in its doc-block comments. Passing null is ok here.
+		 *
+		 * @psalm-suppress PossiblyNullArgument
+		 * @psalm-suppress ArgumentTypeCoercion
+		 */
 		$this->processICalendarChange($oldObj, $vCal, $addresses, [], $modified);
 
 		if ($oldObj) {