From e31739fb7481e4f3965bdf5fc5787117486b8af4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 1 Jul 2026 17:56:38 +0200 Subject: [PATCH 1/3] build(deps): Composer audit updates Signed-off-by: Joas Schilling --- 3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty b/3rdparty index 81b39674e3d87..86f02ecf46c66 160000 --- a/3rdparty +++ b/3rdparty @@ -1 +1 @@ -Subproject commit 81b39674e3d87859cd5cbdea2065e6bbb46d3e38 +Subproject commit 86f02ecf46c66f4ea0d645150eb6e3df454f5e77 From ab64ab5bf0829b61dce97c71183783b9a20130c7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 2 Jul 2026 11:56:18 +0200 Subject: [PATCH 2/3] fix(files_drop): Fix wrong deduplication of slashes in URL It broke the protocol and GuzzleHTTP is now complaining about it Signed-off-by: Joas Schilling --- build/integration/features/bootstrap/FilesDropContext.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php index 4ccb58f08646f..8dd9376f4a67c 100644 --- a/build/integration/features/bootstrap/FilesDropContext.php +++ b/build/integration/features/bootstrap/FilesDropContext.php @@ -25,8 +25,8 @@ public function droppingFileWith($path, $content, $nickname = null) { $token = $this->lastShareData->data[0]->token; } - $base = substr($this->baseUrl, 0, -4); - $fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$path"); + $base = rtrim(substr($this->baseUrl, 0, -4), '/'); + $fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$path"); $options['headers'] = [ 'X-REQUESTED-WITH' => 'XMLHttpRequest', @@ -66,8 +66,8 @@ public function creatingFolderInDrop($folder, $nickname = null) { $token = $this->lastShareData->data[0]->token; } - $base = substr($this->baseUrl, 0, -4); - $fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$folder"); + $base = rtrim(substr($this->baseUrl, 0, -4), '/'); + $fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$folder"); $options['headers'] = [ 'X-REQUESTED-WITH' => 'XMLHttpRequest', From ed96926232548f971fc00298a7a4ff30ef96e6e2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 2 Jul 2026 13:57:17 +0200 Subject: [PATCH 3/3] test: Don't fail due to deprecations from guzzlehttp 7.12 Signed-off-by: Joas Schilling --- tests/lib/Files/ObjectStore/ObjectStoreTestCase.php | 6 ++++++ tests/lib/Files/ObjectStore/S3Test.php | 3 +++ 2 files changed, 9 insertions(+) diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php index 86f1927deae9e..4a8c0f45e4755 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php @@ -85,6 +85,9 @@ public function testDelete(): void { try { set_error_handler( function (int $errno, string $errstr) use (&$warnings): void { + if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) { + return; + } $warnings[] = $errstr; }, ); @@ -105,6 +108,9 @@ public function testReadNonExisting(): void { try { set_error_handler( function (int $errno, string $errstr) use (&$warnings): void { + if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) { + return; + } $warnings[] = $errstr; }, ); diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php index 219958ecc9d8f..94719484f24a8 100644 --- a/tests/lib/Files/ObjectStore/S3Test.php +++ b/tests/lib/Files/ObjectStore/S3Test.php @@ -117,6 +117,9 @@ public function testEmptyUpload(): void { $warnings = []; set_error_handler( function (int $errno, string $errstr) use (&$warnings): void { + if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) { + return; + } $warnings[] = $errstr; }, );