From 109a8c725c7e87c223d7c78b9ad1a26543dc1357 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 14:10:21 +0200
Subject: [PATCH 1/7] chore(behat): Migrate config to PHP in preparation for
 4.0

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/behat.php        | 39 ++++++++++++++++++++++++++++++
 tests/integration/config/behat.yml | 26 --------------------
 2 files changed, 39 insertions(+), 26 deletions(-)
 create mode 100644 tests/integration/behat.php
 delete mode 100644 tests/integration/config/behat.yml

diff --git a/tests/integration/behat.php b/tests/integration/behat.php
new file mode 100644
index 00000000000..216acd20d24
--- /dev/null
+++ b/tests/integration/behat.php
@@ -0,0 +1,39 @@
+<?php
+
+use Behat\Config\Config;
+use Behat\Config\Extension;
+use Behat\Config\Formatter\JUnitFormatter;
+use Behat\Config\Formatter\PrettyFormatter;
+use Behat\Config\Profile;
+use Behat\Config\Suite;
+use OCA\Talk\Tests\Integration\Behat\GithubActions\GithubActionsExtension;
+
+return (new Config())
+    ->withProfile((new Profile('default', [
+        'autoload' => [
+            '' => '%paths.base%/features/bootstrap',
+        ],
+    ]))
+        ->withFormatter((new JUnitFormatter())
+            ->withOutputPath('%paths.base%/output'))
+        ->withFormatter((new PrettyFormatter())
+            ->withOutputStyles([
+                'comment' => [
+                    'bright-blue',
+                ],
+            ]))
+        ->withExtension(new Extension(GithubActionsExtension::class))
+        ->withSuite((new Suite('default'))
+            ->addContext(\OCA\Talk\Tests\Integration\Contexts\FeatureContext::class)
+            ->addContext(
+                \OCA\Talk\Tests\Integration\Contexts\SharingContext::class,
+                [
+                    'baseUrl' => 'http://localhost:8080/',
+                    'admin' => [
+                        'admin',
+                        'admin',
+                    ],
+                    'regularUserPassword' => 123456,
+                ]
+            )
+            ->withPaths('%paths.base%/features')));
diff --git a/tests/integration/config/behat.yml b/tests/integration/config/behat.yml
deleted file mode 100644
index 9332b830c93..00000000000
--- a/tests/integration/config/behat.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-default:
-  extensions:
-    OCA\Talk\Tests\Integration\Behat\GithubActions\GithubActionsExtension: ~
-  formatters:
-    junit:
-      output_path: '%paths.base%/../output'
-    pretty:
-      output_styles:
-        comment: [ 'bright-blue' ]
-  autoload:
-    '': '%paths.base%/../features/bootstrap'
-  suites:
-    default:
-      paths:
-        - '%paths.base%/../features'
-      contexts:
-        - FeatureContext
-        - SharingContext:
-            baseUrl: http://localhost:8080/
-            admin:
-              - admin
-              - admin
-            regularUserPassword: 123456

From 13172b67da109e223444619cfe45c6baa1860fbc Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 14:11:06 +0200
Subject: [PATCH 2/7] chore(behat): Migrate Contexts to real classes for behat4

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../CommandLineTrait.php                      |  5 ++++-
 .../bootstrap => Contexts}/FeatureContext.php | 16 +++++++++-----
 .../bootstrap => Contexts}/RecordingTrait.php |  8 ++++---
 .../bootstrap => Contexts}/SharingContext.php | 21 +++++++++++--------
 tests/integration/composer.json               |  3 ++-
 5 files changed, 34 insertions(+), 19 deletions(-)
 rename tests/integration/{features/bootstrap => Contexts}/CommandLineTrait.php (98%)
 rename tests/integration/{features/bootstrap => Contexts}/FeatureContext.php (99%)
 rename tests/integration/{features/bootstrap => Contexts}/RecordingTrait.php (98%)
 rename tests/integration/{features/bootstrap => Contexts}/SharingContext.php (98%)

diff --git a/tests/integration/features/bootstrap/CommandLineTrait.php b/tests/integration/Contexts/CommandLineTrait.php
similarity index 98%
rename from tests/integration/features/bootstrap/CommandLineTrait.php
rename to tests/integration/Contexts/CommandLineTrait.php
index 723043f1a31..bca2dc5ff04 100644
--- a/tests/integration/features/bootstrap/CommandLineTrait.php
+++ b/tests/integration/Contexts/CommandLineTrait.php
@@ -7,11 +7,14 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+namespace OCA\Talk\Tests\Integration\Contexts;
+
 use Behat\Step\Given;
 use Behat\Step\Then;
