From d884782c9edfa67ebb12d0b218488e26ef086e85 Mon Sep 17 00:00:00 2001
From: nextcloud-command <nextcloud-command@users.noreply.github.com>
Date: Sun, 6 Oct 2024 03:12:27 +0000
Subject: [PATCH 1/2] chore(dev-deps): Bump nextcloud/ocp package

Signed-off-by: GitHub <noreply@github.com>
---
 composer.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.lock b/composer.lock
index b56cd2d5502..8ee26c381be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -231,12 +231,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nextcloud-deps/ocp.git",
-                "reference": "081cbe36c64e4090f8d7b2858efa7d81c8eb3de3"
+                "reference": "dfcf4583e63fea987ad58585bb5f11c65cc05e82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/081cbe36c64e4090f8d7b2858efa7d81c8eb3de3",
-                "reference": "081cbe36c64e4090f8d7b2858efa7d81c8eb3de3",
+                "url": "https://api.github.com/repos/nextcloud-deps/ocp/zipball/dfcf4583e63fea987ad58585bb5f11c65cc05e82",
+                "reference": "dfcf4583e63fea987ad58585bb5f11c65cc05e82",
                 "shasum": ""
             },
             "require": {
@@ -268,7 +268,7 @@
                 "issues": "https://github.com/nextcloud-deps/ocp/issues",
                 "source": "https://github.com/nextcloud-deps/ocp/tree/master"
             },
-            "time": "2024-09-06T00:40:00+00:00"
+            "time": "2024-10-05T00:42:05+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -2987,8 +2987,8 @@
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "roave/security-advisories": 20,
-        "nextcloud/ocp": 20
+        "nextcloud/ocp": 20,
+        "roave/security-advisories": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

From ce13589f65505ad8b867e6c93bebdc275d0daaed Mon Sep 17 00:00:00 2001
From: Julius Knorr <jus@bitgrid.net>
Date: Thu, 10 Oct 2024 08:31:50 +0200
Subject: [PATCH 2/2] fix: Apply types for Notifier

Signed-off-by: Julius Knorr <jus@bitgrid.net>
---
 lib/Notification/Notifier.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
index 42d03f4ecb9..25dfa36ba18 100644
--- a/lib/Notification/Notifier.php
+++ b/lib/Notification/Notifier.php
@@ -83,9 +83,9 @@ public function prepare(INotification $notification, string $languageCode): INot
 					],
 					'node' => [
 						'type' => 'file',
-						'id' => $node->getId(),
+						'id' => (string)$node->getId(),
 						'name' => $node->getName(),
-						'path' => $userFolder->getRelativePath($node->getPath()),
+						'path' => $userFolder->getRelativePath($node->getPath()) ?? '',
 						'link' => $fileLink,
 					],
 				]);