Fix issues reported by psalm 4.27

mstilkerich · Sep 2, 2022 · 696e3ba · 696e3ba
1 parent 12295a3
commit 696e3ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/CardDavClient.php b/src/CardDavClient.php
@@ -582,8 +582,8 @@ public static function compareUrlPaths(string $url1, string $url2): bool
     {
         $comp1 = \Sabre\Uri\parse($url1);
         $comp2 = \Sabre\Uri\parse($url2);
-        $p1 = trim(rtrim($comp1["path"], "/"), "/");
-        $p2 = trim(rtrim($comp2["path"], "/"), "/");
+        $p1 = trim(rtrim($comp1["path"] ?? '', "/"), "/");
+        $p2 = trim(rtrim($comp2["path"] ?? '', "/"), "/");
         return $p1 === $p2;
     }
 

diff --git a/src/Services/Sync.php b/src/Services/Sync.php
@@ -287,7 +287,7 @@ private function determineChangesViaETags(
                         || ($etag !== $localCacheState[$uri])
                     ) {
                         $changes[] = [
-                            'uri' => $uri,
+                            'uri' => $uri ?? '',
                             'etag' => $etag
                         ];
                     }