+use GuzzleHttp;
 use PHPUnit\Framework\Assert;
 
-require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 // The following attributes are expected to be available in the class that uses
 // this trait:
diff --git a/tests/integration/features/bootstrap/FeatureContext.php b/tests/integration/Contexts/FeatureContext.php
similarity index 99%
rename from tests/integration/features/bootstrap/FeatureContext.php
rename to tests/integration/Contexts/FeatureContext.php
index 07eee85a019..06732fd63cf 100644
--- a/tests/integration/features/bootstrap/FeatureContext.php
+++ b/tests/integration/Contexts/FeatureContext.php
@@ -7,7 +7,9 @@
  *  SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-require __DIR__ . '/../../vendor/autoload.php';
+namespace OCA\Talk\Tests\Integration\Contexts;
+
+require __DIR__ . '/../vendor/autoload.php';
 
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\SnippetAcceptingContext;
@@ -19,9 +21,13 @@
 use Behat\Step\Given;
 use Behat\Step\Then;
 use Behat\Step\When;
+use DateTime;
+use Exception;
+use GuzzleHttp;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
 use GuzzleHttp\Exception\ClientException;
+use JsonException;
 use PHPUnit\Framework\Assert;
 use Psr\Http\Message\ResponseInterface;
 
@@ -275,7 +281,7 @@ public function setUp(BeforeScenarioScope $scope): void {
 	public function getOtherRequiredSiblingContexts(BeforeScenarioScope $scope): void {
 		$environment = $scope->getEnvironment();
 
-		$this->sharingContext = $environment->getContext('SharingContext');
+		$this->sharingContext = $environment->getContext(SharingContext::class);
 	}
 
 	#[AfterScenario]
@@ -4796,7 +4802,7 @@ public function userSendTheFileAsAvatarOfRoom(string $user, string $file, string
 			'multipart' => [
 				[
 					'name' => 'file',
-					'contents' => $file !== 'invalid' ? fopen(__DIR__ . '/../../../..' . $file, 'r') : '',
+					'contents' => $file !== 'invalid' ? fopen(__DIR__ . '/../../..' . $file, 'r') : '',
 				],
 			],
 		];
@@ -4943,7 +4949,7 @@ public function userStoreRecordingFileInRoom(string $user, string $file, string
 			// Upload a file
 			$options['multipart'][] = [
 				'name' => 'file',
-				'contents' => fopen(__DIR__ . '/../../../..' . $file, 'r'),
+				'contents' => fopen(__DIR__ . '/../../..' . $file, 'r'),
 			];
 		}
 		$this->sendRequest(
@@ -5020,7 +5026,7 @@ public function recordingServerUploadsRecordingFileToRequestedShare(string $file
 		if ($file === 'empty') {
 			$options['body'] = '';
 		} else {
-			$options['body'] = fopen(__DIR__ . '/../../../..' . $file, 'r');
+			$options['body'] = fopen(__DIR__ . '/../../..' . $file, 'r');
 		}
 
 		$client = new Client();
diff --git a/tests/integration/features/bootstrap/RecordingTrait.php b/tests/integration/Contexts/RecordingTrait.php
similarity index 98%
rename from tests/integration/features/bootstrap/RecordingTrait.php
rename to tests/integration/Contexts/RecordingTrait.php
index 5300f926460..04c287b723c 100644
--- a/tests/integration/features/bootstrap/RecordingTrait.php
+++ b/tests/integration/Contexts/RecordingTrait.php
@@ -7,6 +7,8 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+namespace OCA\Talk\Tests\Integration\Contexts;
+
 use Behat\Gherkin\Node\TableNode;
 use Behat\Hook\AfterScenario;
 use Behat\Step\Given;
@@ -165,8 +167,8 @@ private function startMockServer(string $path) {
 
 		$descriptorSpec = [
 			0 => $stdin,
-			1 => [ 'file', $stdoutf, 'a' ],
-			2 => [ 'file', $stderrf, 'a' ],
+			1 => ['file', $stdoutf, 'a'],
+			2 => ['file', $stderrf, 'a'],
 		];
 
 		$process = proc_open($fullCmd, $descriptorSpec, $pipes, $cwd, $env, [
@@ -365,7 +367,7 @@ public function fakeServerReceivedTheFollowingRequests(string $server, ?TableNod
 				$write = true;
 			}
 			if (isset($actualDataJson['participants']['users'])) {
-				usort($actualDataJson['participants']['users'], static fn (array $u1, array $u2) => $u1['userId'] <=> $u2['userId']);
+				usort($actualDataJson['participants']['users'], static fn(array $u1, array $u2) => $u1['userId'] <=> $u2['userId']);
 				$write = true;
 			}
 			if (isset($actualDataJson['message']['data']['chat']['comment'])) {
diff --git a/tests/integration/features/bootstrap/SharingContext.php b/tests/integration/Contexts/SharingContext.php
similarity index 98%
rename from tests/integration/features/bootstrap/SharingContext.php
rename to tests/integration/Contexts/SharingContext.php
index 38747a4ccb6..a2c40519408 100644
--- a/tests/integration/features/bootstrap/SharingContext.php
+++ b/tests/integration/Contexts/SharingContext.php
@@ -7,11 +7,14 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+namespace OCA\Talk\Tests\Integration\Contexts;
+
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\TableNode;
 use Behat\Step\Given;
 use Behat\Step\Then;
 use Behat\Step\When;
+use GuzzleHttp;
 use GuzzleHttp\Client;
 use GuzzleHttp\Cookie\CookieJar;
 use Psr\Http\Message\ResponseInterface;
@@ -477,10 +480,10 @@ public function userGetsTheShareTypeDavPropertyFor(string $user, string $path):
 		$headers = null;
 
 		$body = '<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">'
-				. '	<d:prop>'
-				. '		<oc:share-types/>'
-				. '	</d:prop>'
-				. '</d:propfind>';
+			. '	<d:prop>'
+			. '		<oc:share-types/>'
+			. '	</d:prop>'
+			. '</d:propfind>';
 
 		$this->sendingToDav('PROPFIND', $url, $headers, $body);
 
@@ -610,17 +613,17 @@ public function shareXIsReturnedWith(int $number, TableNode $body): void {
 		$expectedFields = array_merge($defaultExpectedFields, $fields);
 
 		if (!array_key_exists('uid_file_owner', $expectedFields)
-				&& array_key_exists('uid_owner', $expectedFields)) {
+			&& array_key_exists('uid_owner', $expectedFields)) {
 			$expectedFields['uid_file_owner'] = $expectedFields['uid_owner'];
 		}
 		if (!array_key_exists('displayname_file_owner', $expectedFields)
-				&& array_key_exists('displayname_owner', $expectedFields)) {
+			&& array_key_exists('displayname_owner', $expectedFields)) {
 			$expectedFields['displayname_file_owner'] = $expectedFields['displayname_owner'];
 		}
 
 		if (array_key_exists('share_type', $expectedFields)
-				&& $expectedFields['share_type'] == 10 /* IShare::TYPE_ROOM */
-				&& array_key_exists('share_with', $expectedFields)) {
+			&& $expectedFields['share_type'] == 10 /* IShare::TYPE_ROOM */
+			&& array_key_exists('share_with', $expectedFields)) {
 			if ($expectedFields['share_with'] === 'private_conversation') {
 				$expectedFields['share_with'] = 'REGEXP /^private_conversation_[0-9a-f]{6}$/';
 				$expectedFields['share_with_link'] = '';
@@ -738,7 +741,7 @@ public function theResponseContainsAShareTypesFilesPropertyForWith(string $path,
 		$response = json_decode($this->responseBody);
 
 		$fileForPath = array_filter($response->files, function ($file) use ($path) {
-			$filePath = $file->path . (substr($file->path, -1) === '/'? '': '/');
+			$filePath = $file->path . (substr($file->path, -1) === '/' ? '' : '/');
 			return ($filePath . $file->name) === $path;
 		});
 
diff --git a/tests/integration/composer.json b/tests/integration/composer.json
index 82d4c63c784..4fb606bac18 100644
--- a/tests/integration/composer.json
+++ b/tests/integration/composer.json
@@ -7,7 +7,8 @@
 	},
 	"autoload": {
 		"psr-4": {
-			"OCA\\Talk\\Tests\\Integration\\Behat\\GithubActions\\": "github-actions-formatter/"
+			"OCA\\Talk\\Tests\\Integration\\Behat\\GithubActions\\": "github-actions-formatter/",
+			"OCA\\Talk\\Tests\\Integration\\Contexts\\": "Contexts/"
 		}
 	},
 	"require-dev": {

From 58ce1d767428751bd95be9c989f6a29ba63b4275 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 14:18:41 +0200
Subject: [PATCH 3/7] chore(behat): Fix context deprecations

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/Contexts/FeatureContext.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/integration/Contexts/FeatureContext.php b/tests/integration/Contexts/FeatureContext.php
index 06732fd63cf..85b15a7cdb1 100644
--- a/tests/integration/Contexts/FeatureContext.php
+++ b/tests/integration/Contexts/FeatureContext.php
@@ -34,7 +34,7 @@
 /**
  * Defines application features from the specific context.
  */
-class FeatureContext implements Context, SnippetAcceptingContext {
+class FeatureContext implements Context {
 	public const TEST_PASSWORD = '123456';
 
 	/** @var array<string, string> */
@@ -219,8 +219,8 @@ public function getAttendeeId(string $type, string $id, string $room, ?string $u
 	 */
 	public function __construct() {
 		$this->cookieJars = [];
-		$this->localServerUrl = getenv('TEST_SERVER_URL');
-		$this->remoteServerUrl = getenv('TEST_REMOTE_URL');
+		$this->localServerUrl = getenv('TEST_SERVER_URL') ?: '';
+		$this->remoteServerUrl = getenv('TEST_REMOTE_URL') ?: '';
 
 		foreach (['LOCAL', 'REMOTE'] as $server) {
 			$this->changedConfigs[$server] = [];

From c75fee606caf126c0eece016423c57d002f113cd Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 14:19:02 +0200
Subject: [PATCH 4/7] chore(behat): Fix method signature

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../github-actions-formatter/GithubActionsFormatter.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/github-actions-formatter/GithubActionsFormatter.php b/tests/integration/github-actions-formatter/GithubActionsFormatter.php
index 5991b917d6e..242ac1d94c1 100644
--- a/tests/integration/github-actions-formatter/GithubActionsFormatter.php
+++ b/tests/integration/github-actions-formatter/GithubActionsFormatter.php
@@ -85,7 +85,7 @@ public function getOutputPrinter(): OutputPrinter {
 		return $this->printer;
 	}
 
-	public function setParameter($name, $value): void {
+	public function setParameter(string $name, $value): void {
 		$this->parameters[$name] = $value;
 
 		if ($name === 'base_path' && is_string($value) && $value !== '') {
@@ -93,7 +93,7 @@ public function setParameter($name, $value): void {
 		}
 	}
 
-	public function getParameter($name) {
+	public function getParameter(string $name): mixed {
 		return $this->parameters[$name] ?? null;
 	}
 

From 6b70632b66e3946c58d333ceeda698834d3fcc52 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 14:19:29 +0200
Subject: [PATCH 5/7] build(dev-deps): Update to behat 4 alpha

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/composer.json |  2 +-
 tests/integration/composer.lock | 35 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/tests/integration/composer.json b/tests/integration/composer.json
index 4fb606bac18..8b476b3dccc 100644
--- a/tests/integration/composer.json
+++ b/tests/integration/composer.json
@@ -12,7 +12,7 @@
 		}
 	},
 	"require-dev": {
-		"behat/behat": "^3.32.0",
+		"behat/behat": "^4.0.0-alpha1@alpha",
 		"guzzlehttp/guzzle": "^8.1.0",
 		"phpunit/phpunit": "^12.5"
 	}
diff --git a/tests/integration/composer.lock b/tests/integration/composer.lock
index 596c28d4d9e..c3e340a8ac9 100644
--- a/tests/integration/composer.lock
+++ b/tests/integration/composer.lock
@@ -4,21 +4,21 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "40d8916396b23c38254e3c26a1223484",
+    "content-hash": "08fad33e64cf0f0032bfe6dd433990b7",
     "packages": [],
     "packages-dev": [
         {
             "name": "behat/behat",
-            "version": "v3.32.0",
+            "version": "v4.0.0-alpha1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Behat/Behat.git",
-                "reference": "b9b89cf7a3b24c04d6e2d2865ed51bc5e1700de9"
+                "reference": "82fbe243d1c1b66f9709f11f039616347d7f2192"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Behat/zipball/b9b89cf7a3b24c04d6e2d2865ed51bc5e1700de9",
-                "reference": "b9b89cf7a3b24c04d6e2d2865ed51bc5e1700de9",
+                "url": "https://api.github.com/repos/Behat/Behat/zipball/82fbe243d1c1b66f9709f11f039616347d7f2192",
+                "reference": "82fbe243d1c1b66f9709f11f039616347d7f2192",
                 "shasum": ""
             },
             "require": {
@@ -26,15 +26,14 @@
                 "composer-runtime-api": "^2.2",
                 "composer/xdebug-handler": "^1.4 || ^2.0 || ^3.0",
                 "ext-mbstring": "*",
-                "nikic/php-parser": "^4.19.2 || ^5.2",
                 "php": ">=8.2 <8.6",
                 "psr/container": "^1.0 || ^2.0",
-                "symfony/config": "^5.4 || ^6.4 || ^7.0",
-                "symfony/console": "^5.4.9 || ^6.4 || ^7.0",
-                "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
-                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
-                "symfony/translation": "^5.4 || ^6.4 || ^7.0",
-                "symfony/yaml": "^5.4 || ^6.4 || ^7.0"
+                "symfony/config": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+                "symfony/console": "^5.4.9 || ^6.4 || ^7.0 || ^8.0",
+                "symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+                "symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+                "symfony/translation": "^5.4 || ^6.4 || ^7.0 || ^8.0",
+                "symfony/yaml": "^5.4 || ^6.4 || ^7.0 || ^8.0"
             },
             "require-dev": {
                 "opis/json-schema": "^2.5",
@@ -43,9 +42,9 @@
                 "phpunit/phpunit": "^9.6",
                 "rector/rector": "2.3.9",
                 "sebastian/diff": "^4.0",
-                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
+                "symfony/filesystem": "^5.4 || ^6.4 || ^7.0 || ^8.0",
                 "symfony/polyfill-php84": "^1.31",
-                "symfony/process": "^5.4 || ^6.4 || ^7.0"
+                "symfony/process": "^5.4 || ^6.4 || ^7.0 || ^8.0"
             },
             "suggest": {
                 "ext-dom": "Needed to output test results in JUnit format."
@@ -93,7 +92,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Behat/Behat/issues",
-                "source": "https://github.com/Behat/Behat/tree/v3.32.0"
+                "source": "https://github.com/Behat/Behat/tree/v4.0.0-alpha1"
             },
             "funding": [
                 {
@@ -109,7 +108,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-06-20T08:34:52+00:00"
+            "time": "2026-06-22T21:13:12+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -4245,7 +4244,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": {
+        "behat/behat": 15
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {},

From 01ff6596311533bfca702914f155ce8c51bba216 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 17:19:54 +0200
Subject: [PATCH 6/7] chore(cs): Apply autofixes

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/Contexts/FeatureContext.php |  2 +-
 tests/integration/Contexts/RecordingTrait.php |  2 +-
 tests/integration/behat.php                   | 56 +++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/tests/integration/Contexts/FeatureContext.php b/tests/integration/Contexts/FeatureContext.php
index 85b15a7cdb1..ab94173bdc7 100644
--- a/tests/integration/Contexts/FeatureContext.php
+++ b/tests/integration/Contexts/FeatureContext.php
@@ -7,12 +7,12 @@
  *  SPDX-FileCopyrightText: 2016 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+
 namespace OCA\Talk\Tests\Integration\Contexts;
 
 require __DIR__ . '/../vendor/autoload.php';
 
 use Behat\Behat\Context\Context;
-use Behat\Behat\Context\SnippetAcceptingContext;
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Behat\Gherkin\Node\TableNode;
 use Behat\Hook\AfterScenario;
diff --git a/tests/integration/Contexts/RecordingTrait.php b/tests/integration/Contexts/RecordingTrait.php
index 04c287b723c..4e996de951d 100644
--- a/tests/integration/Contexts/RecordingTrait.php
+++ b/tests/integration/Contexts/RecordingTrait.php
@@ -367,7 +367,7 @@ public function fakeServerReceivedTheFollowingRequests(string $server, ?TableNod
 				$write = true;
 			}
 			if (isset($actualDataJson['participants']['users'])) {
-				usort($actualDataJson['participants']['users'], static fn(array $u1, array $u2) => $u1['userId'] <=> $u2['userId']);
+				usort($actualDataJson['participants']['users'], static fn (array $u1, array $u2) => $u1['userId'] <=> $u2['userId']);
 				$write = true;
 			}
 			if (isset($actualDataJson['message']['data']['chat']['comment'])) {
diff --git a/tests/integration/behat.php b/tests/integration/behat.php
index 216acd20d24..4960adbf0a4 100644
--- a/tests/integration/behat.php
+++ b/tests/integration/behat.php
@@ -9,31 +9,31 @@
 use OCA\Talk\Tests\Integration\Behat\GithubActions\GithubActionsExtension;
 
 return (new Config())
-    ->withProfile((new Profile('default', [
-        'autoload' => [
-            '' => '%paths.base%/features/bootstrap',
-        ],
-    ]))
-        ->withFormatter((new JUnitFormatter())
-            ->withOutputPath('%paths.base%/output'))
-        ->withFormatter((new PrettyFormatter())
-            ->withOutputStyles([
-                'comment' => [
-                    'bright-blue',
-                ],
-            ]))
-        ->withExtension(new Extension(GithubActionsExtension::class))
-        ->withSuite((new Suite('default'))
-            ->addContext(\OCA\Talk\Tests\Integration\Contexts\FeatureContext::class)
-            ->addContext(
-                \OCA\Talk\Tests\Integration\Contexts\SharingContext::class,
-                [
-                    'baseUrl' => 'http://localhost:8080/',
-                    'admin' => [
-                        'admin',
-                        'admin',
-                    ],
-                    'regularUserPassword' => 123456,
-                ]
-            )
-            ->withPaths('%paths.base%/features')));
+	->withProfile((new Profile('default', [
+		'autoload' => [
+			'' => '%paths.base%/features/bootstrap',
+		],
+	]))
+		->withFormatter((new JUnitFormatter())
+			->withOutputPath('%paths.base%/output'))
+		->withFormatter((new PrettyFormatter())
+			->withOutputStyles([
+				'comment' => [
+					'bright-blue',
+				],
+			]))
+		->withExtension(new Extension(GithubActionsExtension::class))
+		->withSuite((new Suite('default'))
+			->addContext(\OCA\Talk\Tests\Integration\Contexts\FeatureContext::class)
+			->addContext(
+				\OCA\Talk\Tests\Integration\Contexts\SharingContext::class,
+				[
+					'baseUrl' => 'http://localhost:8080/',
+					'admin' => [
+						'admin',
+						'admin',
+					],
+					'regularUserPassword' => 123456,
+				]
+			)
+			->withPaths('%paths.base%/features')));

From 0e3765995843deff10eea25d1ced30b795fc1a65 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 3 Sep 2026 17:21:46 +0200
Subject: [PATCH 7/7] ci(reuse): Readd license from config file

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 tests/integration/behat.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/integration/behat.php b/tests/integration/behat.php
index 4960adbf0a4..486312403e3 100644
--- a/tests/integration/behat.php
+++ b/tests/integration/behat.php
@@ -1,5 +1,11 @@
 <?php
 
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 use Behat\Config\Config;
 use Behat\Config\Extension;
 use Behat\Config\Formatter\JUnitFormatter;
@@ -7,6 +13,8 @@
 use Behat\Config\Profile;
 use Behat\Config\Suite;
 use OCA\Talk\Tests\Integration\Behat\GithubActions\GithubActionsExtension;
+use OCA\Talk\Tests\Integration\Contexts\FeatureContext;
+use OCA\Talk\Tests\Integration\Contexts\SharingContext;
 
 return (new Config())
 	->withProfile((new Profile('default', [
@@ -24,9 +32,9 @@
 			]))
 		->withExtension(new Extension(GithubActionsExtension::class))
 		->withSuite((new Suite('default'))
-			->addContext(\OCA\Talk\Tests\Integration\Contexts\FeatureContext::class)
+			->addContext(FeatureContext::class)
 			->addContext(
-				\OCA\Talk\Tests\Integration\Contexts\SharingContext::class,
+				SharingContext::class,
 				[
 					'baseUrl' => 'http://localhost:8080/',
 					'admin' => [