From ea43f75d67526a808cd295d68ad1cfefd8f0efa3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Jul 2026 17:27:08 +0200 Subject: [PATCH 1/4] test: Fix unit test after last patch Signed-off-by: Joas Schilling --- apps/federation/tests/Controller/OCSAuthAPIControllerTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php index f48c8352ae1f4..ffee0ee461458 100644 --- a/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php +++ b/apps/federation/tests/Controller/OCSAuthAPIControllerTest.php @@ -121,7 +121,6 @@ public function testRequestSharedSecret($token, $localToken, $isTrustedServer, $ try { $this->ocsAuthApi->requestSharedSecret($url, $token); - $this->assertTrue($ok); } catch (OCSForbiddenException $e) { $this->assertFalse($ok); } From 54d05371c2cf3dc9435e2fd5bd137d2efc51826f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Jul 2026 17:34:56 +0200 Subject: [PATCH 2/4] ci(integration): Fix CI setup after composer bump Signed-off-by: Joas Schilling --- build/integration/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration/run.sh b/build/integration/run.sh index e7fd312d4f029..a20398e8ee9ba 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -26,7 +26,7 @@ else fi NC_DATADIR=$($OCC config:system:get datadirectory) -composer install --no-audit +composer install # avoid port collision on jenkins - use $EXECUTOR_NUMBER if [ -z "$EXECUTOR_NUMBER" ]; then From 5bda4b0acdc47b556d09086cf4dc5326adcae215 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 21 Jul 2026 09:03:36 +0200 Subject: [PATCH 3/4] ci(integration): Update integration dependencies to be installable Signed-off-by: Joas Schilling --- build/integration/composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/integration/composer.json b/build/integration/composer.json index bd43d8094943a..35e65e2c3f366 100644 --- a/build/integration/composer.json +++ b/build/integration/composer.json @@ -1,10 +1,10 @@ { "require-dev": { - "phpunit/phpunit": "~6.5", - "behat/behat": "~3.11.0", - "guzzlehttp/guzzle": "6.5.8", + "phpunit/phpunit": "^8.5", + "behat/behat": "^3.12.0", + "guzzlehttp/guzzle": "^7.6.0", "jarnaiz/behat-junit-formatter": "^1.3", - "sabre/dav": "4.4.0", - "symfony/event-dispatcher": "~5.3" + "sabre/dav": "^4.4.0", + "symfony/event-dispatcher": "^5.3" } } From 42e07e1c257eb22010193d879b1f7e22b70623f9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 21 Jul 2026 09:32:37 +0200 Subject: [PATCH 4/4] ci(integration): Fix test with newer guzzle version Signed-off-by: Joas Schilling --- build/integration/features/bootstrap/Avatar.php | 2 +- build/integration/features/bootstrap/ChecksumsContext.php | 2 +- build/integration/features/bootstrap/FilesDropContext.php | 2 +- build/integration/features/bootstrap/WebDav.php | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/integration/features/bootstrap/Avatar.php b/build/integration/features/bootstrap/Avatar.php index 56bf3b5da0f50..6e59beeb7de92 100644 --- a/build/integration/features/bootstrap/Avatar.php +++ b/build/integration/features/bootstrap/Avatar.php @@ -109,7 +109,7 @@ public function loggedInUserGetsTemporaryAvatarWith(string $statusCode) { * @param string $source */ public function loggedInUserPostsTemporaryAvatarFromFile(string $source) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); $this->sendingAToWithRequesttoken('POST', '/index.php/avatar', [ diff --git a/build/integration/features/bootstrap/ChecksumsContext.php b/build/integration/features/bootstrap/ChecksumsContext.php index 75b9734e0aaed..ae44fcb15034c 100644 --- a/build/integration/features/bootstrap/ChecksumsContext.php +++ b/build/integration/features/bootstrap/ChecksumsContext.php @@ -79,7 +79,7 @@ private function getPasswordForUser($userName) { * @param string $checksum */ public function userUploadsFileToWithChecksum($user, $source, $destination, $checksum) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); try { $this->response = $this->client->put( $this->baseUrl . '/remote.php/webdav' . $destination, diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php index d360f51896892..a5d4dad14e3df 100644 --- a/build/integration/features/bootstrap/FilesDropContext.php +++ b/build/integration/features/bootstrap/FilesDropContext.php @@ -51,7 +51,7 @@ public function droppingFileWith($path, $content) { $options['headers'] = [ 'X-REQUESTED-WITH' => 'XMLHttpRequest' ]; - $options['body'] = \GuzzleHttp\Psr7\stream_for($content); + $options['body'] = \GuzzleHttp\Psr7\Utils::streamFor($content); try { $this->response = $client->request('PUT', $fullUrl, $options); diff --git a/build/integration/features/bootstrap/WebDav.php b/build/integration/features/bootstrap/WebDav.php index 94f890e0c41a6..7faf2cae67b38 100644 --- a/build/integration/features/bootstrap/WebDav.php +++ b/build/integration/features/bootstrap/WebDav.php @@ -454,7 +454,7 @@ public function checkElementList($user, $expectedElements) { * @param string $destination */ public function userUploadsAFileTo($user, $source, $destination) { - $file = \GuzzleHttp\Psr7\stream_for(fopen($source, 'r')); + $file = \GuzzleHttp\Psr7\Utils::streamFor(fopen($source, 'r')); try { $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file); } catch (\GuzzleHttp\Exception\ServerException $e) { @@ -486,7 +486,7 @@ public function userAddsAFileTo($user, $bytes, $destination) { * @When User :user uploads file with content :content to :destination */ public function userUploadsAFileWithContentTo($user, $content, $destination) { - $file = \GuzzleHttp\Psr7\stream_for($content); + $file = \GuzzleHttp\Psr7\Utils::streamFor($content); try { $this->response = $this->makeDavRequest($user, "PUT", $destination, [], $file); } catch (\GuzzleHttp\Exception\ServerException $e) { @@ -544,7 +544,7 @@ public function userCreatedAFolder($user, $destination) { */ public function userUploadsChunkFileOfWithToWithChecksum($user, $num, $total, $data, $destination) { $num -= 1; - $data = \GuzzleHttp\Psr7\stream_for($data); + $data = \GuzzleHttp\Psr7\Utils::streamFor($data); $file = $destination . '-chunking-42-' . $total . '-' . $num; $this->makeDavRequest($user, 'PUT', $file, ['OC-Chunked' => '1'], $data, "uploads"); } @@ -561,7 +561,7 @@ public function userCreatesANewChunkingUploadWithId($user, $id) { * @Given user :user uploads new chunk file :num with :data to id :id */ public function userUploadsNewChunkFileOfWithToId($user, $num, $data, $id) { - $data = \GuzzleHttp\Psr7\stream_for($data); + $data = \GuzzleHttp\Psr7\Utils::streamFor($data); $destination = '/uploads/' . $user . '/' . $id . '/' . $num; $this->makeDavRequest($user, 'PUT', $destination, [], $data, "uploads"); }