From 874a33d13fc52ac585eccd303b94a60668d17f54 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Jul 2026 17:27:08 +0200 Subject: [PATCH 1/3] 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 9751e4a4e49351ecb897caff630b1704f872727b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 20 Jul 2026 17:34:56 +0200 Subject: [PATCH 2/3] 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 abdf530ed20edc8ebb4e7d3e1c49fe4d0d3042c9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 21 Jul 2026 09:03:36 +0200 Subject: [PATCH 3/3] 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 ea2a02bbaeb6c..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.12.0", - "guzzlehttp/guzzle": "7.5.0", + "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" } }