nextcloud / server

build/integration/features/bootstrap/Provisioning.php

Indentation +1015 added lines, -1015 removed lines

@@ -14,1019 +14,1019 @@
 require __DIR__ . '/../../vendor/autoload.php';
 
 trait Provisioning {
-	use BasicStructure;
-
-	/** @var array */
-	private $appsToEnableAfterScenario = [];
-
-	/** @var array */
-	private $appsToDisableAfterScenario = [];
-
-	/** @var array */
-	private $createdUsers = [];
-
-	/** @var array */
-	private $createdRemoteUsers = [];
-
-	/** @var array */
-	private $createdRemoteGroups = [];
-
-	/** @var array */
-	private $createdGroups = [];
-
-	/** @AfterScenario */
-	public function restoreAppsEnabledStateAfterScenario() {
-		$this->asAn('admin');
-
-		foreach ($this->appsToEnableAfterScenario as $app) {
-			$this->sendingTo('POST', '/cloud/apps/' . $app);
-		}
-
-		foreach ($this->appsToDisableAfterScenario as $app) {
-			$this->sendingTo('DELETE', '/cloud/apps/' . $app);
-		}
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" exists$/
-	 * @param string $user
-	 */
-	public function assureUserExists($user) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheUser($user);
-			$this->currentUser = $previous_user;
-		}
-		$this->userExists($user);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" with displayname "((?:[^"]|\\")*)" exists$/
-	 * @param string $user
-	 */
-	public function assureUserWithDisplaynameExists($user, $displayname) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheUser($user, $displayname);
-			$this->currentUser = $previous_user;
-		}
-		$this->userExists($user);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" does not exist$/
-	 * @param string $user
-	 */
-	public function userDoesNotExist($user) {
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-			return;
-		}
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheUser($user);
-		$this->currentUser = $previous_user;
-		try {
-			$this->userExists($user);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-		}
-	}
-
-	public function creatingTheUser($user, $displayname = '') {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-
-		$options['form_params'] = [
-			'userid' => $user,
-			'password' => '123456'
-		];
-		if ($displayname !== '') {
-			$options['form_params']['displayName'] = $displayname;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-		if ($this->currentServer === 'LOCAL') {
-			$this->createdUsers[$user] = $user;
-		} elseif ($this->currentServer === 'REMOTE') {
-			$this->createdRemoteUsers[$user] = $user;
-		}
-
-		//Quick hack to login once with the current user
-		$options2 = [
-			'auth' => [$user, '123456'],
-		];
-		$options2['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$url = $fullUrl . '/' . $user;
-		$client->get($url, $options2);
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function userHasSetting($user, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
-			if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
-				$expectedValues = explode(';', $setting[1]);
-				foreach ($expectedValues as $expected) {
-					Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: ' . $setting[0]);
-				}
-			} elseif (isset($value[0])) {
-				Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: ' . $setting[0]);
-			} else {
-				Assert::assertEquals('', $setting[1], 'Data wrong for field: ' . $setting[0]);
-			}
-		}
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has the following profile data$/
-	 */
-	public function userHasProfileData(string $user, ?TableNode $settings): void {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/profile/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-			'Accept' => 'application/json',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$body = $response->getBody()->getContents();
-		$data = json_decode($body, true);
-		$data = $data['ocs']['data'];
-		foreach ($settings->getRows() as $setting) {
-			Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: ' . $setting[0]);
-			if ($setting[1] === 'NULL') {
-				Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
-			} else {
-				Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
-			}
-		}
-	}
-
-	/**
-	 * @Then /^group "([^"]*)" has$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function groupHasSetting($group, $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/details?search=$group";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$groupDetails = simplexml_load_string($response->getBody())->data[0]->groups[0]->element;
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode($groupDetails->{$setting[0]}), 1);
-			if (isset($value[0])) {
-				Assert::assertEqualsCanonicalizing($setting[1], $value[0]);
-			} else {
-				Assert::assertEquals('', $setting[1]);
-			}
-		}
-	}
-
-
-	/**
-	 * @Then /^user "([^"]*)" has editable fields$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $fields
-	 */
-	public function userHasEditableFields($user, $fields) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
-		if ($user !== 'self') {
-			$fullUrl .= '/' . $user;
-		}
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		$fieldsArray = json_decode(json_encode(simplexml_load_string($response->getBody())->data->element), 1);
-
-		$expectedFields = $fields->getRows();
-		$expectedFields = $this->simplifyArray($expectedFields);
-		Assert::assertEquals($expectedFields, $fieldsArray);
-	}
-
-	/**
-	 * @Then /^search users by phone for region "([^"]*)" with$/
-	 *
-	 * @param string $user
-	 * @param TableNode|null $settings
-	 */
-	public function searchUserByPhone($region, TableNode $searchTable) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/search/by-phone";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$search = [];
-		foreach ($searchTable->getRows() as $row) {
-			if (!isset($search[$row[0]])) {
-				$search[$row[0]] = [];
-			}
-			$search[$row[0]][] = $row[1];
-		}
-
-		$options['form_params'] = [
-			'location' => $region,
-			'search' => $search,
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-	}
-
-	public function createUser($user) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->creatingTheUser($user);
-		$this->userExists($user);
-		$this->currentUser = $previous_user;
-	}
-
-	public function deleteUser($user) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheUser($user);
-		$this->userDoesNotExist($user);
-		$this->currentUser = $previous_user;
-	}
-
-	public function createGroup($group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->creatingTheGroup($group);
-		$this->groupExists($group);
-		$this->currentUser = $previous_user;
-	}
-
-	public function deleteGroup($group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheGroup($group);
-		$this->groupDoesNotExist($group);
-		$this->currentUser = $previous_user;
-	}
-
-	public function userExists($user) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true'
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-	}
-
-	/**
-	 * @Then /^check that user "([^"]*)" belongs to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function checkThatUserBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertContains($group, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	public function userBelongsToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-
-		if (array_key_exists($group, $respondedArray)) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" belongs to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function assureUserBelongsToGroup($user, $group) {
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		if (!$this->userBelongsToGroup($user, $group)) {
-			$this->addingUserToGroup($user, $group);
-		}
-
-		$this->checkThatUserBelongsToGroup($user, $group);
-		$this->currentUser = $previous_user;
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" does not belong to group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userDoesNotBelongToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$groups = [$group];
-		$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-		Assert::assertNotEqualsCanonicalizing($groups, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @When /^creating the group "([^"]*)"$/
-	 * @param string $group
-	 */
-	public function creatingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-
-		$options['form_params'] = [
-			'groupid' => $group,
-		];
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-		if ($this->currentServer === 'LOCAL') {
-			$this->createdGroups[$group] = $group;
-		} elseif ($this->currentServer === 'REMOTE') {
-			$this->createdRemoteGroups[$group] = $group;
-		}
-	}
-
-	/**
-	 * @When /^assure user "([^"]*)" is disabled$/
-	 */
-	public function assureUserIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		// TODO: fix hack
-		$options['form_params'] = [
-			'foo' => 'bar'
-		];
-
-		$this->response = $client->put($fullUrl, $options);
-	}
-
-	/**
-	 * @When /^Deleting the user "([^"]*)"$/
-	 * @param string $user
-	 */
-	public function deletingTheUser($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->delete($fullUrl, $options);
-	}
-
-	/**
-	 * @When /^Deleting the group "([^"]*)"$/
-	 * @param string $group
-	 */
-	public function deletingTheGroup($group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->delete($fullUrl, $options);
-
-		if ($this->currentServer === 'LOCAL') {
-			unset($this->createdGroups[$group]);
-		} elseif ($this->currentServer === 'REMOTE') {
-			unset($this->createdRemoteGroups[$group]);
-		}
-	}
-
-	/**
-	 * @Given /^Add user "([^"]*)" to the group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function addUserToGroup($user, $group) {
-		$this->userExists($user);
-		$this->groupExists($group);
-		$this->addingUserToGroup($user, $group);
-	}
-
-	/**
-	 * @When /^User "([^"]*)" is added to the group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function addingUserToGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/groups";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$options['form_params'] = [
-			'groupid' => $group,
-		];
-
-		$this->response = $client->post($fullUrl, $options);
-	}
-
-
-	public function groupExists($group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-	}
-
-	/**
-	 * @Given /^group "([^"]*)" exists$/
-	 * @param string $group
-	 */
-	public function assureGroupExists($group) {
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$previous_user = $this->currentUser;
-			$this->currentUser = 'admin';
-			$this->creatingTheGroup($group);
-			$this->currentUser = $previous_user;
-		}
-		$this->groupExists($group);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^group "([^"]*)" does not exist$/
-	 * @param string $group
-	 */
-	public function groupDoesNotExist($group) {
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-			return;
-		}
-		$previous_user = $this->currentUser;
-		$this->currentUser = 'admin';
-		$this->deletingTheGroup($group);
-		$this->currentUser = $previous_user;
-		try {
-			$this->groupExists($group);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
-		}
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" is subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertContains($user, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^Assure user "([^"]*)" is subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function assureUserIsSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['form_params'] = [
-			'groupid' => $group
-		];
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$this->response = $client->post($fullUrl, $options);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^user "([^"]*)" is not a subadmin of group "([^"]*)"$/
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function userIsNotSubadminOfGroup($user, $group) {
-		$fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-		sort($respondedArray);
-		Assert::assertNotContains($user, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Then /^users returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function theUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRows();
-			$usersSimplified = $this->simplifyArray($users);
-			$respondedArray = $this->getArrayOfUsersResponded($this->response);
-			Assert::assertEqualsCanonicalizing($usersSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^phone matches returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function thePhoneUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRowsHash();
-			$listCheckedElements = simplexml_load_string($this->response->getBody())->data;
-			$respondedArray = json_decode(json_encode($listCheckedElements), true);
-			Assert::assertEquals($users, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^detailed users returned are$/
-	 * @param TableNode|null $usersList
-	 */
-	public function theDetailedUsersShouldBe($usersList) {
-		if ($usersList instanceof TableNode) {
-			$users = $usersList->getRows();
-			$usersSimplified = $this->simplifyArray($users);
-			$respondedArray = $this->getArrayOfDetailedUsersResponded($this->response);
-			$respondedArray = array_keys($respondedArray);
-			Assert::assertEquals($usersSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^groups returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theGroupsShouldBe($groupsList) {
-		if ($groupsList instanceof TableNode) {
-			$groups = $groupsList->getRows();
-			$groupsSimplified = $this->simplifyArray($groups);
-			$respondedArray = $this->getArrayOfGroupsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^subadmin groups returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theSubadminGroupsShouldBe($groupsList) {
-		if ($groupsList instanceof TableNode) {
-			$groups = $groupsList->getRows();
-			$groupsSimplified = $this->simplifyArray($groups);
-			$respondedArray = $this->getArrayOfSubadminsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^apps returned are$/
-	 * @param TableNode|null $appList
-	 */
-	public function theAppsShouldBe($appList) {
-		if ($appList instanceof TableNode) {
-			$apps = $appList->getRows();
-			$appsSimplified = $this->simplifyArray($apps);
-			$respondedArray = $this->getArrayOfAppsResponded($this->response);
-			Assert::assertEqualsCanonicalizing($appsSimplified, $respondedArray);
-		}
-	}
-
-	/**
-	 * @Then /^subadmin users returned are$/
-	 * @param TableNode|null $groupsList
-	 */
-	public function theSubadminUsersShouldBe($groupsList) {
-		$this->theSubadminGroupsShouldBe($groupsList);
-	}
-
-	/**
-	 * Parses the xml answer to get the array of users returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfUsersResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of detailed users returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfDetailedUsersResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of groups returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfGroupsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->groups[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of apps returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfAppsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->apps[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * Parses the xml answer to get the array of subadmins returned.
-	 *
-	 * @param ResponseInterface $resp
-	 * @return array
-	 */
-	public function getArrayOfSubadminsResponded($resp) {
-		$listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->element;
-		$extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
-		return $extractedElementsArray;
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" enabled state will be restored once the scenario finishes$/
-	 * @param string $app
-	 */
-	public function appEnabledStateWillBeRestoredOnceTheScenarioFinishes($app) {
-		if (in_array($app, $this->getAppsWithFilter('enabled'))) {
-			$this->appsToEnableAfterScenario[] = $app;
-		} elseif (in_array($app, $this->getAppsWithFilter('disabled'))) {
-			$this->appsToDisableAfterScenario[] = $app;
-		}
-
-		// Apps that were not installed before the scenario will not be
-		// disabled nor uninstalled after the scenario.
-	}
-
-	private function getAppsWithFilter($filter) {
-		$fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=' . $filter;
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		return $this->getArrayOfAppsResponded($this->response);
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" is disabled$/
-	 * @param string $app
-	 */
-	public function appIsDisabled($app) {
-		$respondedArray = $this->getAppsWithFilter('disabled');
-		Assert::assertContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" is enabled$/
-	 * @param string $app
-	 */
-	public function appIsEnabled($app) {
-		$respondedArray = $this->getAppsWithFilter('enabled');
-		Assert::assertContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Given /^app "([^"]*)" is not enabled$/
-	 *
-	 * Checks that the app is disabled or not installed.
-	 *
-	 * @param string $app
-	 */
-	public function appIsNotEnabled($app) {
-		$respondedArray = $this->getAppsWithFilter('enabled');
-		Assert::assertNotContains($app, $respondedArray);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" is disabled$/
-	 * @param string $user
-	 */
-	public function userIsDisabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		// false in xml is empty
-		Assert::assertTrue(empty(simplexml_load_string($this->response->getBody())->data[0]->enabled));
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" is enabled$/
-	 * @param string $user
-	 */
-	public function userIsEnabled($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$this->response = $client->get($fullUrl, $options);
-		// boolean to string is integer
-		Assert::assertEquals('1', simplexml_load_string($this->response->getBody())->data[0]->enabled);
-	}
-
-	/**
-	 * @Given user :user has a quota of :quota
-	 * @param string $user
-	 * @param string $quota
-	 */
-	public function userHasAQuotaOf($user, $quota) {
-		$body = new TableNode([
-			0 => ['key', 'quota'],
-			1 => ['value', $quota],
-		]);
-
-		// method used from BasicStructure trait
-		$this->sendingToWith('PUT', '/cloud/users/' . $user, $body);
-	}
-
-	/**
-	 * @Given user :user has unlimited quota
-	 * @param string $user
-	 */
-	public function userHasUnlimitedQuota($user) {
-		$this->userHasAQuotaOf($user, 'none');
-	}
-
-	/**
-	 * Returns home path of the given user
-	 *
-	 * @param string $user
-	 */
-	public function getUserHome($user) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		$options['auth'] = $this->adminUser;
-		$this->response = $client->get($fullUrl, $options);
-		return simplexml_load_string($this->response->getBody())->data[0]->home;
-	}
-
-	/**
-	 * @BeforeScenario
-	 * @AfterScenario
-	 */
-	public function cleanupUsers() {
-		$previousServer = $this->currentServer;
-		$this->usingServer('LOCAL');
-		foreach ($this->createdUsers as $user) {
-			$this->deleteUser($user);
-		}
-		$this->usingServer('REMOTE');
-		foreach ($this->createdRemoteUsers as $remoteUser) {
-			$this->deleteUser($remoteUser);
-		}
-		$this->usingServer($previousServer);
-	}
-
-	/**
-	 * @BeforeScenario
-	 * @AfterScenario
-	 */
-	public function cleanupGroups() {
-		$previousServer = $this->currentServer;
-		$this->usingServer('LOCAL');
-		foreach ($this->createdGroups as $group) {
-			$this->deleteGroup($group);
-		}
-		$this->usingServer('REMOTE');
-		foreach ($this->createdRemoteGroups as $remoteGroup) {
-			$this->deleteGroup($remoteGroup);
-		}
-		$this->usingServer($previousServer);
-	}
-
-	/**
-	 * @Then /^user "([^"]*)" has not$/
-	 */
-	public function userHasNotSetting($user, TableNode $settings) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-
-		$response = $client->get($fullUrl, $options);
-		foreach ($settings->getRows() as $setting) {
-			$value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
-			if (isset($value[0])) {
-				if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
-					$expectedValues = explode(';', $setting[1]);
-					foreach ($expectedValues as $expected) {
-						Assert::assertFalse(in_array($expected, $value, true));
-					}
-				} else {
-					Assert::assertNotEqualsCanonicalizing($setting[1], $value[0]);
-				}
-			} else {
-				Assert::assertNotEquals('', $setting[1]);
-			}
-		}
-	}
+    use BasicStructure;
+
+    /** @var array */
+    private $appsToEnableAfterScenario = [];
+
+    /** @var array */
+    private $appsToDisableAfterScenario = [];
+
+    /** @var array */
+    private $createdUsers = [];
+
+    /** @var array */
+    private $createdRemoteUsers = [];
+
+    /** @var array */
+    private $createdRemoteGroups = [];
+
+    /** @var array */
+    private $createdGroups = [];
+
+    /** @AfterScenario */
+    public function restoreAppsEnabledStateAfterScenario() {
+        $this->asAn('admin');
+
+        foreach ($this->appsToEnableAfterScenario as $app) {
+            $this->sendingTo('POST', '/cloud/apps/' . $app);
+        }
+
+        foreach ($this->appsToDisableAfterScenario as $app) {
+            $this->sendingTo('DELETE', '/cloud/apps/' . $app);
+        }
+    }
+
+    /**
+     * @Given /^user "([^"]*)" exists$/
+     * @param string $user
+     */
+    public function assureUserExists($user) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheUser($user);
+            $this->currentUser = $previous_user;
+        }
+        $this->userExists($user);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" with displayname "((?:[^"]|\\")*)" exists$/
+     * @param string $user
+     */
+    public function assureUserWithDisplaynameExists($user, $displayname) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheUser($user, $displayname);
+            $this->currentUser = $previous_user;
+        }
+        $this->userExists($user);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" does not exist$/
+     * @param string $user
+     */
+    public function userDoesNotExist($user) {
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+            return;
+        }
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheUser($user);
+        $this->currentUser = $previous_user;
+        try {
+            $this->userExists($user);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+        }
+    }
+
+    public function creatingTheUser($user, $displayname = '') {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+
+        $options['form_params'] = [
+            'userid' => $user,
+            'password' => '123456'
+        ];
+        if ($displayname !== '') {
+            $options['form_params']['displayName'] = $displayname;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+        if ($this->currentServer === 'LOCAL') {
+            $this->createdUsers[$user] = $user;
+        } elseif ($this->currentServer === 'REMOTE') {
+            $this->createdRemoteUsers[$user] = $user;
+        }
+
+        //Quick hack to login once with the current user
+        $options2 = [
+            'auth' => [$user, '123456'],
+        ];
+        $options2['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $url = $fullUrl . '/' . $user;
+        $client->get($url, $options2);
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function userHasSetting($user, $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
+            if (isset($value['element']) && in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+                $expectedValues = explode(';', $setting[1]);
+                foreach ($expectedValues as $expected) {
+                    Assert::assertTrue(in_array($expected, $value['element'], true), 'Data wrong for field: ' . $setting[0]);
+                }
+            } elseif (isset($value[0])) {
+                Assert::assertEqualsCanonicalizing($setting[1], $value[0], 'Data wrong for field: ' . $setting[0]);
+            } else {
+                Assert::assertEquals('', $setting[1], 'Data wrong for field: ' . $setting[0]);
+            }
+        }
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has the following profile data$/
+     */
+    public function userHasProfileData(string $user, ?TableNode $settings): void {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/profile/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+            'Accept' => 'application/json',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $body = $response->getBody()->getContents();
+        $data = json_decode($body, true);
+        $data = $data['ocs']['data'];
+        foreach ($settings->getRows() as $setting) {
+            Assert::assertArrayHasKey($setting[0], $data, 'Profile data field missing: ' . $setting[0]);
+            if ($setting[1] === 'NULL') {
+                Assert::assertNull($data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+            } else {
+                Assert::assertEquals($setting[1], $data[$setting[0]], 'Profile data wrong for field: ' . $setting[0]);
+            }
+        }
+    }
+
+    /**
+     * @Then /^group "([^"]*)" has$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function groupHasSetting($group, $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/details?search=$group";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $groupDetails = simplexml_load_string($response->getBody())->data[0]->groups[0]->element;
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode($groupDetails->{$setting[0]}), 1);
+            if (isset($value[0])) {
+                Assert::assertEqualsCanonicalizing($setting[1], $value[0]);
+            } else {
+                Assert::assertEquals('', $setting[1]);
+            }
+        }
+    }
+
+
+    /**
+     * @Then /^user "([^"]*)" has editable fields$/
+     *
+     * @param string $user
+     * @param TableNode|null $fields
+     */
+    public function userHasEditableFields($user, $fields) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/user/fields";
+        if ($user !== 'self') {
+            $fullUrl .= '/' . $user;
+        }
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        $fieldsArray = json_decode(json_encode(simplexml_load_string($response->getBody())->data->element), 1);
+
+        $expectedFields = $fields->getRows();
+        $expectedFields = $this->simplifyArray($expectedFields);
+        Assert::assertEquals($expectedFields, $fieldsArray);
+    }
+
+    /**
+     * @Then /^search users by phone for region "([^"]*)" with$/
+     *
+     * @param string $user
+     * @param TableNode|null $settings
+     */
+    public function searchUserByPhone($region, TableNode $searchTable) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/search/by-phone";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $search = [];
+        foreach ($searchTable->getRows() as $row) {
+            if (!isset($search[$row[0]])) {
+                $search[$row[0]] = [];
+            }
+            $search[$row[0]][] = $row[1];
+        }
+
+        $options['form_params'] = [
+            'location' => $region,
+            'search' => $search,
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+    }
+
+    public function createUser($user) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->creatingTheUser($user);
+        $this->userExists($user);
+        $this->currentUser = $previous_user;
+    }
+
+    public function deleteUser($user) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheUser($user);
+        $this->userDoesNotExist($user);
+        $this->currentUser = $previous_user;
+    }
+
+    public function createGroup($group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->creatingTheGroup($group);
+        $this->groupExists($group);
+        $this->currentUser = $previous_user;
+    }
+
+    public function deleteGroup($group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheGroup($group);
+        $this->groupDoesNotExist($group);
+        $this->currentUser = $previous_user;
+    }
+
+    public function userExists($user) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true'
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+    }
+
+    /**
+     * @Then /^check that user "([^"]*)" belongs to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function checkThatUserBelongsToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertContains($group, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    public function userBelongsToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+
+        if (array_key_exists($group, $respondedArray)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * @Given /^user "([^"]*)" belongs to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function assureUserBelongsToGroup($user, $group) {
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+
+        if (!$this->userBelongsToGroup($user, $group)) {
+            $this->addingUserToGroup($user, $group);
+        }
+
+        $this->checkThatUserBelongsToGroup($user, $group);
+        $this->currentUser = $previous_user;
+    }
+
+    /**
+     * @Given /^user "([^"]*)" does not belong to group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userDoesNotBelongToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $groups = [$group];
+        $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+        Assert::assertNotEqualsCanonicalizing($groups, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @When /^creating the group "([^"]*)"$/
+     * @param string $group
+     */
+    public function creatingTheGroup($group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+
+        $options['form_params'] = [
+            'groupid' => $group,
+        ];
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+        if ($this->currentServer === 'LOCAL') {
+            $this->createdGroups[$group] = $group;
+        } elseif ($this->currentServer === 'REMOTE') {
+            $this->createdRemoteGroups[$group] = $group;
+        }
+    }
+
+    /**
+     * @When /^assure user "([^"]*)" is disabled$/
+     */
+    public function assureUserIsDisabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/disable";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        // TODO: fix hack
+        $options['form_params'] = [
+            'foo' => 'bar'
+        ];
+
+        $this->response = $client->put($fullUrl, $options);
+    }
+
+    /**
+     * @When /^Deleting the user "([^"]*)"$/
+     * @param string $user
+     */
+    public function deletingTheUser($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->delete($fullUrl, $options);
+    }
+
+    /**
+     * @When /^Deleting the group "([^"]*)"$/
+     * @param string $group
+     */
+    public function deletingTheGroup($group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/groups/$group";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->delete($fullUrl, $options);
+
+        if ($this->currentServer === 'LOCAL') {
+            unset($this->createdGroups[$group]);
+        } elseif ($this->currentServer === 'REMOTE') {
+            unset($this->createdRemoteGroups[$group]);
+        }
+    }
+
+    /**
+     * @Given /^Add user "([^"]*)" to the group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function addUserToGroup($user, $group) {
+        $this->userExists($user);
+        $this->groupExists($group);
+        $this->addingUserToGroup($user, $group);
+    }
+
+    /**
+     * @When /^User "([^"]*)" is added to the group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function addingUserToGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/groups";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $options['form_params'] = [
+            'groupid' => $group,
+        ];
+
+        $this->response = $client->post($fullUrl, $options);
+    }
+
+
+    public function groupExists($group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+    }
+
+    /**
+     * @Given /^group "([^"]*)" exists$/
+     * @param string $group
+     */
+    public function assureGroupExists($group) {
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $previous_user = $this->currentUser;
+            $this->currentUser = 'admin';
+            $this->creatingTheGroup($group);
+            $this->currentUser = $previous_user;
+        }
+        $this->groupExists($group);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^group "([^"]*)" does not exist$/
+     * @param string $group
+     */
+    public function groupDoesNotExist($group) {
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+            return;
+        }
+        $previous_user = $this->currentUser;
+        $this->currentUser = 'admin';
+        $this->deletingTheGroup($group);
+        $this->currentUser = $previous_user;
+        try {
+            $this->groupExists($group);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            Assert::assertEquals(404, $ex->getResponse()->getStatusCode());
+        }
+    }
+
+    /**
+     * @Given /^user "([^"]*)" is subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userIsSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertContains($user, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^Assure user "([^"]*)" is subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function assureUserIsSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['form_params'] = [
+            'groupid' => $group
+        ];
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $this->response = $client->post($fullUrl, $options);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^user "([^"]*)" is not a subadmin of group "([^"]*)"$/
+     * @param string $user
+     * @param string $group
+     */
+    public function userIsNotSubadminOfGroup($user, $group) {
+        $fullUrl = $this->baseUrl . "v2.php/cloud/groups/$group/subadmins";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+        sort($respondedArray);
+        Assert::assertNotContains($user, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Then /^users returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function theUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRows();
+            $usersSimplified = $this->simplifyArray($users);
+            $respondedArray = $this->getArrayOfUsersResponded($this->response);
+            Assert::assertEqualsCanonicalizing($usersSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^phone matches returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function thePhoneUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRowsHash();
+            $listCheckedElements = simplexml_load_string($this->response->getBody())->data;
+            $respondedArray = json_decode(json_encode($listCheckedElements), true);
+            Assert::assertEquals($users, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^detailed users returned are$/
+     * @param TableNode|null $usersList
+     */
+    public function theDetailedUsersShouldBe($usersList) {
+        if ($usersList instanceof TableNode) {
+            $users = $usersList->getRows();
+            $usersSimplified = $this->simplifyArray($users);
+            $respondedArray = $this->getArrayOfDetailedUsersResponded($this->response);
+            $respondedArray = array_keys($respondedArray);
+            Assert::assertEquals($usersSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^groups returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theGroupsShouldBe($groupsList) {
+        if ($groupsList instanceof TableNode) {
+            $groups = $groupsList->getRows();
+            $groupsSimplified = $this->simplifyArray($groups);
+            $respondedArray = $this->getArrayOfGroupsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^subadmin groups returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theSubadminGroupsShouldBe($groupsList) {
+        if ($groupsList instanceof TableNode) {
+            $groups = $groupsList->getRows();
+            $groupsSimplified = $this->simplifyArray($groups);
+            $respondedArray = $this->getArrayOfSubadminsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($groupsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^apps returned are$/
+     * @param TableNode|null $appList
+     */
+    public function theAppsShouldBe($appList) {
+        if ($appList instanceof TableNode) {
+            $apps = $appList->getRows();
+            $appsSimplified = $this->simplifyArray($apps);
+            $respondedArray = $this->getArrayOfAppsResponded($this->response);
+            Assert::assertEqualsCanonicalizing($appsSimplified, $respondedArray);
+        }
+    }
+
+    /**
+     * @Then /^subadmin users returned are$/
+     * @param TableNode|null $groupsList
+     */
+    public function theSubadminUsersShouldBe($groupsList) {
+        $this->theSubadminGroupsShouldBe($groupsList);
+    }
+
+    /**
+     * Parses the xml answer to get the array of users returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfUsersResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of detailed users returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfDetailedUsersResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->users;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of groups returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfGroupsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->groups[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of apps returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfAppsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->apps[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * Parses the xml answer to get the array of subadmins returned.
+     *
+     * @param ResponseInterface $resp
+     * @return array
+     */
+    public function getArrayOfSubadminsResponded($resp) {
+        $listCheckedElements = simplexml_load_string($resp->getBody())->data[0]->element;
+        $extractedElementsArray = json_decode(json_encode($listCheckedElements), 1);
+        return $extractedElementsArray;
+    }
+
+    /**
+     * @Given /^app "([^"]*)" enabled state will be restored once the scenario finishes$/
+     * @param string $app
+     */
+    public function appEnabledStateWillBeRestoredOnceTheScenarioFinishes($app) {
+        if (in_array($app, $this->getAppsWithFilter('enabled'))) {
+            $this->appsToEnableAfterScenario[] = $app;
+        } elseif (in_array($app, $this->getAppsWithFilter('disabled'))) {
+            $this->appsToDisableAfterScenario[] = $app;
+        }
+
+        // Apps that were not installed before the scenario will not be
+        // disabled nor uninstalled after the scenario.
+    }
+
+    private function getAppsWithFilter($filter) {
+        $fullUrl = $this->baseUrl . 'v2.php/cloud/apps?filter=' . $filter;
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        return $this->getArrayOfAppsResponded($this->response);
+    }
+
+    /**
+     * @Given /^app "([^"]*)" is disabled$/
+     * @param string $app
+     */
+    public function appIsDisabled($app) {
+        $respondedArray = $this->getAppsWithFilter('disabled');
+        Assert::assertContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^app "([^"]*)" is enabled$/
+     * @param string $app
+     */
+    public function appIsEnabled($app) {
+        $respondedArray = $this->getAppsWithFilter('enabled');
+        Assert::assertContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Given /^app "([^"]*)" is not enabled$/
+     *
+     * Checks that the app is disabled or not installed.
+     *
+     * @param string $app
+     */
+    public function appIsNotEnabled($app) {
+        $respondedArray = $this->getAppsWithFilter('enabled');
+        Assert::assertNotContains($app, $respondedArray);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @Then /^user "([^"]*)" is disabled$/
+     * @param string $user
+     */
+    public function userIsDisabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        // false in xml is empty
+        Assert::assertTrue(empty(simplexml_load_string($this->response->getBody())->data[0]->enabled));
+    }
+
+    /**
+     * @Then /^user "([^"]*)" is enabled$/
+     * @param string $user
+     */
+    public function userIsEnabled($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $this->response = $client->get($fullUrl, $options);
+        // boolean to string is integer
+        Assert::assertEquals('1', simplexml_load_string($this->response->getBody())->data[0]->enabled);
+    }
+
+    /**
+     * @Given user :user has a quota of :quota
+     * @param string $user
+     * @param string $quota
+     */
+    public function userHasAQuotaOf($user, $quota) {
+        $body = new TableNode([
+            0 => ['key', 'quota'],
+            1 => ['value', $quota],
+        ]);
+
+        // method used from BasicStructure trait
+        $this->sendingToWith('PUT', '/cloud/users/' . $user, $body);
+    }
+
+    /**
+     * @Given user :user has unlimited quota
+     * @param string $user
+     */
+    public function userHasUnlimitedQuota($user) {
+        $this->userHasAQuotaOf($user, 'none');
+    }
+
+    /**
+     * Returns home path of the given user
+     *
+     * @param string $user
+     */
+    public function getUserHome($user) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        $options['auth'] = $this->adminUser;
+        $this->response = $client->get($fullUrl, $options);
+        return simplexml_load_string($this->response->getBody())->data[0]->home;
+    }
+
+    /**
+     * @BeforeScenario
+     * @AfterScenario
+     */
+    public function cleanupUsers() {
+        $previousServer = $this->currentServer;
+        $this->usingServer('LOCAL');
+        foreach ($this->createdUsers as $user) {
+            $this->deleteUser($user);
+        }
+        $this->usingServer('REMOTE');
+        foreach ($this->createdRemoteUsers as $remoteUser) {
+            $this->deleteUser($remoteUser);
+        }
+        $this->usingServer($previousServer);
+    }
+
+    /**
+     * @BeforeScenario
+     * @AfterScenario
+     */
+    public function cleanupGroups() {
+        $previousServer = $this->currentServer;
+        $this->usingServer('LOCAL');
+        foreach ($this->createdGroups as $group) {
+            $this->deleteGroup($group);
+        }
+        $this->usingServer('REMOTE');
+        foreach ($this->createdRemoteGroups as $remoteGroup) {
+            $this->deleteGroup($remoteGroup);
+        }
+        $this->usingServer($previousServer);
+    }
+
+    /**
+     * @Then /^user "([^"]*)" has not$/
+     */
+    public function userHasNotSetting($user, TableNode $settings) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/cloud/users/$user";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+
+        $response = $client->get($fullUrl, $options);
+        foreach ($settings->getRows() as $setting) {
+            $value = json_decode(json_encode(simplexml_load_string($response->getBody())->data->{$setting[0]}), 1);
+            if (isset($value[0])) {
+                if (in_array($setting[0], ['additional_mail', 'additional_mailScope'], true)) {
+                    $expectedValues = explode(';', $setting[1]);
+                    foreach ($expectedValues as $expected) {
+                        Assert::assertFalse(in_array($expected, $value, true));
+                    }
+                } else {
+                    Assert::assertNotEqualsCanonicalizing($setting[1], $value[0]);
+                }
+            } else {
+                Assert::assertNotEquals('', $setting[1]);
+            }
+        }
+    }
 }

build/integration/features/bootstrap/Sharing.php

Indentation +766 added lines, -766 removed lines

@@ -15,770 +15,770 @@
 
 
 trait Sharing {
-	use Provisioning;
-
-	/** @var int */
-	private $sharingApiVersion = 1;
-
-	/** @var SimpleXMLElement */
-	private $lastShareData = null;
-
-	/** @var SimpleXMLElement[] */
-	private $storedShareData = [];
-
-	/** @var int */
-	private $savedShareId = null;
-
-	/** @var ResponseInterface */
-	private $response;
-
-	/**
-	 * @Given /^as "([^"]*)" creating a share with$/
-	 * @param string $user
-	 * @param TableNode|null $body
-	 */
-	public function asCreatingAShareWith($user, $body) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares";
-		$client = new Client();
-		$options = [
-			'headers' => [
-				'OCS-APIREQUEST' => 'true',
-			],
-		];
-		if ($user === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$user, $this->regularUser];
-		}
-
-		if ($body instanceof TableNode) {
-			$fd = $body->getRowsHash();
-			if (array_key_exists('expireDate', $fd)) {
-				$dateModification = $fd['expireDate'];
-				if ($dateModification === 'null') {
-					$fd['expireDate'] = null;
-				} elseif (!empty($dateModification)) {
-					$fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
-				} else {
-					$fd['expireDate'] = '';
-				}
-			}
-			$options['form_params'] = $fd;
-		}
-
-		try {
-			$this->response = $client->request('POST', $fullUrl, $options);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-		}
-
-		$this->lastShareData = simplexml_load_string($this->response->getBody());
-	}
-
-	/**
-	 * @When /^save the last share data as "([^"]*)"$/
-	 */
-	public function saveLastShareData($name) {
-		$this->storedShareData[$name] = $this->lastShareData;
-	}
-
-	/**
-	 * @When /^restore the last share data from "([^"]*)"$/
-	 */
-	public function restoreLastShareData($name) {
-		$this->lastShareData = $this->storedShareData[$name];
-	}
-
-	/**
-	 * @When /^creating a share with$/
-	 * @param TableNode|null $body
-	 */
-	public function creatingShare($body) {
-		$this->asCreatingAShareWith($this->currentUser, $body);
-	}
-
-	/**
-	 * @When /^accepting last share$/
-	 */
-	public function acceptingLastShare() {
-		$share_id = $this->lastShareData->data[0]->id;
-		$url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/pending/$share_id";
-		$this->sendingToWith('POST', $url, null);
-
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @When /^user "([^"]*)" accepts last share$/
-	 *
-	 * @param string $user
-	 */
-	public function userAcceptsLastShare(string $user) {
-		// "As userXXX" and "user userXXX accepts last share" steps are not
-		// expected to be used in the same scenario, but restore the user just
-		// in case.
-		$previousUser = $this->currentUser;
-
-		$this->currentUser = $user;
-
-		$share_id = $this->lastShareData->data[0]->id;
-		$url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/pending/$share_id";
-		$this->sendingToWith('POST', $url, null);
-
-		$this->currentUser = $previousUser;
-
-		$this->theHTTPStatusCodeShouldBe('200');
-	}
-
-	/**
-	 * @Then /^last link share can be downloaded$/
-	 */
-	public function lastLinkShareCanBeDownloaded() {
-		if (count($this->lastShareData->data->element) > 0) {
-			$url = $this->lastShareData->data[0]->url;
-		} else {
-			$url = $this->lastShareData->data->url;
-		}
-		$fullUrl = $url . '/download';
-		$this->checkDownload($fullUrl, null, 'text/plain');
-	}
-
-	/**
-	 * @Then /^last share can be downloaded$/
-	 */
-	public function lastShareCanBeDownloaded() {
-		if (count($this->lastShareData->data->element) > 0) {
-			$token = $this->lastShareData->data[0]->token;
-		} else {
-			$token = $this->lastShareData->data->token;
-		}
-
-		$fullUrl = substr($this->baseUrl, 0, -4) . 'index.php/s/' . $token . '/download';
-		$this->checkDownload($fullUrl, null, 'text/plain');
-	}
-
-	/**
-	 * @Then /^last share with password "([^"]*)" can be downloaded$/
-	 */
-	public function lastShareWithPasswordCanBeDownloaded($password) {
-		if (count($this->lastShareData->data->element) > 0) {
-			$token = $this->lastShareData->data[0]->token;
-		} else {
-			$token = $this->lastShareData->data->token;
-		}
-
-		$fullUrl = substr($this->baseUrl, 0, -4) . "public.php/dav/files/$token/";
-		$this->checkDownload($fullUrl, ['', $password], 'text/plain');
-	}
-
-	private function checkDownload($url, $auth = null, $mimeType = null) {
-		if ($auth !== null) {
-			$options['auth'] = $auth;
-		}
-		$options['stream'] = true;
-
-		$client = new Client();
-		$this->response = $client->get($url, $options);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-
-		$buf = '';
-		$body = $this->response->getBody();
-		while (!$body->eof()) {
-			// read everything
-			$buf .= $body->read(8192);
-		}
-		$body->close();
-
-		if ($mimeType !== null) {
-			$finfo = new finfo;
-			Assert::assertEquals($mimeType, $finfo->buffer($buf, FILEINFO_MIME_TYPE));
-		}
-	}
-
-	/**
-	 * @When /^Adding expiration date to last share$/
-	 */
-	public function addingExpirationDate() {
-		$share_id = (string)$this->lastShareData->data[0]->id;
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
-		$client = new Client();
-		$options = [];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-		$date = date('Y-m-d', strtotime('+3 days'));
-		$options['form_params'] = ['expireDate' => $date];
-		$this->response = $this->response = $client->request('PUT', $fullUrl, $options);
-		Assert::assertEquals(200, $this->response->getStatusCode());
-	}
-
-	/**
-	 * @When /^Updating last share with$/
-	 * @param TableNode|null $body
-	 */
-	public function updatingLastShare($body) {
-		$share_id = (string)$this->lastShareData->data[0]->id;
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
-		$client = new Client();
-		$options = [
-			'headers' => [
-				'OCS-APIREQUEST' => 'true',
-			],
-		];
-		if ($this->currentUser === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$this->currentUser, $this->regularUser];
-		}
-
-		if ($body instanceof TableNode) {
-			$fd = $body->getRowsHash();
-			if (array_key_exists('expireDate', $fd)) {
-				$dateModification = $fd['expireDate'];
-				$fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
-			}
-			$options['form_params'] = $fd;
-		}
-
-		try {
-			$this->response = $client->request('PUT', $fullUrl, $options);
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-		}
-	}
-
-	public function createShare($user,
-		$path = null,
-		$shareType = null,
-		$shareWith = null,
-		$publicUpload = null,
-		$password = null,
-		$permissions = null,
-		$viewOnly = false) {
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares";
-		$client = new Client();
-		$options = [
-			'headers' => [
-				'OCS-APIREQUEST' => 'true',
-			],
-		];
-
-		if ($user === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$user, $this->regularUser];
-		}
-		$body = [];
-		if (!is_null($path)) {
-			$body['path'] = $path;
-		}
-		if (!is_null($shareType)) {
-			$body['shareType'] = $shareType;
-		}
-		if (!is_null($shareWith)) {
-			$body['shareWith'] = $shareWith;
-		}
-		if (!is_null($publicUpload)) {
-			$body['publicUpload'] = $publicUpload;
-		}
-		if (!is_null($password)) {
-			$body['password'] = $password;
-		}
-		if (!is_null($permissions)) {
-			$body['permissions'] = $permissions;
-		}
-
-		if ($viewOnly === true) {
-			$body['attributes'] = json_encode([['scope' => 'permissions', 'key' => 'download', 'value' => false]]);
-		}
-
-		$options['form_params'] = $body;
-
-		try {
-			$this->response = $client->request('POST', $fullUrl, $options);
-			$this->lastShareData = simplexml_load_string($this->response->getBody());
-		} catch (\GuzzleHttp\Exception\ClientException $ex) {
-			$this->response = $ex->getResponse();
-			throw new \Exception($this->response->getBody());
-		}
-	}
-
-	public function isFieldInResponse($field, $contentExpected) {
-		$data = simplexml_load_string($this->response->getBody())->data[0];
-		if ((string)$field == 'expiration') {
-			if (!empty($contentExpected)) {
-				$contentExpected = date('Y-m-d', strtotime($contentExpected)) . ' 00:00:00';
-			}
-		}
-		if (count($data->element) > 0) {
-			foreach ($data as $element) {
-				if ($contentExpected == 'A_TOKEN') {
-					return (strlen((string)$element->$field) == 15);
-				} elseif ($contentExpected == 'A_NUMBER') {
-					return is_numeric((string)$element->$field);
-				} elseif ($contentExpected == 'AN_URL') {
-					return $this->isExpectedUrl((string)$element->$field, 'index.php/s/');
-				} elseif ((string)$element->$field == $contentExpected) {
-					return true;
-				} else {
-					print($element->$field);
-				}
-			}
-
-			return false;
-		} else {
-			if ($contentExpected == 'A_TOKEN') {
-				return (strlen((string)$data->$field) == 15);
-			} elseif ($contentExpected == 'A_NUMBER') {
-				return is_numeric((string)$data->$field);
-			} elseif ($contentExpected == 'AN_URL') {
-				return $this->isExpectedUrl((string)$data->$field, 'index.php/s/');
-			} elseif ($contentExpected == $data->$field) {
-				return true;
-			} else {
-				print($data->$field);
-			}
-			return false;
-		}
-	}
-
-	/**
-	 * @Then /^File "([^"]*)" should be included in the response$/
-	 *
-	 * @param string $filename
-	 */
-	public function checkSharedFileInResponse($filename) {
-		Assert::assertEquals(true, $this->isFieldInResponse('file_target', "/$filename"));
-	}
-
-	/**
-	 * @Then /^File "([^"]*)" should not be included in the response$/
-	 *
-	 * @param string $filename
-	 */
-	public function checkSharedFileNotInResponse($filename) {
-		Assert::assertEquals(false, $this->isFieldInResponse('file_target', "/$filename"));
-	}
-
-	/**
-	 * @Then /^User "([^"]*)" should be included in the response$/
-	 *
-	 * @param string $user
-	 */
-	public function checkSharedUserInResponse($user) {
-		Assert::assertEquals(true, $this->isFieldInResponse('share_with', "$user"));
-	}
-
-	/**
-	 * @Then /^User "([^"]*)" should not be included in the response$/
-	 *
-	 * @param string $user
-	 */
-	public function checkSharedUserNotInResponse($user) {
-		Assert::assertEquals(false, $this->isFieldInResponse('share_with', "$user"));
-	}
-
-	public function isUserOrGroupInSharedData($userOrGroup, $permissions = null) {
-		$data = simplexml_load_string($this->response->getBody())->data[0];
-		foreach ($data as $element) {
-			if ($element->share_with == $userOrGroup && ($permissions === null || $permissions == $element->permissions)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with user "([^"]*)"( with permissions ([\d]*))?( view-only)?$/
-	 *
-	 * @param string $filepath
-	 * @param string $user1
-	 * @param string $user2
-	 */
-	public function assureFileIsShared($entry, $filepath, $user1, $user2, $withPerms = null, $permissions = null, $viewOnly = null) {
-		// when view-only is set, permissions is empty string instead of null...
-		if ($permissions === '') {
-			$permissions = null;
-		}
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
-		$client = new Client();
-		$options = [];
-		if ($user1 === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$user1, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$this->response = $client->get($fullUrl, $options);
-		if ($this->isUserOrGroupInSharedData($user2, $permissions)) {
-			return;
-		} else {
-			$this->createShare($user1, $filepath, 0, $user2, null, null, $permissions, $viewOnly !== null);
-		}
-		$this->response = $client->get($fullUrl, $options);
-		Assert::assertEquals(true, $this->isUserOrGroupInSharedData($user2, $permissions));
-	}
-
-	/**
-	 * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with group "([^"]*)"( with permissions ([\d]*))?( view-only)?$/
-	 *
-	 * @param string $filepath
-	 * @param string $user
-	 * @param string $group
-	 */
-	public function assureFileIsSharedWithGroup($entry, $filepath, $user, $group, $withPerms = null, $permissions = null, $viewOnly = null) {
-		// when view-only is set, permissions is empty string instead of null...
-		if ($permissions === '') {
-			$permissions = null;
-		}
-		$fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
-		$client = new Client();
-		$options = [];
-		if ($user === 'admin') {
-			$options['auth'] = $this->adminUser;
-		} else {
-			$options['auth'] = [$user, $this->regularUser];
-		}
-		$options['headers'] = [
-			'OCS-APIREQUEST' => 'true',
-		];
-		$this->response = $client->get($fullUrl, $options);
-		if ($this->isUserOrGroupInSharedData($group, $permissions)) {
-			return;
-		} else {
-			$this->createShare($user, $filepath, 1, $group, null, null, $permissions, $viewOnly !== null);
-		}
-		$this->response = $client->get($fullUrl, $options);
-		Assert::assertEquals(true, $this->isUserOrGroupInSharedData($group, $permissions));
-	}
-
-	/**
-	 * @When /^Deleting last share$/
-	 */
-	public function deletingLastShare() {
-		$share_id = $this->lastShareData->data[0]->id;
-		$url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
-		$this->sendingToWith('DELETE', $url, null);
-	}
-
-	/**
-	 * @When /^Getting info of last share$/
-	 */
-	public function gettingInfoOfLastShare() {
-		$share_id = $this->lastShareData->data[0]->id;
-		$url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
-		$this->sendingToWith('GET', $url, null);
-	}
-
-	/**
-	 * @Then /^last share_id is included in the answer$/
-	 */
-	public function checkingLastShareIDIsIncluded() {
-		$share_id = $this->lastShareData->data[0]->id;
-		if (!$this->isFieldInResponse('id', $share_id)) {
-			Assert::fail("Share id $share_id not found in response");
-		}
-	}
-
-	/**
-	 * @Then /^last share_id is not included in the answer$/
-	 */
-	public function checkingLastShareIDIsNotIncluded() {
-		$share_id = $this->lastShareData->data[0]->id;
-		if ($this->isFieldInResponse('id', $share_id)) {
-			Assert::fail("Share id $share_id has been found in response");
-		}
-	}
-
-	/**
-	 * @Then /^Share fields of last share match with$/
-	 * @param TableNode|null $body
-	 */
-	public function checkShareFields($body) {
-		if ($body instanceof TableNode) {
-			$fd = $body->getRowsHash();
-
-			foreach ($fd as $field => $value) {
-				if (substr($field, 0, 10) === 'share_with') {
-					$value = str_replace('REMOTE', substr($this->remoteBaseUrl, 0, -5), $value);
-					$value = str_replace('LOCAL', substr($this->localBaseUrl, 0, -5), $value);
-				}
-				if (substr($field, 0, 6) === 'remote') {
-					$value = str_replace('REMOTE', substr($this->remoteBaseUrl, 0, -4), $value);
-					$value = str_replace('LOCAL', substr($this->localBaseUrl, 0, -4), $value);
-				}
-				if (!$this->isFieldInResponse($field, $value)) {
-					Assert::fail("$field" . " doesn't have value " . "$value");
-				}
-			}
-		}
-	}
-
-	/**
-	 * @Then the list of returned shares has :count shares
-	 */
-	public function theListOfReturnedSharesHasShares(int $count) {
-		$this->theHTTPStatusCodeShouldBe('200');
-		$this->theOCSStatusCodeShouldBe('100');
-
-		$returnedShares = $this->getXmlResponse()->data[0];
-
-		Assert::assertEquals($count, count($returnedShares->element));
-	}
-
-	/**
-	 * @Then share :count is returned with
-	 *
-	 * @param int $number
-	 * @param TableNode $body
-	 */
-	public function shareXIsReturnedWith(int $number, TableNode $body) {
-		$this->theHTTPStatusCodeShouldBe('200');
-		$this->theOCSStatusCodeShouldBe('100');
-
-		if (!($body instanceof TableNode)) {
-			return;
-		}
-
-		$returnedShare = $this->getXmlResponse()->data[0];
-		if ($returnedShare->element) {
-			$returnedShare = $returnedShare->element[$number];
-		}
-
-		$defaultExpectedFields = [
-			'id' => 'A_NUMBER',
-			'permissions' => '19',
-			'stime' => 'A_NUMBER',
-			'parent' => '',
-			'expiration' => '',
-			'token' => '',
-			'storage' => 'A_NUMBER',
-			'item_source' => 'A_NUMBER',
-			'file_source' => 'A_NUMBER',
-			'file_parent' => 'A_NUMBER',
-			'mail_send' => '0'
-		];
-		$expectedFields = array_merge($defaultExpectedFields, $body->getRowsHash());
-
-		if (!array_key_exists('uid_file_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)) {
-			$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)) {
-			if ($expectedFields['share_with'] === 'private_conversation') {
-				$expectedFields['share_with'] = 'REGEXP /^private_conversation_[0-9a-f]{6}$/';
-			} else {
-				$expectedFields['share_with'] = FeatureContext::getTokenForIdentifier($expectedFields['share_with']);
-			}
-		}
-
-		foreach ($expectedFields as $field => $value) {
-			$this->assertFieldIsInReturnedShare($field, $value, $returnedShare);
-		}
-	}
-
-	/**
-	 * @return SimpleXMLElement
-	 */
-	private function getXmlResponse(): \SimpleXMLElement {
-		return simplexml_load_string($this->response->getBody());
-	}
-
-	/**
-	 * @param string $field
-	 * @param string $contentExpected
-	 * @param \SimpleXMLElement $returnedShare
-	 */
-	private function assertFieldIsInReturnedShare(string $field, string $contentExpected, \SimpleXMLElement $returnedShare) {
-		if ($contentExpected === 'IGNORE') {
-			return;
-		}
-
-		if (!property_exists($returnedShare, $field)) {
-			Assert::fail("$field was not found in response");
-		}
-
-		if ($field === 'expiration' && !empty($contentExpected)) {
-			$contentExpected = date('Y-m-d', strtotime($contentExpected)) . ' 00:00:00';
-		}
-
-		if ($contentExpected === 'A_NUMBER') {
-			Assert::assertTrue(is_numeric((string)$returnedShare->$field), "Field '$field' is not a number: " . $returnedShare->$field);
-		} elseif ($contentExpected === 'A_TOKEN') {
-			// A token is composed by 15 characters from
-			// ISecureRandom::CHAR_HUMAN_READABLE.
-			Assert::assertRegExp('/^[abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789]{15}$/', (string)$returnedShare->$field, "Field '$field' is not a token");
-		} elseif (strpos($contentExpected, 'REGEXP ') === 0) {
-			Assert::assertRegExp(substr($contentExpected, strlen('REGEXP ')), (string)$returnedShare->$field, "Field '$field' does not match");
-		} else {
-			Assert::assertEquals($contentExpected, (string)$returnedShare->$field, "Field '$field' does not match");
-		}
-	}
-
-	/**
-	 * @Then As :user remove all shares from the file named :fileName
-	 */
-	public function asRemoveAllSharesFromTheFileNamed($user, $fileName) {
-		$url = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares?format=json";
-		$client = new \GuzzleHttp\Client();
-		$res = $client->get(
-			$url,
-			[
-				'auth' => [
-					$user,
-					'123456',
-				],
-				'headers' => [
-					'Content-Type' => 'application/json',
-					'OCS-APIREQUEST' => 'true',
-				],
-			]
-		);
-		$json = json_decode($res->getBody()->getContents(), true);
-		$deleted = false;
-		foreach ($json['ocs']['data'] as $data) {
-			if (stripslashes($data['path']) === $fileName) {
-				$id = $data['id'];
-				$client->delete(
-					$this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/{$id}",
-					[
-						'auth' => [
-							$user,
-							'123456',
-						],
-						'headers' => [
-							'Content-Type' => 'application/json',
-							'OCS-APIREQUEST' => 'true',
-						],
-					]
-				);
-				$deleted = true;
-			}
-		}
-
-		if ($deleted === false) {
-			throw new \Exception("Could not delete file $fileName");
-		}
-	}
-
-	/**
-	 * @When save last share id
-	 */
-	public function saveLastShareId() {
-		$this->savedShareId = ($this->lastShareData['data']['id'] ?? null);
-	}
-
-	/**
-	 * @Then share ids should match
-	 */
-	public function shareIdsShouldMatch() {
-		if ($this->savedShareId !== ($this->lastShareData['data']['id'] ?? null)) {
-			throw new \Exception('Expected the same link share to be returned');
-		}
-	}
-
-	/**
-	 * @When /^getting sharees for$/
-	 * @param TableNode $body
-	 */
-	public function whenGettingShareesFor($body) {
-		$url = '/apps/files_sharing/api/v1/sharees';
-		if ($body instanceof TableNode) {
-			$parameters = [];
-			foreach ($body->getRowsHash() as $key => $value) {
-				if ($key === 'shareTypes') {
-					foreach (explode(' ', $value) as $shareType) {
-						$parameters[] = 'shareType[]=' . $shareType;
-					}
-				} else {
-					$parameters[] = $key . '=' . $value;
-				}
-			}
-			if (!empty($parameters)) {
-				$url .= '?' . implode('&', $parameters);
-			}
-		}
-
-		$this->sendingTo('GET', $url);
-	}
-
-	/**
-	 * @Then /^"([^"]*)" sharees returned (are|is empty)$/
-	 * @param string $shareeType
-	 * @param string $isEmpty
-	 * @param TableNode|null $shareesList
-	 */
-	public function thenListOfSharees($shareeType, $isEmpty, $shareesList = null) {
-		if ($isEmpty !== 'is empty') {
-			$sharees = $shareesList->getRows();
-			$respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
-			Assert::assertEquals($sharees, $respondedArray);
-		} else {
-			$respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
-			Assert::assertEmpty($respondedArray);
-		}
-	}
-
-	public function getArrayOfShareesResponded(ResponseInterface $response, $shareeType) {
-		$elements = simplexml_load_string($response->getBody())->data;
-		$elements = json_decode(json_encode($elements), 1);
-		if (strpos($shareeType, 'exact ') === 0) {
-			$elements = $elements['exact'];
-			$shareeType = substr($shareeType, 6);
-		}
-
-		// "simplexml_load_string" creates a SimpleXMLElement object for each
-		// XML element with child elements. In turn, each child is indexed by
-		// its tag in the SimpleXMLElement object. However, when there are
-		// several child XML elements with the same tag, an array with all the
-		// children with the same tag is indexed instead. Therefore, when the
-		// XML contains
-		// <XXX>
-		//   <element>
-		//     <label>...</label>
-		//     <value>...</value>
-		//   </element>
-		// </XXX>
-		// the "$elements[$shareeType]" variable contains an "element" key which
-		// in turn contains "label" and "value" keys, but when the XML contains
-		// <XXX>
-		//   <element>
-		//     <label>...</label>
-		//     <value>...</value>
-		//   </element>
-		//   <element>
-		//     <label>...</label>
-		//     <value>...</value>
-		//   </element>
-		// </XXX>
-		// the "$elements[$shareeType]" variable contains an "element" key which
-		// in turn contains "0" and "1" keys, and in turn each one contains
-		// "label" and "value" keys.
-		if (array_key_exists('element', $elements[$shareeType]) && is_int(array_keys($elements[$shareeType]['element'])[0])) {
-			$elements[$shareeType] = $elements[$shareeType]['element'];
-		}
-
-		$sharees = [];
-		foreach ($elements[$shareeType] as $element) {
-			$sharee = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']];
-
-			if (array_key_exists('shareWithDisplayNameUnique', $element)) {
-				$sharee[] = $element['shareWithDisplayNameUnique'];
-			}
-
-			$sharees[] = $sharee;
-		}
-		return $sharees;
-	}
+    use Provisioning;
+
+    /** @var int */
+    private $sharingApiVersion = 1;
+
+    /** @var SimpleXMLElement */
+    private $lastShareData = null;
+
+    /** @var SimpleXMLElement[] */
+    private $storedShareData = [];
+
+    /** @var int */
+    private $savedShareId = null;
+
+    /** @var ResponseInterface */
+    private $response;
+
+    /**
+     * @Given /^as "([^"]*)" creating a share with$/
+     * @param string $user
+     * @param TableNode|null $body
+     */
+    public function asCreatingAShareWith($user, $body) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares";
+        $client = new Client();
+        $options = [
+            'headers' => [
+                'OCS-APIREQUEST' => 'true',
+            ],
+        ];
+        if ($user === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$user, $this->regularUser];
+        }
+
+        if ($body instanceof TableNode) {
+            $fd = $body->getRowsHash();
+            if (array_key_exists('expireDate', $fd)) {
+                $dateModification = $fd['expireDate'];
+                if ($dateModification === 'null') {
+                    $fd['expireDate'] = null;
+                } elseif (!empty($dateModification)) {
+                    $fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
+                } else {
+                    $fd['expireDate'] = '';
+                }
+            }
+            $options['form_params'] = $fd;
+        }
+
+        try {
+            $this->response = $client->request('POST', $fullUrl, $options);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+        }
+
+        $this->lastShareData = simplexml_load_string($this->response->getBody());
+    }
+
+    /**
+     * @When /^save the last share data as "([^"]*)"$/
+     */
+    public function saveLastShareData($name) {
+        $this->storedShareData[$name] = $this->lastShareData;
+    }
+
+    /**
+     * @When /^restore the last share data from "([^"]*)"$/
+     */
+    public function restoreLastShareData($name) {
+        $this->lastShareData = $this->storedShareData[$name];
+    }
+
+    /**
+     * @When /^creating a share with$/
+     * @param TableNode|null $body
+     */
+    public function creatingShare($body) {
+        $this->asCreatingAShareWith($this->currentUser, $body);
+    }
+
+    /**
+     * @When /^accepting last share$/
+     */
+    public function acceptingLastShare() {
+        $share_id = $this->lastShareData->data[0]->id;
+        $url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/pending/$share_id";
+        $this->sendingToWith('POST', $url, null);
+
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @When /^user "([^"]*)" accepts last share$/
+     *
+     * @param string $user
+     */
+    public function userAcceptsLastShare(string $user) {
+        // "As userXXX" and "user userXXX accepts last share" steps are not
+        // expected to be used in the same scenario, but restore the user just
+        // in case.
+        $previousUser = $this->currentUser;
+
+        $this->currentUser = $user;
+
+        $share_id = $this->lastShareData->data[0]->id;
+        $url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/pending/$share_id";
+        $this->sendingToWith('POST', $url, null);
+
+        $this->currentUser = $previousUser;
+
+        $this->theHTTPStatusCodeShouldBe('200');
+    }
+
+    /**
+     * @Then /^last link share can be downloaded$/
+     */
+    public function lastLinkShareCanBeDownloaded() {
+        if (count($this->lastShareData->data->element) > 0) {
+            $url = $this->lastShareData->data[0]->url;
+        } else {
+            $url = $this->lastShareData->data->url;
+        }
+        $fullUrl = $url . '/download';
+        $this->checkDownload($fullUrl, null, 'text/plain');
+    }
+
+    /**
+     * @Then /^last share can be downloaded$/
+     */
+    public function lastShareCanBeDownloaded() {
+        if (count($this->lastShareData->data->element) > 0) {
+            $token = $this->lastShareData->data[0]->token;
+        } else {
+            $token = $this->lastShareData->data->token;
+        }
+
+        $fullUrl = substr($this->baseUrl, 0, -4) . 'index.php/s/' . $token . '/download';
+        $this->checkDownload($fullUrl, null, 'text/plain');
+    }
+
+    /**
+     * @Then /^last share with password "([^"]*)" can be downloaded$/
+     */
+    public function lastShareWithPasswordCanBeDownloaded($password) {
+        if (count($this->lastShareData->data->element) > 0) {
+            $token = $this->lastShareData->data[0]->token;
+        } else {
+            $token = $this->lastShareData->data->token;
+        }
+
+        $fullUrl = substr($this->baseUrl, 0, -4) . "public.php/dav/files/$token/";
+        $this->checkDownload($fullUrl, ['', $password], 'text/plain');
+    }
+
+    private function checkDownload($url, $auth = null, $mimeType = null) {
+        if ($auth !== null) {
+            $options['auth'] = $auth;
+        }
+        $options['stream'] = true;
+
+        $client = new Client();
+        $this->response = $client->get($url, $options);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+
+        $buf = '';
+        $body = $this->response->getBody();
+        while (!$body->eof()) {
+            // read everything
+            $buf .= $body->read(8192);
+        }
+        $body->close();
+
+        if ($mimeType !== null) {
+            $finfo = new finfo;
+            Assert::assertEquals($mimeType, $finfo->buffer($buf, FILEINFO_MIME_TYPE));
+        }
+    }
+
+    /**
+     * @When /^Adding expiration date to last share$/
+     */
+    public function addingExpirationDate() {
+        $share_id = (string)$this->lastShareData->data[0]->id;
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
+        $client = new Client();
+        $options = [];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+        $date = date('Y-m-d', strtotime('+3 days'));
+        $options['form_params'] = ['expireDate' => $date];
+        $this->response = $this->response = $client->request('PUT', $fullUrl, $options);
+        Assert::assertEquals(200, $this->response->getStatusCode());
+    }
+
+    /**
+     * @When /^Updating last share with$/
+     * @param TableNode|null $body
+     */
+    public function updatingLastShare($body) {
+        $share_id = (string)$this->lastShareData->data[0]->id;
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
+        $client = new Client();
+        $options = [
+            'headers' => [
+                'OCS-APIREQUEST' => 'true',
+            ],
+        ];
+        if ($this->currentUser === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$this->currentUser, $this->regularUser];
+        }
+
+        if ($body instanceof TableNode) {
+            $fd = $body->getRowsHash();
+            if (array_key_exists('expireDate', $fd)) {
+                $dateModification = $fd['expireDate'];
+                $fd['expireDate'] = date('Y-m-d', strtotime($dateModification));
+            }
+            $options['form_params'] = $fd;
+        }
+
+        try {
+            $this->response = $client->request('PUT', $fullUrl, $options);
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+        }
+    }
+
+    public function createShare($user,
+        $path = null,
+        $shareType = null,
+        $shareWith = null,
+        $publicUpload = null,
+        $password = null,
+        $permissions = null,
+        $viewOnly = false) {
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares";
+        $client = new Client();
+        $options = [
+            'headers' => [
+                'OCS-APIREQUEST' => 'true',
+            ],
+        ];
+
+        if ($user === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$user, $this->regularUser];
+        }
+        $body = [];
+        if (!is_null($path)) {
+            $body['path'] = $path;
+        }
+        if (!is_null($shareType)) {
+            $body['shareType'] = $shareType;
+        }
+        if (!is_null($shareWith)) {
+            $body['shareWith'] = $shareWith;
+        }
+        if (!is_null($publicUpload)) {
+            $body['publicUpload'] = $publicUpload;
+        }
+        if (!is_null($password)) {
+            $body['password'] = $password;
+        }
+        if (!is_null($permissions)) {
+            $body['permissions'] = $permissions;
+        }
+
+        if ($viewOnly === true) {
+            $body['attributes'] = json_encode([['scope' => 'permissions', 'key' => 'download', 'value' => false]]);
+        }
+
+        $options['form_params'] = $body;
+
+        try {
+            $this->response = $client->request('POST', $fullUrl, $options);
+            $this->lastShareData = simplexml_load_string($this->response->getBody());
+        } catch (\GuzzleHttp\Exception\ClientException $ex) {
+            $this->response = $ex->getResponse();
+            throw new \Exception($this->response->getBody());
+        }
+    }
+
+    public function isFieldInResponse($field, $contentExpected) {
+        $data = simplexml_load_string($this->response->getBody())->data[0];
+        if ((string)$field == 'expiration') {
+            if (!empty($contentExpected)) {
+                $contentExpected = date('Y-m-d', strtotime($contentExpected)) . ' 00:00:00';
+            }
+        }
+        if (count($data->element) > 0) {
+            foreach ($data as $element) {
+                if ($contentExpected == 'A_TOKEN') {
+                    return (strlen((string)$element->$field) == 15);
+                } elseif ($contentExpected == 'A_NUMBER') {
+                    return is_numeric((string)$element->$field);
+                } elseif ($contentExpected == 'AN_URL') {
+                    return $this->isExpectedUrl((string)$element->$field, 'index.php/s/');
+                } elseif ((string)$element->$field == $contentExpected) {
+                    return true;
+                } else {
+                    print($element->$field);
+                }
+            }
+
+            return false;
+        } else {
+            if ($contentExpected == 'A_TOKEN') {
+                return (strlen((string)$data->$field) == 15);
+            } elseif ($contentExpected == 'A_NUMBER') {
+                return is_numeric((string)$data->$field);
+            } elseif ($contentExpected == 'AN_URL') {
+                return $this->isExpectedUrl((string)$data->$field, 'index.php/s/');
+            } elseif ($contentExpected == $data->$field) {
+                return true;
+            } else {
+                print($data->$field);
+            }
+            return false;
+        }
+    }
+
+    /**
+     * @Then /^File "([^"]*)" should be included in the response$/
+     *
+     * @param string $filename
+     */
+    public function checkSharedFileInResponse($filename) {
+        Assert::assertEquals(true, $this->isFieldInResponse('file_target', "/$filename"));
+    }
+
+    /**
+     * @Then /^File "([^"]*)" should not be included in the response$/
+     *
+     * @param string $filename
+     */
+    public function checkSharedFileNotInResponse($filename) {
+        Assert::assertEquals(false, $this->isFieldInResponse('file_target', "/$filename"));
+    }
+
+    /**
+     * @Then /^User "([^"]*)" should be included in the response$/
+     *
+     * @param string $user
+     */
+    public function checkSharedUserInResponse($user) {
+        Assert::assertEquals(true, $this->isFieldInResponse('share_with', "$user"));
+    }
+
+    /**
+     * @Then /^User "([^"]*)" should not be included in the response$/
+     *
+     * @param string $user
+     */
+    public function checkSharedUserNotInResponse($user) {
+        Assert::assertEquals(false, $this->isFieldInResponse('share_with', "$user"));
+    }
+
+    public function isUserOrGroupInSharedData($userOrGroup, $permissions = null) {
+        $data = simplexml_load_string($this->response->getBody())->data[0];
+        foreach ($data as $element) {
+            if ($element->share_with == $userOrGroup && ($permissions === null || $permissions == $element->permissions)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with user "([^"]*)"( with permissions ([\d]*))?( view-only)?$/
+     *
+     * @param string $filepath
+     * @param string $user1
+     * @param string $user2
+     */
+    public function assureFileIsShared($entry, $filepath, $user1, $user2, $withPerms = null, $permissions = null, $viewOnly = null) {
+        // when view-only is set, permissions is empty string instead of null...
+        if ($permissions === '') {
+            $permissions = null;
+        }
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
+        $client = new Client();
+        $options = [];
+        if ($user1 === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$user1, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $this->response = $client->get($fullUrl, $options);
+        if ($this->isUserOrGroupInSharedData($user2, $permissions)) {
+            return;
+        } else {
+            $this->createShare($user1, $filepath, 0, $user2, null, null, $permissions, $viewOnly !== null);
+        }
+        $this->response = $client->get($fullUrl, $options);
+        Assert::assertEquals(true, $this->isUserOrGroupInSharedData($user2, $permissions));
+    }
+
+    /**
+     * @Given /^(file|folder|entry) "([^"]*)" of user "([^"]*)" is shared with group "([^"]*)"( with permissions ([\d]*))?( view-only)?$/
+     *
+     * @param string $filepath
+     * @param string $user
+     * @param string $group
+     */
+    public function assureFileIsSharedWithGroup($entry, $filepath, $user, $group, $withPerms = null, $permissions = null, $viewOnly = null) {
+        // when view-only is set, permissions is empty string instead of null...
+        if ($permissions === '') {
+            $permissions = null;
+        }
+        $fullUrl = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares" . "?path=$filepath";
+        $client = new Client();
+        $options = [];
+        if ($user === 'admin') {
+            $options['auth'] = $this->adminUser;
+        } else {
+            $options['auth'] = [$user, $this->regularUser];
+        }
+        $options['headers'] = [
+            'OCS-APIREQUEST' => 'true',
+        ];
+        $this->response = $client->get($fullUrl, $options);
+        if ($this->isUserOrGroupInSharedData($group, $permissions)) {
+            return;
+        } else {
+            $this->createShare($user, $filepath, 1, $group, null, null, $permissions, $viewOnly !== null);
+        }
+        $this->response = $client->get($fullUrl, $options);
+        Assert::assertEquals(true, $this->isUserOrGroupInSharedData($group, $permissions));
+    }
+
+    /**
+     * @When /^Deleting last share$/
+     */
+    public function deletingLastShare() {
+        $share_id = $this->lastShareData->data[0]->id;
+        $url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
+        $this->sendingToWith('DELETE', $url, null);
+    }
+
+    /**
+     * @When /^Getting info of last share$/
+     */
+    public function gettingInfoOfLastShare() {
+        $share_id = $this->lastShareData->data[0]->id;
+        $url = "/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/$share_id";
+        $this->sendingToWith('GET', $url, null);
+    }
+
+    /**
+     * @Then /^last share_id is included in the answer$/
+     */
+    public function checkingLastShareIDIsIncluded() {
+        $share_id = $this->lastShareData->data[0]->id;
+        if (!$this->isFieldInResponse('id', $share_id)) {
+            Assert::fail("Share id $share_id not found in response");
+        }
+    }
+
+    /**
+     * @Then /^last share_id is not included in the answer$/
+     */
+    public function checkingLastShareIDIsNotIncluded() {
+        $share_id = $this->lastShareData->data[0]->id;
+        if ($this->isFieldInResponse('id', $share_id)) {
+            Assert::fail("Share id $share_id has been found in response");
+        }
+    }
+
+    /**
+     * @Then /^Share fields of last share match with$/
+     * @param TableNode|null $body
+     */
+    public function checkShareFields($body) {
+        if ($body instanceof TableNode) {
+            $fd = $body->getRowsHash();
+
+            foreach ($fd as $field => $value) {
+                if (substr($field, 0, 10) === 'share_with') {
+                    $value = str_replace('REMOTE', substr($this->remoteBaseUrl, 0, -5), $value);
+                    $value = str_replace('LOCAL', substr($this->localBaseUrl, 0, -5), $value);
+                }
+                if (substr($field, 0, 6) === 'remote') {
+                    $value = str_replace('REMOTE', substr($this->remoteBaseUrl, 0, -4), $value);
+                    $value = str_replace('LOCAL', substr($this->localBaseUrl, 0, -4), $value);
+                }
+                if (!$this->isFieldInResponse($field, $value)) {
+                    Assert::fail("$field" . " doesn't have value " . "$value");
+                }
+            }
+        }
+    }
+
+    /**
+     * @Then the list of returned shares has :count shares
+     */
+    public function theListOfReturnedSharesHasShares(int $count) {
+        $this->theHTTPStatusCodeShouldBe('200');
+        $this->theOCSStatusCodeShouldBe('100');
+
+        $returnedShares = $this->getXmlResponse()->data[0];
+
+        Assert::assertEquals($count, count($returnedShares->element));
+    }
+
+    /**
+     * @Then share :count is returned with
+     *
+     * @param int $number
+     * @param TableNode $body
+     */
+    public function shareXIsReturnedWith(int $number, TableNode $body) {
+        $this->theHTTPStatusCodeShouldBe('200');
+        $this->theOCSStatusCodeShouldBe('100');
+
+        if (!($body instanceof TableNode)) {
+            return;
+        }
+
+        $returnedShare = $this->getXmlResponse()->data[0];
+        if ($returnedShare->element) {
+            $returnedShare = $returnedShare->element[$number];
+        }
+
+        $defaultExpectedFields = [
+            'id' => 'A_NUMBER',
+            'permissions' => '19',
+            'stime' => 'A_NUMBER',
+            'parent' => '',
+            'expiration' => '',
+            'token' => '',
+            'storage' => 'A_NUMBER',
+            'item_source' => 'A_NUMBER',
+            'file_source' => 'A_NUMBER',
+            'file_parent' => 'A_NUMBER',
+            'mail_send' => '0'
+        ];
+        $expectedFields = array_merge($defaultExpectedFields, $body->getRowsHash());
+
+        if (!array_key_exists('uid_file_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)) {
+            $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)) {
+            if ($expectedFields['share_with'] === 'private_conversation') {
+                $expectedFields['share_with'] = 'REGEXP /^private_conversation_[0-9a-f]{6}$/';
+            } else {
+                $expectedFields['share_with'] = FeatureContext::getTokenForIdentifier($expectedFields['share_with']);
+            }
+        }
+
+        foreach ($expectedFields as $field => $value) {
+            $this->assertFieldIsInReturnedShare($field, $value, $returnedShare);
+        }
+    }
+
+    /**
+     * @return SimpleXMLElement
+     */
+    private function getXmlResponse(): \SimpleXMLElement {
+        return simplexml_load_string($this->response->getBody());
+    }
+
+    /**
+     * @param string $field
+     * @param string $contentExpected
+     * @param \SimpleXMLElement $returnedShare
+     */
+    private function assertFieldIsInReturnedShare(string $field, string $contentExpected, \SimpleXMLElement $returnedShare) {
+        if ($contentExpected === 'IGNORE') {
+            return;
+        }
+
+        if (!property_exists($returnedShare, $field)) {
+            Assert::fail("$field was not found in response");
+        }
+
+        if ($field === 'expiration' && !empty($contentExpected)) {
+            $contentExpected = date('Y-m-d', strtotime($contentExpected)) . ' 00:00:00';
+        }
+
+        if ($contentExpected === 'A_NUMBER') {
+            Assert::assertTrue(is_numeric((string)$returnedShare->$field), "Field '$field' is not a number: " . $returnedShare->$field);
+        } elseif ($contentExpected === 'A_TOKEN') {
+            // A token is composed by 15 characters from
+            // ISecureRandom::CHAR_HUMAN_READABLE.
+            Assert::assertRegExp('/^[abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789]{15}$/', (string)$returnedShare->$field, "Field '$field' is not a token");
+        } elseif (strpos($contentExpected, 'REGEXP ') === 0) {
+            Assert::assertRegExp(substr($contentExpected, strlen('REGEXP ')), (string)$returnedShare->$field, "Field '$field' does not match");
+        } else {
+            Assert::assertEquals($contentExpected, (string)$returnedShare->$field, "Field '$field' does not match");
+        }
+    }
+
+    /**
+     * @Then As :user remove all shares from the file named :fileName
+     */
+    public function asRemoveAllSharesFromTheFileNamed($user, $fileName) {
+        $url = $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares?format=json";
+        $client = new \GuzzleHttp\Client();
+        $res = $client->get(
+            $url,
+            [
+                'auth' => [
+                    $user,
+                    '123456',
+                ],
+                'headers' => [
+                    'Content-Type' => 'application/json',
+                    'OCS-APIREQUEST' => 'true',
+                ],
+            ]
+        );
+        $json = json_decode($res->getBody()->getContents(), true);
+        $deleted = false;
+        foreach ($json['ocs']['data'] as $data) {
+            if (stripslashes($data['path']) === $fileName) {
+                $id = $data['id'];
+                $client->delete(
+                    $this->baseUrl . "v{$this->apiVersion}.php/apps/files_sharing/api/v{$this->sharingApiVersion}/shares/{$id}",
+                    [
+                        'auth' => [
+                            $user,
+                            '123456',
+                        ],
+                        'headers' => [
+                            'Content-Type' => 'application/json',
+                            'OCS-APIREQUEST' => 'true',
+                        ],
+                    ]
+                );
+                $deleted = true;
+            }
+        }
+
+        if ($deleted === false) {
+            throw new \Exception("Could not delete file $fileName");
+        }
+    }
+
+    /**
+     * @When save last share id
+     */
+    public function saveLastShareId() {
+        $this->savedShareId = ($this->lastShareData['data']['id'] ?? null);
+    }
+
+    /**
+     * @Then share ids should match
+     */
+    public function shareIdsShouldMatch() {
+        if ($this->savedShareId !== ($this->lastShareData['data']['id'] ?? null)) {
+            throw new \Exception('Expected the same link share to be returned');
+        }
+    }
+
+    /**
+     * @When /^getting sharees for$/
+     * @param TableNode $body
+     */
+    public function whenGettingShareesFor($body) {
+        $url = '/apps/files_sharing/api/v1/sharees';
+        if ($body instanceof TableNode) {
+            $parameters = [];
+            foreach ($body->getRowsHash() as $key => $value) {
+                if ($key === 'shareTypes') {
+                    foreach (explode(' ', $value) as $shareType) {
+                        $parameters[] = 'shareType[]=' . $shareType;
+                    }
+                } else {
+                    $parameters[] = $key . '=' . $value;
+                }
+            }
+            if (!empty($parameters)) {
+                $url .= '?' . implode('&', $parameters);
+            }
+        }
+
+        $this->sendingTo('GET', $url);
+    }
+
+    /**
+     * @Then /^"([^"]*)" sharees returned (are|is empty)$/
+     * @param string $shareeType
+     * @param string $isEmpty
+     * @param TableNode|null $shareesList
+     */
+    public function thenListOfSharees($shareeType, $isEmpty, $shareesList = null) {
+        if ($isEmpty !== 'is empty') {
+            $sharees = $shareesList->getRows();
+            $respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
+            Assert::assertEquals($sharees, $respondedArray);
+        } else {
+            $respondedArray = $this->getArrayOfShareesResponded($this->response, $shareeType);
+            Assert::assertEmpty($respondedArray);
+        }
+    }
+
+    public function getArrayOfShareesResponded(ResponseInterface $response, $shareeType) {
+        $elements = simplexml_load_string($response->getBody())->data;
+        $elements = json_decode(json_encode($elements), 1);
+        if (strpos($shareeType, 'exact ') === 0) {
+            $elements = $elements['exact'];
+            $shareeType = substr($shareeType, 6);
+        }
+
+        // "simplexml_load_string" creates a SimpleXMLElement object for each
+        // XML element with child elements. In turn, each child is indexed by
+        // its tag in the SimpleXMLElement object. However, when there are
+        // several child XML elements with the same tag, an array with all the
+        // children with the same tag is indexed instead. Therefore, when the
+        // XML contains
+        // <XXX>
+        //   <element>
+        //     <label>...</label>
+        //     <value>...</value>
+        //   </element>
+        // </XXX>
+        // the "$elements[$shareeType]" variable contains an "element" key which
+        // in turn contains "label" and "value" keys, but when the XML contains
+        // <XXX>
+        //   <element>
+        //     <label>...</label>
+        //     <value>...</value>
+        //   </element>
+        //   <element>
+        //     <label>...</label>
+        //     <value>...</value>
+        //   </element>
+        // </XXX>
+        // the "$elements[$shareeType]" variable contains an "element" key which
+        // in turn contains "0" and "1" keys, and in turn each one contains
+        // "label" and "value" keys.
+        if (array_key_exists('element', $elements[$shareeType]) && is_int(array_keys($elements[$shareeType]['element'])[0])) {
+            $elements[$shareeType] = $elements[$shareeType]['element'];
+        }
+
+        $sharees = [];
+        foreach ($elements[$shareeType] as $element) {
+            $sharee = [$element['label'], $element['value']['shareType'], $element['value']['shareWith']];
+
+            if (array_key_exists('shareWithDisplayNameUnique', $element)) {
+                $sharee[] = $element['shareWithDisplayNameUnique'];
+            }
+
+            $sharees[] = $sharee;
+        }
+        return $sharees;
+    }
 }

lib/private/Server.php

Indentation +1392 added lines, -1392 removed lines

@@ -259,1436 +259,1436 @@
  * TODO: hookup all manager classes
  */
 class Server extends ServerContainer implements IServerContainer {
-	/** @var string */
-	private $webRoot;
-
-	/**
-	 * @param string $webRoot
-	 * @param \OC\Config $config
-	 */
-	public function __construct($webRoot, \OC\Config $config) {
-		parent::__construct();
-		$this->webRoot = $webRoot;
-
-		// To find out if we are running from CLI or not
-		$this->registerParameter('isCLI', \OC::$CLI);
-		$this->registerParameter('serverRoot', \OC::$SERVERROOT);
-
-		$this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
-			return $c;
-		});
-		$this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
-
-		$this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
-
-		$this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
-
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
-
-		$this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
-
-		$this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
-		$this->registerAlias(ITemplateManager::class, TemplateManager::class);
-		$this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
-
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
-
-		$this->registerService(View::class, function (Server $c) {
-			return new View();
-		}, false);
-
-		$this->registerService(IPreview::class, function (ContainerInterface $c) {
-			return new PreviewManager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(IRootFolder::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(GeneratorHelper::class),
-				$c->get(ISession::class)->get('user_id'),
-				$c->get(Coordinator::class),
-				$c->get(IServerContainer::class),
-				$c->get(IBinaryFinder::class),
-				$c->get(IMagickSupport::class)
-			);
-		});
-		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
-
-		$this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
-			return new Watcher(
-				$c->get(\OC\Preview\Storage\StorageFactory::class),
-				$c->get(PreviewMapper::class),
-				$c->get(IDBConnection::class),
-			);
-		});
-
-		$this->registerService(IProfiler::class, function (Server $c) {
-			return new Profiler($c->get(SystemConfig::class));
-		});
-
-		$this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\Manager(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->getL10N('core'),
-				new View(),
-				$util,
-				new ArrayCache()
-			);
-		});
-		$this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
-
-		$this->registerService(IFile::class, function (ContainerInterface $c) {
-			$util = new Encryption\Util(
-				new View(),
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-			return new Encryption\File(
-				$util,
-				$c->get(IRootFolder::class),
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
-
-		$this->registerService(IStorage::class, function (ContainerInterface $c) {
-			$view = new View();
-			$util = new Encryption\Util(
-				$view,
-				$c->get(IUserManager::class),
-				$c->get(IGroupManager::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new Encryption\Keys\Storage(
-				$view,
-				$util,
-				$c->get(ICrypto::class),
-				$c->get(\OCP\IConfig::class)
-			);
-		});
-
-		$this->registerAlias(\OCP\ITagManager::class, TagManager::class);
-
-		$this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
-			/** @var \OCP\IConfig $config */
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
-			return new $factoryClass($this);
-		});
-		$this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getManager();
-		});
-		/** @deprecated 19.0.0 */
-		$this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
-
-		$this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
-			return $c->get('SystemTagManagerFactory')->getObjectMapper();
-		});
-		$this->registerAlias(IFileAccess::class, FileAccess::class);
-		$this->registerService('RootFolder', function (ContainerInterface $c) {
-			$manager = \OC\Files\Filesystem::getMountManager();
-			$view = new View();
-			/** @var IUserSession $userSession */
-			$userSession = $c->get(IUserSession::class);
-			$root = new Root(
-				$manager,
-				$view,
-				$userSession->getUser(),
-				$c->get(IUserMountCache::class),
-				$this->get(LoggerInterface::class),
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IAppConfig::class),
-			);
-
-			$previewConnector = new \OC\Preview\WatcherConnector(
-				$root,
-				$c->get(SystemConfig::class),
-				$this->get(IEventDispatcher::class)
-			);
-			$previewConnector->connectWatcher();
-
-			return $root;
-		});
-		$this->registerService(HookConnector::class, function (ContainerInterface $c) {
-			return new HookConnector(
-				$c->get(IRootFolder::class),
-				new View(),
-				$c->get(IEventDispatcher::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-
-		$this->registerService(IRootFolder::class, function (ContainerInterface $c) {
-			return new LazyRoot(function () use ($c) {
-				return $c->get('RootFolder');
-			});
-		});
-
-		$this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
-
-		$this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
-			return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
-		});
-
-		$this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
-			$groupManager = new \OC\Group\Manager(
-				$this->get(IUserManager::class),
-				$this->get(IEventDispatcher::class),
-				$this->get(LoggerInterface::class),
-				$this->get(ICacheFactory::class),
-				$this->get(IRemoteAddress::class),
-			);
-			return $groupManager;
-		});
-
-		$this->registerService(Store::class, function (ContainerInterface $c) {
-			$session = $c->get(ISession::class);
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$tokenProvider = $c->get(IProvider::class);
-			} else {
-				$tokenProvider = null;
-			}
-			$logger = $c->get(LoggerInterface::class);
-			$crypto = $c->get(ICrypto::class);
-			return new Store($session, $logger, $crypto, $tokenProvider);
-		});
-		$this->registerAlias(IStore::class, Store::class);
-		$this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
-		$this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
-
-		$this->registerService(\OC\User\Session::class, function (Server $c) {
-			$manager = $c->get(IUserManager::class);
-			$session = new \OC\Session\Memory();
-			$timeFactory = new TimeFactory();
-			// Token providers might require a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$provider = $c->get(IProvider::class);
-			} else {
-				$provider = null;
-			}
-
-			$userSession = new \OC\User\Session(
-				$manager,
-				$session,
-				$timeFactory,
-				$provider,
-				$c->get(\OCP\IConfig::class),
-				$c->get(ISecureRandom::class),
-				$c->get('LockdownManager'),
-				$c->get(LoggerInterface::class),
-				$c->get(IEventDispatcher::class),
-			);
-			/** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
-			});
-			/** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
-			});
-			/** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
-			});
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
-			});
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
-				\OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
-			});
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
-			});
-			$userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
-			});
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
-			});
-			$userSession->listen('\OC\User', 'logout', function ($user) {
-				\OC_Hook::emit('OC_User', 'logout', []);
-
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'postLogout', function ($user) {
-				/** @var IEventDispatcher $dispatcher */
-				$dispatcher = $this->get(IEventDispatcher::class);
-				$dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
-			});
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
-				/** @var \OC\User\User $user */
-				\OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
-			});
-			return $userSession;
-		});
-		$this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
-
-		$this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
-
-		$this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
-
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
-
-		$this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
-			return new \OC\SystemConfig($config);
-		});
-
-		$this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
-		$this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
-		$this->registerAlias(IAppManager::class, AppManager::class);
-
-		$this->registerService(IFactory::class, function (Server $c) {
-			return new \OC\L10N\Factory(
-				$c->get(\OCP\IConfig::class),
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(ICacheFactory::class),
-				\OC::$SERVERROOT,
-				$c->get(IAppManager::class),
-			);
-		});
-
-		$this->registerAlias(IURLGenerator::class, URLGenerator::class);
-
-		$this->registerAlias(ICache::class, Cache\File::class);
-		$this->registerService(Factory::class, function (Server $c) {
-			$profiler = $c->get(IProfiler::class);
-			$logger = $c->get(LoggerInterface::class);
-			$serverVersion = $c->get(ServerVersion::class);
-			/** @var SystemConfig $config */
-			$config = $c->get(SystemConfig::class);
-			if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				return new \OC\Memcache\Factory(
-					$logger,
-					$profiler,
-					$serverVersion,
-					ArrayCache::class,
-					ArrayCache::class,
-					ArrayCache::class
-				);
-			}
-
-			return new \OC\Memcache\Factory(
-				$logger,
-				$profiler,
-				$serverVersion,
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.local', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.distributed', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('memcache.locking', null),
-				/** @psalm-taint-escape callable */
-				$config->getValue('redis_log_file')
-			);
-		});
-		$this->registerAlias(ICacheFactory::class, Factory::class);
-
-		$this->registerService('RedisFactory', function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
-		});
-
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
-			$l10n = $this->get(IFactory::class)->get('lib');
-			return new \OC\Activity\Manager(
-				$c->getRequest(),
-				$c->get(IUserSession::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IValidator::class),
-				$c->get(IRichTextFormatter::class),
-				$l10n,
-				$c->get(ITimeFactory::class),
-			);
-		});
-
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
-			return new \OC\Activity\EventMerger(
-				$c->getL10N('lib')
-			);
-		});
-		$this->registerAlias(IValidator::class, Validator::class);
-
-		$this->registerService(AvatarManager::class, function (Server $c) {
-			return new AvatarManager(
-				$c->get(IUserSession::class),
-				$c->get(\OC\User\Manager::class),
-				$c->getAppDataDir('avatar'),
-				$c->getL10N('lib'),
-				$c->get(LoggerInterface::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(IAccountManager::class),
-				$c->get(KnownUserService::class)
-			);
-		});
-
-		$this->registerAlias(IAvatarManager::class, AvatarManager::class);
-
-		$this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
-		$this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
-
-		/** Only used by the PsrLoggerAdapter should not be used by apps */
-		$this->registerService(\OC\Log::class, function (Server $c) {
-			$logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
-			$factory = new LogFactory($c, $this->get(SystemConfig::class));
-			$logger = $factory->get($logType);
-			$registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
-
-			return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
-		});
-		// PSR-3 logger
-		$this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
-
-		$this->registerService(ILogFactory::class, function (Server $c) {
-			return new LogFactory($c, $this->get(SystemConfig::class));
-		});
-
-		$this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
-
-		$this->registerService(Router::class, function (Server $c) {
-			$cacheFactory = $c->get(ICacheFactory::class);
-			if ($cacheFactory->isLocalCacheAvailable()) {
-				$router = $c->resolve(CachingRouter::class);
-			} else {
-				$router = $c->resolve(Router::class);
-			}
-			return $router;
-		});
-		$this->registerAlias(IRouter::class, Router::class);
-
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
-					$c->get(AllConfig::class),
-					$this->get(ICacheFactory::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			} else {
-				$backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
-					$c->get(AllConfig::class),
-					$c->get(IDBConnection::class),
-					new \OC\AppFramework\Utility\TimeFactory()
-				);
-			}
-
-			return $backend;
-		});
-
-		$this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
-		$this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
-		$this->registerAlias(IVerificationToken::class, VerificationToken::class);
-
-		$this->registerAlias(ICrypto::class, Crypto::class);
-
-		$this->registerAlias(IHasher::class, Hasher::class);
-
-		$this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
-
-		$this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
-		$this->registerService(Connection::class, function (Server $c) {
-			$systemConfig = $c->get(SystemConfig::class);
-			$factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
-			if (!$factory->isValidType($type)) {
-				throw new \OC\DatabaseException('Invalid database type');
-			}
-			$connection = $factory->getConnection($type, []);
-			return $connection;
-		});
-
-		$this->registerAlias(ICertificateManager::class, CertificateManager::class);
-		$this->registerAlias(IClientService::class, ClientService::class);
-		$this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
-			return new NegativeDnsCache(
-				$c->get(ICacheFactory::class),
-			);
-		});
-		$this->registerDeprecatedAlias('HttpClientService', IClientService::class);
-		$this->registerService(IEventLogger::class, function (ContainerInterface $c) {
-			return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
-		});
-
-		$this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
-			$queryLogger = new QueryLogger();
-			if ($c->get(SystemConfig::class)->getValue('debug', false)) {
-				// In debug mode, module is being activated by default
-				$queryLogger->activate();
-			}
-			return $queryLogger;
-		});
-
-		$this->registerAlias(ITempManager::class, TempManager::class);
-		$this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
-
-		$this->registerService(IDateTimeFormatter::class, function (Server $c) {
-			$language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
-
-			return new DateTimeFormatter(
-				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
-			);
-		});
-
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
-			$mountCache = $c->get(UserMountCache::class);
-			$listener = new UserMountCacheListener($mountCache);
-			$listener->listen($c->get(IUserManager::class));
-			return $mountCache;
-		});
-
-		$this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
-			$loader = $c->get(IStorageFactory::class);
-			$mountCache = $c->get(IUserMountCache::class);
-			$eventLogger = $c->get(IEventLogger::class);
-			$manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
-
-			// builtin providers
-
-			$config = $c->get(\OCP\IConfig::class);
-			$logger = $c->get(LoggerInterface::class);
-			$objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
-			$manager->registerProvider(new CacheMountProvider($config));
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
-			$manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
-
-			return $manager;
-		});
-
-		$this->registerService(IBus::class, function (ContainerInterface $c) {
-			$busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
-			if ($busClass) {
-				[$app, $class] = explode('::', $busClass, 2);
-				if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
-					$c->get(IAppManager::class)->loadApp($app);
-					return $c->get($class);
-				} else {
-					throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
-				}
-			} else {
-				$jobList = $c->get(IJobList::class);
-				return new CronBus($jobList);
-			}
-		});
-		$this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
-		$this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
-		$this->registerAlias(IThrottler::class, Throttler::class);
-
-		$this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
-			$config = $c->get(\OCP\IConfig::class);
-			if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
-				&& ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
-			} else {
-				$backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
-			}
-
-			return $backend;
-		});
-
-		$this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
-		$this->registerService(Checker::class, function (ContainerInterface $c) {
-			// IConfig requires a working database. This code
-			// might however be called when Nextcloud is not yet setup.
-			if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
-				$config = $c->get(\OCP\IConfig::class);
-				$appConfig = $c->get(\OCP\IAppConfig::class);
-			} else {
-				$config = null;
-				$appConfig = null;
-			}
-
-			return new Checker(
-				$c->get(ServerVersion::class),
-				$c->get(EnvironmentHelper::class),
-				new FileAccessHelper(),
-				$config,
-				$appConfig,
-				$c->get(ICacheFactory::class),
-				$c->get(IAppManager::class),
-				$c->get(IMimeTypeDetector::class)
-			);
-		});
-		$this->registerService(Request::class, function (ContainerInterface $c) {
-			if (isset($this['urlParams'])) {
-				$urlParams = $this['urlParams'];
-			} else {
-				$urlParams = [];
-			}
-
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
-				&& in_array('fakeinput', stream_get_wrappers())
-			) {
-				$stream = 'fakeinput://data';
-			} else {
-				$stream = 'php://input';
-			}
-
-			return new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: '',
-					'urlParams' => $urlParams,
-				],
-				$this->get(IRequestId::class),
-				$this->get(\OCP\IConfig::class),
-				$this->get(CsrfTokenManager::class),
-				$stream
-			);
-		});
-		$this->registerAlias(\OCP\IRequest::class, Request::class);
-
-		$this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
-			return new RequestId(
-				$_SERVER['UNIQUE_ID'] ?? '',
-				$this->get(ISecureRandom::class)
-			);
-		});
-
-		/** @since 32.0.0 */
-		$this->registerAlias(IEmailValidator::class, EmailValidator::class);
-
-		$this->registerService(IMailer::class, function (Server $c) {
-			return new Mailer(
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class),
-				$c->get(Defaults::class),
-				$c->get(IURLGenerator::class),
-				$c->getL10N('lib'),
-				$c->get(IEventDispatcher::class),
-				$c->get(IFactory::class),
-				$c->get(IEmailValidator::class),
-			);
-		});
-
-		/** @since 30.0.0 */
-		$this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
-
-		$this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
-			if (is_null($factoryClass) || !class_exists($factoryClass)) {
-				return new NullLDAPProviderFactory($this);
-			}
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
-			return new $factoryClass($this);
-		});
-		$this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
-			$factory = $c->get(ILDAPProviderFactory::class);
-			return $factory->getLDAPProvider();
-		});
-		$this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
-			$ini = $c->get(IniGetWrapper::class);
-			$config = $c->get(\OCP\IConfig::class);
-			$ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
-			if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
-				/** @var \OC\Memcache\Factory $memcacheFactory */
-				$memcacheFactory = $c->get(ICacheFactory::class);
-				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
-					$timeFactory = $c->get(ITimeFactory::class);
-					return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
-				}
-				return new DBLockingProvider(
-					$c->get(IDBConnection::class),
-					new TimeFactory(),
-					$ttl,
-					!\OC::$CLI
-				);
-			}
-			return new NoopLockingProvider();
-		});
-
-		$this->registerService(ILockManager::class, function (Server $c): LockManager {
-			return new LockManager();
-		});
-
-		$this->registerAlias(ILockdownManager::class, 'LockdownManager');
-		$this->registerService(SetupManager::class, function ($c) {
-			// create the setupmanager through the mount manager to resolve the cyclic dependency
-			return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
-		});
-		$this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
-
-		$this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
-			return new \OC\Files\Type\Detection(
-				$c->get(IURLGenerator::class),
-				$c->get(LoggerInterface::class),
-				\OC::$configDir,
-				\OC::$SERVERROOT . '/resources/config/'
-			);
-		});
-
-		$this->registerAlias(IMimeTypeLoader::class, Loader::class);
-		$this->registerService(BundleFetcher::class, function () {
-			return new BundleFetcher($this->getL10N('lib'));
-		});
-		$this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
-
-		$this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
-			$manager = new CapabilitiesManager($c->get(LoggerInterface::class));
-			$manager->registerCapability(function () use ($c) {
-				return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
-			});
-			$manager->registerCapability(function () use ($c) {
-				return $c->get(\OC\Security\Bruteforce\Capabilities::class);
-			});
-			return $manager;
-		});
-
-		$this->registerService(ICommentsManager::class, function (Server $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
-			$factory = new $factoryClass($this);
-			$manager = $factory->getManager();
-
-			$manager->registerDisplayNameResolver('user', function ($id) use ($c) {
-				$manager = $c->get(IUserManager::class);
-				$userDisplayName = $manager->getDisplayName($id);
-				if ($userDisplayName === null) {
-					$l = $c->get(IFactory::class)->get('core');
-					return $l->t('Unknown account');
-				}
-				return $userDisplayName;
-			});
-
-			return $manager;
-		});
-
-		$this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
-		$this->registerService('ThemingDefaults', function (Server $c) {
-			try {
-				$classExists = class_exists('OCA\Theming\ThemingDefaults');
-			} catch (\OCP\AutoloadNotAllowedException $e) {
-				// App disabled or in maintenance mode
-				$classExists = false;
-			}
-
-			if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
-				$backgroundService = new BackgroundService(
-					$c->get(IRootFolder::class),
-					$c->get(IAppDataFactory::class)->get('theming'),
-					$c->get(IAppConfig::class),
-					$c->get(\OCP\IConfig::class),
-					$c->get(ISession::class)->get('user_id'),
-				);
-				$imageManager = new ImageManager(
-					$c->get(\OCP\IConfig::class),
-					$c->get(IAppDataFactory::class)->get('theming'),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					$c->get(LoggerInterface::class),
-					$c->get(ITempManager::class),
-					$backgroundService,
-				);
-				return new ThemingDefaults(
-					$c->get(\OCP\IConfig::class),
-					new AppConfig(
-						$c->get(\OCP\IConfig::class),
-						$c->get(\OCP\IAppConfig::class),
-						'theming',
-					),
-					$c->get(IFactory::class)->get('theming'),
-					$c->get(IUserSession::class),
-					$c->get(IURLGenerator::class),
-					$c->get(ICacheFactory::class),
-					new Util(
-						$c->get(ServerVersion::class),
-						$c->get(\OCP\IConfig::class),
-						$this->get(IAppManager::class),
-						$c->get(IAppDataFactory::class)->get('theming'),
-						$imageManager,
-					),
-					$imageManager,
-					$c->get(IAppManager::class),
-					$c->get(INavigationManager::class),
-					$backgroundService,
-				);
-			}
-			return new \OC_Defaults();
-		});
-		$this->registerService(JSCombiner::class, function (Server $c) {
-			return new JSCombiner(
-				$c->getAppDataDir('js'),
-				$c->get(IURLGenerator::class),
-				$this->get(ICacheFactory::class),
-				$c->get(\OCP\IConfig::class),
-				$c->get(LoggerInterface::class)
-			);
-		});
-		$this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
-
-		$this->registerService('CryptoWrapper', function (ContainerInterface $c) {
-			// FIXME: Instantiated here due to cyclic dependency
-			$request = new Request(
-				[
-					'get' => $_GET,
-					'post' => $_POST,
-					'files' => $_FILES,
-					'server' => $_SERVER,
-					'env' => $_ENV,
-					'cookies' => $_COOKIE,
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-						? $_SERVER['REQUEST_METHOD']
-						: null,
-				],
-				$c->get(IRequestId::class),
-				$c->get(\OCP\IConfig::class)
-			);
-
-			return new CryptoWrapper(
-				$c->get(ICrypto::class),
-				$c->get(ISecureRandom::class),
-				$request
-			);
-		});
-		$this->registerService(SessionStorage::class, function (ContainerInterface $c) {
-			return new SessionStorage($c->get(ISession::class));
-		});
-		$this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
-
-		$this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
-			$config = $c->get(\OCP\IConfig::class);
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
-			/** @var \OCP\Share\IProviderFactory $factory */
-			return $c->get($factoryClass);
-		});
-
-		$this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
-
-		$this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
-			$instance = new Collaboration\Collaborators\Search($c);
-
-			// register default plugins
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserByMailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
-			$instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
-
-			return $instance;
-		});
-		$this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
-
-		$this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
-
-		$this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
-		$this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
-
-		$this->registerAlias(IReferenceManager::class, ReferenceManager::class);
-		$this->registerAlias(ITeamManager::class, TeamManager::class);
-
-		$this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
-		$this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
-		$this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
-			return new \OC\Files\AppData\Factory(
-				$c->get(IRootFolder::class),
-				$c->get(SystemConfig::class)
-			);
-		});
-
-		$this->registerService('LockdownManager', function (ContainerInterface $c) {
-			return new LockdownManager(function () use ($c) {
-				return $c->get(ISession::class);
-			});
-		});
-
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
-			return new DiscoveryService(
-				$c->get(ICacheFactory::class),
-				$c->get(IClientService::class)
-			);
-		});
-		$this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
-
-		$this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
-			return new CloudIdManager(
-				$c->get(ICacheFactory::class),
-				$c->get(IEventDispatcher::class),
-				$c->get(\OCP\Contacts\IManager::class),
-				$c->get(IURLGenerator::class),
-				$c->get(IUserManager::class),
-			);
-		});
+    /** @var string */
+    private $webRoot;
+
+    /**
+     * @param string $webRoot
+     * @param \OC\Config $config
+     */
+    public function __construct($webRoot, \OC\Config $config) {
+        parent::__construct();
+        $this->webRoot = $webRoot;
+
+        // To find out if we are running from CLI or not
+        $this->registerParameter('isCLI', \OC::$CLI);
+        $this->registerParameter('serverRoot', \OC::$SERVERROOT);
+
+        $this->registerService(ContainerInterface::class, function (ContainerInterface $c) {
+            return $c;
+        });
+        $this->registerDeprecatedAlias(\OCP\IServerContainer::class, ContainerInterface::class);
+
+        $this->registerAlias(\OCP\Calendar\IManager::class, \OC\Calendar\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Resource\IManager::class, \OC\Calendar\Resource\Manager::class);
+
+        $this->registerAlias(\OCP\Calendar\Room\IManager::class, \OC\Calendar\Room\Manager::class);
+
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
+
+        $this->registerAlias(\OCP\ContextChat\IContentManager::class, \OC\ContextChat\ContentManager::class);
+
+        $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class);
+        $this->registerAlias(ITemplateManager::class, TemplateManager::class);
+        $this->registerAlias(\OCP\Template\ITemplateManager::class, \OC\Template\TemplateManager::class);
+
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
+
+        $this->registerService(View::class, function (Server $c) {
+            return new View();
+        }, false);
+
+        $this->registerService(IPreview::class, function (ContainerInterface $c) {
+            return new PreviewManager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(IRootFolder::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(GeneratorHelper::class),
+                $c->get(ISession::class)->get('user_id'),
+                $c->get(Coordinator::class),
+                $c->get(IServerContainer::class),
+                $c->get(IBinaryFinder::class),
+                $c->get(IMagickSupport::class)
+            );
+        });
+        $this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
+
+        $this->registerService(Watcher::class, function (ContainerInterface $c): Watcher {
+            return new Watcher(
+                $c->get(\OC\Preview\Storage\StorageFactory::class),
+                $c->get(PreviewMapper::class),
+                $c->get(IDBConnection::class),
+            );
+        });
+
+        $this->registerService(IProfiler::class, function (Server $c) {
+            return new Profiler($c->get(SystemConfig::class));
+        });
+
+        $this->registerService(Encryption\Manager::class, function (Server $c): Encryption\Manager {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\Manager(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->getL10N('core'),
+                new View(),
+                $util,
+                new ArrayCache()
+            );
+        });
+        $this->registerAlias(\OCP\Encryption\IManager::class, Encryption\Manager::class);
+
+        $this->registerService(IFile::class, function (ContainerInterface $c) {
+            $util = new Encryption\Util(
+                new View(),
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+            return new Encryption\File(
+                $util,
+                $c->get(IRootFolder::class),
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
+
+        $this->registerService(IStorage::class, function (ContainerInterface $c) {
+            $view = new View();
+            $util = new Encryption\Util(
+                $view,
+                $c->get(IUserManager::class),
+                $c->get(IGroupManager::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new Encryption\Keys\Storage(
+                $view,
+                $util,
+                $c->get(ICrypto::class),
+                $c->get(\OCP\IConfig::class)
+            );
+        });
+
+        $this->registerAlias(\OCP\ITagManager::class, TagManager::class);
+
+        $this->registerService('SystemTagManagerFactory', function (ContainerInterface $c) {
+            /** @var \OCP\IConfig $config */
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', SystemTagManagerFactory::class);
+            return new $factoryClass($this);
+        });
+        $this->registerService(ISystemTagManager::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getManager();
+        });
+        /** @deprecated 19.0.0 */
+        $this->registerDeprecatedAlias('SystemTagManager', ISystemTagManager::class);
+
+        $this->registerService(ISystemTagObjectMapper::class, function (ContainerInterface $c) {
+            return $c->get('SystemTagManagerFactory')->getObjectMapper();
+        });
+        $this->registerAlias(IFileAccess::class, FileAccess::class);
+        $this->registerService('RootFolder', function (ContainerInterface $c) {
+            $manager = \OC\Files\Filesystem::getMountManager();
+            $view = new View();
+            /** @var IUserSession $userSession */
+            $userSession = $c->get(IUserSession::class);
+            $root = new Root(
+                $manager,
+                $view,
+                $userSession->getUser(),
+                $c->get(IUserMountCache::class),
+                $this->get(LoggerInterface::class),
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IAppConfig::class),
+            );
+
+            $previewConnector = new \OC\Preview\WatcherConnector(
+                $root,
+                $c->get(SystemConfig::class),
+                $this->get(IEventDispatcher::class)
+            );
+            $previewConnector->connectWatcher();
+
+            return $root;
+        });
+        $this->registerService(HookConnector::class, function (ContainerInterface $c) {
+            return new HookConnector(
+                $c->get(IRootFolder::class),
+                new View(),
+                $c->get(IEventDispatcher::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+
+        $this->registerService(IRootFolder::class, function (ContainerInterface $c) {
+            return new LazyRoot(function () use ($c) {
+                return $c->get('RootFolder');
+            });
+        });
+
+        $this->registerAlias(\OCP\IUserManager::class, \OC\User\Manager::class);
+
+        $this->registerService(DisplayNameCache::class, function (ContainerInterface $c) {
+            return $c->get(\OC\User\Manager::class)->getDisplayNameCache();
+        });
+
+        $this->registerService(\OCP\IGroupManager::class, function (ContainerInterface $c) {
+            $groupManager = new \OC\Group\Manager(
+                $this->get(IUserManager::class),
+                $this->get(IEventDispatcher::class),
+                $this->get(LoggerInterface::class),
+                $this->get(ICacheFactory::class),
+                $this->get(IRemoteAddress::class),
+            );
+            return $groupManager;
+        });
+
+        $this->registerService(Store::class, function (ContainerInterface $c) {
+            $session = $c->get(ISession::class);
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $tokenProvider = $c->get(IProvider::class);
+            } else {
+                $tokenProvider = null;
+            }
+            $logger = $c->get(LoggerInterface::class);
+            $crypto = $c->get(ICrypto::class);
+            return new Store($session, $logger, $crypto, $tokenProvider);
+        });
+        $this->registerAlias(IStore::class, Store::class);
+        $this->registerAlias(IProvider::class, Authentication\Token\Manager::class);
+        $this->registerAlias(OCPIProvider::class, Authentication\Token\Manager::class);
+
+        $this->registerService(\OC\User\Session::class, function (Server $c) {
+            $manager = $c->get(IUserManager::class);
+            $session = new \OC\Session\Memory();
+            $timeFactory = new TimeFactory();
+            // Token providers might require a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $provider = $c->get(IProvider::class);
+            } else {
+                $provider = null;
+            }
+
+            $userSession = new \OC\User\Session(
+                $manager,
+                $session,
+                $timeFactory,
+                $provider,
+                $c->get(\OCP\IConfig::class),
+                $c->get(ISecureRandom::class),
+                $c->get('LockdownManager'),
+                $c->get(LoggerInterface::class),
+                $c->get(IEventDispatcher::class),
+            );
+            /** @deprecated 21.0.0 use BeforeUserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_createUser', ['run' => true, 'uid' => $uid, 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use UserCreatedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_createUser', ['uid' => $user->getUID(), 'password' => $password]);
+            });
+            /** @deprecated 21.0.0 use BeforeUserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', ['run' => true, 'uid' => $user->getUID()]);
+            });
+            /** @deprecated 21.0.0 use UserDeletedEvent event with the IEventDispatcher instead */
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_deleteUser', ['uid' => $user->getUID()]);
+            });
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'pre_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_setPassword', ['run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword]);
+            });
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
+                \OC_Hook::emit('OC_User', 'pre_login', ['run' => true, 'uid' => $uid, 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password));
+            });
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $loginName, $password, $isTokenLogin) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'loginName' => $loginName, 'password' => $password, 'isTokenLogin' => $isTokenLogin]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInEvent($user, $loginName, $password, $isTokenLogin));
+            });
+            $userSession->listen('\OC\User', 'preRememberedLogin', function ($uid) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedInWithCookieEvent($uid));
+            });
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'post_login', ['run' => true, 'uid' => $user->getUID(), 'password' => $password]);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedInWithCookieEvent($user, $password));
+            });
+            $userSession->listen('\OC\User', 'logout', function ($user) {
+                \OC_Hook::emit('OC_User', 'logout', []);
+
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new BeforeUserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'postLogout', function ($user) {
+                /** @var IEventDispatcher $dispatcher */
+                $dispatcher = $this->get(IEventDispatcher::class);
+                $dispatcher->dispatchTyped(new UserLoggedOutEvent($user));
+            });
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
+                /** @var \OC\User\User $user */
+                \OC_Hook::emit('OC_User', 'changeUser', ['run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue]);
+            });
+            return $userSession;
+        });
+        $this->registerAlias(\OCP\IUserSession::class, \OC\User\Session::class);
+
+        $this->registerAlias(\OCP\Authentication\TwoFactorAuth\IRegistry::class, \OC\Authentication\TwoFactorAuth\Registry::class);
+
+        $this->registerAlias(INavigationManager::class, \OC\NavigationManager::class);
+
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
+
+        $this->registerService(\OC\SystemConfig::class, function ($c) use ($config) {
+            return new \OC\SystemConfig($config);
+        });
+
+        $this->registerAlias(IAppConfig::class, \OC\AppConfig::class);
+        $this->registerAlias(IUserConfig::class, \OC\Config\UserConfig::class);
+        $this->registerAlias(IAppManager::class, AppManager::class);
+
+        $this->registerService(IFactory::class, function (Server $c) {
+            return new \OC\L10N\Factory(
+                $c->get(\OCP\IConfig::class),
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(ICacheFactory::class),
+                \OC::$SERVERROOT,
+                $c->get(IAppManager::class),
+            );
+        });
+
+        $this->registerAlias(IURLGenerator::class, URLGenerator::class);
+
+        $this->registerAlias(ICache::class, Cache\File::class);
+        $this->registerService(Factory::class, function (Server $c) {
+            $profiler = $c->get(IProfiler::class);
+            $logger = $c->get(LoggerInterface::class);
+            $serverVersion = $c->get(ServerVersion::class);
+            /** @var SystemConfig $config */
+            $config = $c->get(SystemConfig::class);
+            if (!$config->getValue('installed', false) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                return new \OC\Memcache\Factory(
+                    $logger,
+                    $profiler,
+                    $serverVersion,
+                    ArrayCache::class,
+                    ArrayCache::class,
+                    ArrayCache::class
+                );
+            }
+
+            return new \OC\Memcache\Factory(
+                $logger,
+                $profiler,
+                $serverVersion,
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.local', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.distributed', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('memcache.locking', null),
+                /** @psalm-taint-escape callable */
+                $config->getValue('redis_log_file')
+            );
+        });
+        $this->registerAlias(ICacheFactory::class, Factory::class);
+
+        $this->registerService('RedisFactory', function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            return new RedisFactory($systemConfig, $c->get(IEventLogger::class));
+        });
+
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
+            $l10n = $this->get(IFactory::class)->get('lib');
+            return new \OC\Activity\Manager(
+                $c->getRequest(),
+                $c->get(IUserSession::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IValidator::class),
+                $c->get(IRichTextFormatter::class),
+                $l10n,
+                $c->get(ITimeFactory::class),
+            );
+        });
+
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
+            return new \OC\Activity\EventMerger(
+                $c->getL10N('lib')
+            );
+        });
+        $this->registerAlias(IValidator::class, Validator::class);
+
+        $this->registerService(AvatarManager::class, function (Server $c) {
+            return new AvatarManager(
+                $c->get(IUserSession::class),
+                $c->get(\OC\User\Manager::class),
+                $c->getAppDataDir('avatar'),
+                $c->getL10N('lib'),
+                $c->get(LoggerInterface::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(IAccountManager::class),
+                $c->get(KnownUserService::class)
+            );
+        });
+
+        $this->registerAlias(IAvatarManager::class, AvatarManager::class);
+
+        $this->registerAlias(\OCP\Support\CrashReport\IRegistry::class, \OC\Support\CrashReport\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IRegistry::class, \OC\Support\Subscription\Registry::class);
+        $this->registerAlias(\OCP\Support\Subscription\IAssertion::class, \OC\Support\Subscription\Assertion::class);
+
+        /** Only used by the PsrLoggerAdapter should not be used by apps */
+        $this->registerService(\OC\Log::class, function (Server $c) {
+            $logType = $c->get(AllConfig::class)->getSystemValue('log_type', 'file');
+            $factory = new LogFactory($c, $this->get(SystemConfig::class));
+            $logger = $factory->get($logType);
+            $registry = $c->get(\OCP\Support\CrashReport\IRegistry::class);
+
+            return new Log($logger, $this->get(SystemConfig::class), crashReporters: $registry);
+        });
+        // PSR-3 logger
+        $this->registerAlias(LoggerInterface::class, PsrLoggerAdapter::class);
+
+        $this->registerService(ILogFactory::class, function (Server $c) {
+            return new LogFactory($c, $this->get(SystemConfig::class));
+        });
+
+        $this->registerAlias(IJobList::class, \OC\BackgroundJob\JobList::class);
+
+        $this->registerService(Router::class, function (Server $c) {
+            $cacheFactory = $c->get(ICacheFactory::class);
+            if ($cacheFactory->isLocalCacheAvailable()) {
+                $router = $c->resolve(CachingRouter::class);
+            } else {
+                $router = $c->resolve(Router::class);
+            }
+            return $router;
+        });
+        $this->registerAlias(IRouter::class, Router::class);
+
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = new \OC\Security\RateLimiting\Backend\MemoryCacheBackend(
+                    $c->get(AllConfig::class),
+                    $this->get(ICacheFactory::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            } else {
+                $backend = new \OC\Security\RateLimiting\Backend\DatabaseBackend(
+                    $c->get(AllConfig::class),
+                    $c->get(IDBConnection::class),
+                    new \OC\AppFramework\Utility\TimeFactory()
+                );
+            }
+
+            return $backend;
+        });
+
+        $this->registerAlias(\OCP\Security\ISecureRandom::class, SecureRandom::class);
+        $this->registerAlias(\OCP\Security\IRemoteHostValidator::class, \OC\Security\RemoteHostValidator::class);
+        $this->registerAlias(IVerificationToken::class, VerificationToken::class);
+
+        $this->registerAlias(ICrypto::class, Crypto::class);
+
+        $this->registerAlias(IHasher::class, Hasher::class);
+
+        $this->registerAlias(ICredentialsManager::class, CredentialsManager::class);
+
+        $this->registerAlias(IDBConnection::class, ConnectionAdapter::class);
+        $this->registerService(Connection::class, function (Server $c) {
+            $systemConfig = $c->get(SystemConfig::class);
+            $factory = new \OC\DB\ConnectionFactory($systemConfig, $c->get(ICacheFactory::class));
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
+            if (!$factory->isValidType($type)) {
+                throw new \OC\DatabaseException('Invalid database type');
+            }
+            $connection = $factory->getConnection($type, []);
+            return $connection;
+        });
+
+        $this->registerAlias(ICertificateManager::class, CertificateManager::class);
+        $this->registerAlias(IClientService::class, ClientService::class);
+        $this->registerService(NegativeDnsCache::class, function (ContainerInterface $c) {
+            return new NegativeDnsCache(
+                $c->get(ICacheFactory::class),
+            );
+        });
+        $this->registerDeprecatedAlias('HttpClientService', IClientService::class);
+        $this->registerService(IEventLogger::class, function (ContainerInterface $c) {
+            return new EventLogger($c->get(SystemConfig::class), $c->get(LoggerInterface::class), $c->get(Log::class));
+        });
+
+        $this->registerService(IQueryLogger::class, function (ContainerInterface $c) {
+            $queryLogger = new QueryLogger();
+            if ($c->get(SystemConfig::class)->getValue('debug', false)) {
+                // In debug mode, module is being activated by default
+                $queryLogger->activate();
+            }
+            return $queryLogger;
+        });
+
+        $this->registerAlias(ITempManager::class, TempManager::class);
+        $this->registerAlias(IDateTimeZone::class, DateTimeZone::class);
+
+        $this->registerService(IDateTimeFormatter::class, function (Server $c) {
+            $language = $c->get(\OCP\IConfig::class)->getUserValue($c->get(ISession::class)->get('user_id'), 'core', 'lang', null);
+
+            return new DateTimeFormatter(
+                $c->get(IDateTimeZone::class)->getTimeZone(),
+                $c->getL10N('lib', $language)
+            );
+        });
+
+        $this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+            $mountCache = $c->get(UserMountCache::class);
+            $listener = new UserMountCacheListener($mountCache);
+            $listener->listen($c->get(IUserManager::class));
+            return $mountCache;
+        });
+
+        $this->registerService(IMountProviderCollection::class, function (ContainerInterface $c) {
+            $loader = $c->get(IStorageFactory::class);
+            $mountCache = $c->get(IUserMountCache::class);
+            $eventLogger = $c->get(IEventLogger::class);
+            $manager = new MountProviderCollection($loader, $mountCache, $eventLogger);
+
+            // builtin providers
+
+            $config = $c->get(\OCP\IConfig::class);
+            $logger = $c->get(LoggerInterface::class);
+            $objectStoreConfig = $c->get(PrimaryObjectStoreConfig::class);
+            $manager->registerProvider(new CacheMountProvider($config));
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($objectStoreConfig));
+            $manager->registerRootProvider(new RootMountProvider($objectStoreConfig, $config));
+
+            return $manager;
+        });
+
+        $this->registerService(IBus::class, function (ContainerInterface $c) {
+            $busClass = $c->get(\OCP\IConfig::class)->getSystemValueString('commandbus');
+            if ($busClass) {
+                [$app, $class] = explode('::', $busClass, 2);
+                if ($c->get(IAppManager::class)->isEnabledForUser($app)) {
+                    $c->get(IAppManager::class)->loadApp($app);
+                    return $c->get($class);
+                } else {
+                    throw new ServiceUnavailableException("The app providing the command bus ($app) is not enabled");
+                }
+            } else {
+                $jobList = $c->get(IJobList::class);
+                return new CronBus($jobList);
+            }
+        });
+        $this->registerDeprecatedAlias('AsyncCommandBus', IBus::class);
+        $this->registerAlias(ITrustedDomainHelper::class, TrustedDomainHelper::class);
+        $this->registerAlias(IThrottler::class, Throttler::class);
+
+        $this->registerService(\OC\Security\Bruteforce\Backend\IBackend::class, function ($c) {
+            $config = $c->get(\OCP\IConfig::class);
+            if (!$config->getSystemValueBool('auth.bruteforce.protection.force.database', false)
+                && ltrim($config->getSystemValueString('memcache.distributed', ''), '\\') === \OC\Memcache\Redis::class) {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\MemoryCacheBackend::class);
+            } else {
+                $backend = $c->get(\OC\Security\Bruteforce\Backend\DatabaseBackend::class);
+            }
+
+            return $backend;
+        });
+
+        $this->registerDeprecatedAlias('IntegrityCodeChecker', Checker::class);
+        $this->registerService(Checker::class, function (ContainerInterface $c) {
+            // IConfig requires a working database. This code
+            // might however be called when Nextcloud is not yet setup.
+            if (\OC::$server->get(SystemConfig::class)->getValue('installed', false)) {
+                $config = $c->get(\OCP\IConfig::class);
+                $appConfig = $c->get(\OCP\IAppConfig::class);
+            } else {
+                $config = null;
+                $appConfig = null;
+            }
+
+            return new Checker(
+                $c->get(ServerVersion::class),
+                $c->get(EnvironmentHelper::class),
+                new FileAccessHelper(),
+                $config,
+                $appConfig,
+                $c->get(ICacheFactory::class),
+                $c->get(IAppManager::class),
+                $c->get(IMimeTypeDetector::class)
+            );
+        });
+        $this->registerService(Request::class, function (ContainerInterface $c) {
+            if (isset($this['urlParams'])) {
+                $urlParams = $this['urlParams'];
+            } else {
+                $urlParams = [];
+            }
+
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
+                && in_array('fakeinput', stream_get_wrappers())
+            ) {
+                $stream = 'fakeinput://data';
+            } else {
+                $stream = 'php://input';
+            }
+
+            return new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : '',
+                    'urlParams' => $urlParams,
+                ],
+                $this->get(IRequestId::class),
+                $this->get(\OCP\IConfig::class),
+                $this->get(CsrfTokenManager::class),
+                $stream
+            );
+        });
+        $this->registerAlias(\OCP\IRequest::class, Request::class);
+
+        $this->registerService(IRequestId::class, function (ContainerInterface $c): IRequestId {
+            return new RequestId(
+                $_SERVER['UNIQUE_ID'] ?? '',
+                $this->get(ISecureRandom::class)
+            );
+        });
+
+        /** @since 32.0.0 */
+        $this->registerAlias(IEmailValidator::class, EmailValidator::class);
+
+        $this->registerService(IMailer::class, function (Server $c) {
+            return new Mailer(
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class),
+                $c->get(Defaults::class),
+                $c->get(IURLGenerator::class),
+                $c->getL10N('lib'),
+                $c->get(IEventDispatcher::class),
+                $c->get(IFactory::class),
+                $c->get(IEmailValidator::class),
+            );
+        });
+
+        /** @since 30.0.0 */
+        $this->registerAlias(\OCP\Mail\Provider\IManager::class, \OC\Mail\Provider\Manager::class);
+
+        $this->registerService(ILDAPProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
+            if (is_null($factoryClass) || !class_exists($factoryClass)) {
+                return new NullLDAPProviderFactory($this);
+            }
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
+            return new $factoryClass($this);
+        });
+        $this->registerService(ILDAPProvider::class, function (ContainerInterface $c) {
+            $factory = $c->get(ILDAPProviderFactory::class);
+            return $factory->getLDAPProvider();
+        });
+        $this->registerService(ILockingProvider::class, function (ContainerInterface $c) {
+            $ini = $c->get(IniGetWrapper::class);
+            $config = $c->get(\OCP\IConfig::class);
+            $ttl = $config->getSystemValueInt('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
+            if ($config->getSystemValueBool('filelocking.enabled', true) || (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+                /** @var \OC\Memcache\Factory $memcacheFactory */
+                $memcacheFactory = $c->get(ICacheFactory::class);
+                $memcache = $memcacheFactory->createLocking('lock');
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
+                    $timeFactory = $c->get(ITimeFactory::class);
+                    return new MemcacheLockingProvider($memcache, $timeFactory, $ttl);
+                }
+                return new DBLockingProvider(
+                    $c->get(IDBConnection::class),
+                    new TimeFactory(),
+                    $ttl,
+                    !\OC::$CLI
+                );
+            }
+            return new NoopLockingProvider();
+        });
+
+        $this->registerService(ILockManager::class, function (Server $c): LockManager {
+            return new LockManager();
+        });
+
+        $this->registerAlias(ILockdownManager::class, 'LockdownManager');
+        $this->registerService(SetupManager::class, function ($c) {
+            // create the setupmanager through the mount manager to resolve the cyclic dependency
+            return $c->get(\OC\Files\Mount\Manager::class)->getSetupManager();
+        });
+        $this->registerAlias(IMountManager::class, \OC\Files\Mount\Manager::class);
+
+        $this->registerService(IMimeTypeDetector::class, function (ContainerInterface $c) {
+            return new \OC\Files\Type\Detection(
+                $c->get(IURLGenerator::class),
+                $c->get(LoggerInterface::class),
+                \OC::$configDir,
+                \OC::$SERVERROOT . '/resources/config/'
+            );
+        });
+
+        $this->registerAlias(IMimeTypeLoader::class, Loader::class);
+        $this->registerService(BundleFetcher::class, function () {
+            return new BundleFetcher($this->getL10N('lib'));
+        });
+        $this->registerAlias(\OCP\Notification\IManager::class, Manager::class);
+
+        $this->registerService(CapabilitiesManager::class, function (ContainerInterface $c) {
+            $manager = new CapabilitiesManager($c->get(LoggerInterface::class));
+            $manager->registerCapability(function () use ($c) {
+                return new \OC\OCS\CoreCapabilities($c->get(\OCP\IConfig::class));
+            });
+            $manager->registerCapability(function () use ($c) {
+                return $c->get(\OC\Security\Bruteforce\Capabilities::class);
+            });
+            return $manager;
+        });
+
+        $this->registerService(ICommentsManager::class, function (Server $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('comments.managerFactory', CommentsManagerFactory::class);
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
+            $factory = new $factoryClass($this);
+            $manager = $factory->getManager();
+
+            $manager->registerDisplayNameResolver('user', function ($id) use ($c) {
+                $manager = $c->get(IUserManager::class);
+                $userDisplayName = $manager->getDisplayName($id);
+                if ($userDisplayName === null) {
+                    $l = $c->get(IFactory::class)->get('core');
+                    return $l->t('Unknown account');
+                }
+                return $userDisplayName;
+            });
+
+            return $manager;
+        });
+
+        $this->registerAlias(\OC_Defaults::class, 'ThemingDefaults');
+        $this->registerService('ThemingDefaults', function (Server $c) {
+            try {
+                $classExists = class_exists('OCA\Theming\ThemingDefaults');
+            } catch (\OCP\AutoloadNotAllowedException $e) {
+                // App disabled or in maintenance mode
+                $classExists = false;
+            }
+
+            if ($classExists && $c->get(\OCP\IConfig::class)->getSystemValueBool('installed', false) && $c->get(IAppManager::class)->isEnabledForAnyone('theming') && $c->get(TrustedDomainHelper::class)->isTrustedDomain($c->getRequest()->getInsecureServerHost())) {
+                $backgroundService = new BackgroundService(
+                    $c->get(IRootFolder::class),
+                    $c->get(IAppDataFactory::class)->get('theming'),
+                    $c->get(IAppConfig::class),
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(ISession::class)->get('user_id'),
+                );
+                $imageManager = new ImageManager(
+                    $c->get(\OCP\IConfig::class),
+                    $c->get(IAppDataFactory::class)->get('theming'),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    $c->get(LoggerInterface::class),
+                    $c->get(ITempManager::class),
+                    $backgroundService,
+                );
+                return new ThemingDefaults(
+                    $c->get(\OCP\IConfig::class),
+                    new AppConfig(
+                        $c->get(\OCP\IConfig::class),
+                        $c->get(\OCP\IAppConfig::class),
+                        'theming',
+                    ),
+                    $c->get(IFactory::class)->get('theming'),
+                    $c->get(IUserSession::class),
+                    $c->get(IURLGenerator::class),
+                    $c->get(ICacheFactory::class),
+                    new Util(
+                        $c->get(ServerVersion::class),
+                        $c->get(\OCP\IConfig::class),
+                        $this->get(IAppManager::class),
+                        $c->get(IAppDataFactory::class)->get('theming'),
+                        $imageManager,
+                    ),
+                    $imageManager,
+                    $c->get(IAppManager::class),
+                    $c->get(INavigationManager::class),
+                    $backgroundService,
+                );
+            }
+            return new \OC_Defaults();
+        });
+        $this->registerService(JSCombiner::class, function (Server $c) {
+            return new JSCombiner(
+                $c->getAppDataDir('js'),
+                $c->get(IURLGenerator::class),
+                $this->get(ICacheFactory::class),
+                $c->get(\OCP\IConfig::class),
+                $c->get(LoggerInterface::class)
+            );
+        });
+        $this->registerAlias(\OCP\EventDispatcher\IEventDispatcher::class, \OC\EventDispatcher\EventDispatcher::class);
+
+        $this->registerService('CryptoWrapper', function (ContainerInterface $c) {
+            // FIXME: Instantiated here due to cyclic dependency
+            $request = new Request(
+                [
+                    'get' => $_GET,
+                    'post' => $_POST,
+                    'files' => $_FILES,
+                    'server' => $_SERVER,
+                    'env' => $_ENV,
+                    'cookies' => $_COOKIE,
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+                        ? $_SERVER['REQUEST_METHOD']
+                        : null,
+                ],
+                $c->get(IRequestId::class),
+                $c->get(\OCP\IConfig::class)
+            );
+
+            return new CryptoWrapper(
+                $c->get(ICrypto::class),
+                $c->get(ISecureRandom::class),
+                $request
+            );
+        });
+        $this->registerService(SessionStorage::class, function (ContainerInterface $c) {
+            return new SessionStorage($c->get(ISession::class));
+        });
+        $this->registerAlias(\OCP\Security\IContentSecurityPolicyManager::class, ContentSecurityPolicyManager::class);
+
+        $this->registerService(IProviderFactory::class, function (ContainerInterface $c) {
+            $config = $c->get(\OCP\IConfig::class);
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', ProviderFactory::class);
+            /** @var \OCP\Share\IProviderFactory $factory */
+            return $c->get($factoryClass);
+        });
+
+        $this->registerAlias(\OCP\Share\IManager::class, \OC\Share20\Manager::class);
+
+        $this->registerService(\OCP\Collaboration\Collaborators\ISearch::class, function (Server $c) {
+            $instance = new Collaboration\Collaborators\Search($c);
+
+            // register default plugins
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_USER', 'class' => UserByMailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_GROUP', 'class' => GroupPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_EMAIL', 'class' => MailByMailPlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE', 'class' => RemotePlugin::class]);
+            $instance->registerPlugin(['shareType' => 'SHARE_TYPE_REMOTE_GROUP', 'class' => RemoteGroupPlugin::class]);
+
+            return $instance;
+        });
+        $this->registerAlias(\OCP\Collaboration\Collaborators\ISearchResult::class, \OC\Collaboration\Collaborators\SearchResult::class);
+
+        $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class);
+
+        $this->registerAlias(\OCP\Collaboration\Resources\IProviderManager::class, \OC\Collaboration\Resources\ProviderManager::class);
+        $this->registerAlias(\OCP\Collaboration\Resources\IManager::class, \OC\Collaboration\Resources\Manager::class);
+
+        $this->registerAlias(IReferenceManager::class, ReferenceManager::class);
+        $this->registerAlias(ITeamManager::class, TeamManager::class);
+
+        $this->registerDeprecatedAlias('SettingsManager', \OC\Settings\Manager::class);
+        $this->registerAlias(\OCP\Settings\IManager::class, \OC\Settings\Manager::class);
+        $this->registerService(\OC\Files\AppData\Factory::class, function (ContainerInterface $c) {
+            return new \OC\Files\AppData\Factory(
+                $c->get(IRootFolder::class),
+                $c->get(SystemConfig::class)
+            );
+        });
+
+        $this->registerService('LockdownManager', function (ContainerInterface $c) {
+            return new LockdownManager(function () use ($c) {
+                return $c->get(ISession::class);
+            });
+        });
+
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (ContainerInterface $c) {
+            return new DiscoveryService(
+                $c->get(ICacheFactory::class),
+                $c->get(IClientService::class)
+            );
+        });
+        $this->registerAlias(IOCMDiscoveryService::class, OCMDiscoveryService::class);
+
+        $this->registerService(ICloudIdManager::class, function (ContainerInterface $c) {
+            return new CloudIdManager(
+                $c->get(ICacheFactory::class),
+                $c->get(IEventDispatcher::class),
+                $c->get(\OCP\Contacts\IManager::class),
+                $c->get(IURLGenerator::class),
+                $c->get(IUserManager::class),
+            );
+        });
 
-		$this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
-		$this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
-		$this->registerService(ICloudFederationFactory::class, function (Server $c) {
-			return new CloudFederationFactory();
-		});
+        $this->registerAlias(\OCP\GlobalScale\IConfig::class, \OC\GlobalScale\Config::class);
+        $this->registerAlias(ICloudFederationProviderManager::class, CloudFederationProviderManager::class);
+        $this->registerService(ICloudFederationFactory::class, function (Server $c) {
+            return new CloudFederationFactory();
+        });
 
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
 
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
-		$this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
+        $this->registerAlias(\Psr\Clock\ClockInterface::class, \OCP\AppFramework\Utility\ITimeFactory::class);
 
-		$this->registerService(Defaults::class, function (Server $c) {
-			return new Defaults(
-				$c->get('ThemingDefaults')
-			);
-		});
+        $this->registerService(Defaults::class, function (Server $c) {
+            return new Defaults(
+                $c->get('ThemingDefaults')
+            );
+        });
 
-		$this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
-			return $c->get(\OCP\IUserSession::class)->getSession();
-		}, false);
+        $this->registerService(\OCP\ISession::class, function (ContainerInterface $c) {
+            return $c->get(\OCP\IUserSession::class)->getSession();
+        }, false);
 
-		$this->registerService(IShareHelper::class, function (ContainerInterface $c) {
-			return new ShareHelper(
-				$c->get(\OCP\Share\IManager::class)
-			);
-		});
+        $this->registerService(IShareHelper::class, function (ContainerInterface $c) {
+            return new ShareHelper(
+                $c->get(\OCP\Share\IManager::class)
+            );
+        });
 
-		$this->registerService(IApiFactory::class, function (ContainerInterface $c) {
-			return new ApiFactory($c->get(IClientService::class));
-		});
+        $this->registerService(IApiFactory::class, function (ContainerInterface $c) {
+            return new ApiFactory($c->get(IClientService::class));
+        });
 
-		$this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
-			$memcacheFactory = $c->get(ICacheFactory::class);
-			return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
-		});
+        $this->registerService(IInstanceFactory::class, function (ContainerInterface $c) {
+            $memcacheFactory = $c->get(ICacheFactory::class);
+            return new InstanceFactory($memcacheFactory->createLocal('remoteinstance.'), $c->get(IClientService::class));
+        });
 
-		$this->registerAlias(IContactsStore::class, ContactsStore::class);
-		$this->registerAlias(IAccountManager::class, AccountManager::class);
+        $this->registerAlias(IContactsStore::class, ContactsStore::class);
+        $this->registerAlias(IAccountManager::class, AccountManager::class);
 
-		$this->registerAlias(IStorageFactory::class, StorageFactory::class);
+        $this->registerAlias(IStorageFactory::class, StorageFactory::class);
 
-		$this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
+        $this->registerAlias(\OCP\Dashboard\IManager::class, \OC\Dashboard\Manager::class);
 
-		$this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
-		$this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
+        $this->registerAlias(IFullTextSearchManager::class, FullTextSearchManager::class);
+        $this->registerAlias(IFilesMetadataManager::class, FilesMetadataManager::class);
 
-		$this->registerAlias(ISubAdmin::class, SubAdmin::class);
+        $this->registerAlias(ISubAdmin::class, SubAdmin::class);
 
-		$this->registerAlias(IInitialStateService::class, InitialStateService::class);
+        $this->registerAlias(IInitialStateService::class, InitialStateService::class);
 
-		$this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
+        $this->registerAlias(\OCP\IEmojiHelper::class, \OC\EmojiHelper::class);
 
-		$this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
+        $this->registerAlias(\OCP\UserStatus\IManager::class, \OC\UserStatus\Manager::class);
 
-		$this->registerAlias(IBroker::class, Broker::class);
+        $this->registerAlias(IBroker::class, Broker::class);
 
-		$this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
+        $this->registerAlias(\OCP\Files\AppData\IAppDataFactory::class, \OC\Files\AppData\Factory::class);
 
-		$this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
+        $this->registerAlias(\OCP\Files\IFilenameValidator::class, \OC\Files\FilenameValidator::class);
 
-		$this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
+        $this->registerAlias(IBinaryFinder::class, BinaryFinder::class);
 
-		$this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
+        $this->registerAlias(\OCP\Share\IPublicShareTemplateFactory::class, \OC\Share20\PublicShareTemplateFactory::class);
 
-		$this->registerAlias(ITranslationManager::class, TranslationManager::class);
+        $this->registerAlias(ITranslationManager::class, TranslationManager::class);
 
-		$this->registerAlias(IConversionManager::class, ConversionManager::class);
+        $this->registerAlias(IConversionManager::class, ConversionManager::class);
 
-		$this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
+        $this->registerAlias(ISpeechToTextManager::class, SpeechToTextManager::class);
 
-		$this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
+        $this->registerAlias(IEventSourceFactory::class, EventSourceFactory::class);
 
-		$this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
+        $this->registerAlias(\OCP\TextProcessing\IManager::class, \OC\TextProcessing\Manager::class);
 
-		$this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
+        $this->registerAlias(\OCP\TextToImage\IManager::class, \OC\TextToImage\Manager::class);
 
-		$this->registerAlias(ILimiter::class, Limiter::class);
+        $this->registerAlias(ILimiter::class, Limiter::class);
 
-		$this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
+        $this->registerAlias(IPhoneNumberUtil::class, PhoneNumberUtil::class);
 
-		// there is no reason for having OCMProvider as a Service
-		$this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
-		$this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
+        // there is no reason for having OCMProvider as a Service
+        $this->registerDeprecatedAlias(ICapabilityAwareOCMProvider::class, OCMProvider::class);
+        $this->registerDeprecatedAlias(IOCMProvider::class, OCMProvider::class);
 
-		$this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
+        $this->registerAlias(ISetupCheckManager::class, SetupCheckManager::class);
 
-		$this->registerAlias(IProfileManager::class, ProfileManager::class);
+        $this->registerAlias(IProfileManager::class, ProfileManager::class);
 
-		$this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
+        $this->registerAlias(IAvailabilityCoordinator::class, AvailabilityCoordinator::class);
 
-		$this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
+        $this->registerAlias(IDeclarativeManager::class, DeclarativeManager::class);
 
-		$this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
+        $this->registerAlias(\OCP\TaskProcessing\IManager::class, \OC\TaskProcessing\Manager::class);
 
-		$this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
+        $this->registerAlias(IRemoteAddress::class, RemoteAddress::class);
 
-		$this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
+        $this->registerAlias(\OCP\Security\Ip\IFactory::class, \OC\Security\Ip\Factory::class);
 
-		$this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
+        $this->registerAlias(IRichTextFormatter::class, \OC\RichObjectStrings\RichTextFormatter::class);
 
-		$this->registerAlias(ISignatureManager::class, SignatureManager::class);
+        $this->registerAlias(ISignatureManager::class, SignatureManager::class);
 
-		$this->registerAlias(IGenerator::class, Generator::class);
-		$this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
-			if (PHP_SAPI !== 'cli') {
-				$sequence = $c->get(APCuSequence::class);
-				if ($sequence->isAvailable()) {
-					return $sequence;
-				}
-			}
-
-			return $c->get(FileSequence::class);
-		}, false);
-		$this->registerAlias(IDecoder::class, Decoder::class);
-
-		$this->connectDispatcher();
-	}
-
-	public function boot() {
-		/** @var HookConnector $hookConnector */
-		$hookConnector = $this->get(HookConnector::class);
-		$hookConnector->viewToNode();
-	}
-
-	private function connectDispatcher(): void {
-		/** @var IEventDispatcher $eventDispatcher */
-		$eventDispatcher = $this->get(IEventDispatcher::class);
-		$eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
-		$eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
-		$eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
-		$eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
-
-		FilesMetadataManager::loadListeners($eventDispatcher);
-		GenerateBlurhashMetadata::loadListeners($eventDispatcher);
-	}
-
-	/**
-	 * @return \OCP\Contacts\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContactsManager() {
-		return $this->get(\OCP\Contacts\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionManager() {
-		return $this->get(\OCP\Encryption\IManager::class);
-	}
-
-	/**
-	 * @return \OC\Encryption\File
-	 * @deprecated 20.0.0
-	 */
-	public function getEncryptionFilesHelper() {
-		return $this->get(IFile::class);
-	}
-
-	/**
-	 * The current request object holding all information about the request
-	 * currently being processed is returned from this method.
-	 * In case the current execution was not initiated by a web request null is returned
-	 *
-	 * @return \OCP\IRequest
-	 * @deprecated 20.0.0
-	 */
-	public function getRequest() {
-		return $this->get(IRequest::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns the root folder of ownCloud's data directory
-	 * This is the lazy variant so this gets only initialized once it
-	 * is actually used.
-	 *
-	 * @return IRootFolder
-	 * @deprecated 20.0.0
-	 */
-	public function getLazyRootFolder() {
-		return $this->get(IRootFolder::class);
-	}
-
-	/**
-	 * Returns a view to ownCloud's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder|null
-	 * @deprecated 20.0.0
-	 */
-	public function getUserFolder($userId = null) {
-		if ($userId === null) {
-			$user = $this->get(IUserSession::class)->getUser();
-			if (!$user) {
-				return null;
-			}
-			$userId = $user->getUID();
-		}
-		$root = $this->get(IRootFolder::class);
-		return $root->getUserFolder($userId);
-	}
-
-	/**
-	 * @return \OC\User\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getUserManager() {
-		return $this->get(IUserManager::class);
-	}
-
-	/**
-	 * @return \OC\Group\Manager
-	 * @deprecated 20.0.0
-	 */
-	public function getGroupManager() {
-		return $this->get(IGroupManager::class);
-	}
-
-	/**
-	 * @return \OC\User\Session
-	 * @deprecated 20.0.0
-	 */
-	public function getUserSession() {
-		return $this->get(IUserSession::class);
-	}
-
-	/**
-	 * @return \OCP\ISession
-	 * @deprecated 20.0.0
-	 */
-	public function getSession() {
-		return $this->get(Session::class)->getSession();
-	}
-
-	/**
-	 * @param \OCP\ISession $session
-	 * @return void
-	 */
-	public function setSession(\OCP\ISession $session) {
-		$this->get(SessionStorage::class)->setSession($session);
-		$this->get(Session::class)->setSession($session);
-		$this->get(Store::class)->setSession($session);
-	}
-
-	/**
-	 * @return \OCP\IConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getConfig() {
-		return $this->get(AllConfig::class);
-	}
-
-	/**
-	 * @return \OC\SystemConfig
-	 * @deprecated 20.0.0
-	 */
-	public function getSystemConfig() {
-		return $this->get(SystemConfig::class);
-	}
-
-	/**
-	 * @return IFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getL10NFactory() {
-		return $this->get(IFactory::class);
-	}
-
-	/**
-	 * get an L10N instance
-	 *
-	 * @param string $app appid
-	 * @param string $lang
-	 * @return IL10N
-	 * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
-	 */
-	public function getL10N($app, $lang = null) {
-		return $this->get(IFactory::class)->get($app, $lang);
-	}
-
-	/**
-	 * @return IURLGenerator
-	 * @deprecated 20.0.0
-	 */
-	public function getURLGenerator() {
-		return $this->get(IURLGenerator::class);
-	}
-
-	/**
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
-	 * getMemCacheFactory() instead.
-	 *
-	 * @return ICache
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
-	 */
-	public function getCache() {
-		return $this->get(ICache::class);
-	}
-
-	/**
-	 * Returns an \OCP\CacheFactory instance
-	 *
-	 * @return \OCP\ICacheFactory
-	 * @deprecated 20.0.0
-	 */
-	public function getMemCacheFactory() {
-		return $this->get(ICacheFactory::class);
-	}
-
-	/**
-	 * Returns the current session
-	 *
-	 * @return \OCP\IDBConnection
-	 * @deprecated 20.0.0
-	 */
-	public function getDatabaseConnection() {
-		return $this->get(IDBConnection::class);
-	}
-
-	/**
-	 * Returns the activity manager
-	 *
-	 * @return \OCP\Activity\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getActivityManager() {
-		return $this->get(\OCP\Activity\IManager::class);
-	}
-
-	/**
-	 * Returns an job list for controlling background jobs
-	 *
-	 * @return IJobList
-	 * @deprecated 20.0.0
-	 */
-	public function getJobList() {
-		return $this->get(IJobList::class);
-	}
-
-	/**
-	 * Returns a SecureRandom instance
-	 *
-	 * @return \OCP\Security\ISecureRandom
-	 * @deprecated 20.0.0
-	 */
-	public function getSecureRandom() {
-		return $this->get(ISecureRandom::class);
-	}
-
-	/**
-	 * Returns a Crypto instance
-	 *
-	 * @return ICrypto
-	 * @deprecated 20.0.0
-	 */
-	public function getCrypto() {
-		return $this->get(ICrypto::class);
-	}
-
-	/**
-	 * Returns a Hasher instance
-	 *
-	 * @return IHasher
-	 * @deprecated 20.0.0
-	 */
-	public function getHasher() {
-		return $this->get(IHasher::class);
-	}
-
-	/**
-	 * Get the certificate manager
-	 *
-	 * @return \OCP\ICertificateManager
-	 */
-	public function getCertificateManager() {
-		return $this->get(ICertificateManager::class);
-	}
-
-	/**
-	 * Get the manager for temporary files and folders
-	 *
-	 * @return \OCP\ITempManager
-	 * @deprecated 20.0.0
-	 */
-	public function getTempManager() {
-		return $this->get(ITempManager::class);
-	}
-
-	/**
-	 * Get the app manager
-	 *
-	 * @return \OCP\App\IAppManager
-	 * @deprecated 20.0.0
-	 */
-	public function getAppManager() {
-		return $this->get(IAppManager::class);
-	}
-
-	/**
-	 * Creates a new mailer
-	 *
-	 * @return IMailer
-	 * @deprecated 20.0.0
-	 */
-	public function getMailer() {
-		return $this->get(IMailer::class);
-	}
-
-	/**
-	 * Get the webroot
-	 *
-	 * @return string
-	 * @deprecated 20.0.0
-	 */
-	public function getWebRoot() {
-		return $this->webRoot;
-	}
-
-	/**
-	 * Get the locking provider
-	 *
-	 * @return ILockingProvider
-	 * @since 8.1.0
-	 * @deprecated 20.0.0
-	 */
-	public function getLockingProvider() {
-		return $this->get(ILockingProvider::class);
-	}
-
-	/**
-	 * Get the MimeTypeDetector
-	 *
-	 * @return IMimeTypeDetector
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeDetector() {
-		return $this->get(IMimeTypeDetector::class);
-	}
-
-	/**
-	 * Get the MimeTypeLoader
-	 *
-	 * @return IMimeTypeLoader
-	 * @deprecated 20.0.0
-	 */
-	public function getMimeTypeLoader() {
-		return $this->get(IMimeTypeLoader::class);
-	}
-
-	/**
-	 * Get the Notification Manager
-	 *
-	 * @return \OCP\Notification\IManager
-	 * @since 8.2.0
-	 * @deprecated 20.0.0
-	 */
-	public function getNotificationManager() {
-		return $this->get(\OCP\Notification\IManager::class);
-	}
-
-	/**
-	 * @return \OCA\Theming\ThemingDefaults
-	 * @deprecated 20.0.0
-	 */
-	public function getThemingDefaults() {
-		return $this->get('ThemingDefaults');
-	}
-
-	/**
-	 * @return \OC\IntegrityCheck\Checker
-	 * @deprecated 20.0.0
-	 */
-	public function getIntegrityCodeChecker() {
-		return $this->get('IntegrityCodeChecker');
-	}
-
-	/**
-	 * @return CsrfTokenManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCsrfTokenManager() {
-		return $this->get(CsrfTokenManager::class);
-	}
-
-	/**
-	 * @return ContentSecurityPolicyNonceManager
-	 * @deprecated 20.0.0
-	 */
-	public function getContentSecurityPolicyNonceManager() {
-		return $this->get(ContentSecurityPolicyNonceManager::class);
-	}
-
-	/**
-	 * @return \OCP\Settings\IManager
-	 * @deprecated 20.0.0
-	 */
-	public function getSettingsManager() {
-		return $this->get(\OC\Settings\Manager::class);
-	}
-
-	/**
-	 * @return \OCP\Files\IAppData
-	 * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
-	 */
-	public function getAppDataDir($app) {
-		$factory = $this->get(\OC\Files\AppData\Factory::class);
-		return $factory->get($app);
-	}
-
-	/**
-	 * @return \OCP\Federation\ICloudIdManager
-	 * @deprecated 20.0.0
-	 */
-	public function getCloudIdManager() {
-		return $this->get(ICloudIdManager::class);
-	}
+        $this->registerAlias(IGenerator::class, Generator::class);
+        $this->registerService(ISequence::class, function (ContainerInterface $c): ISequence {
+            if (PHP_SAPI !== 'cli') {
+                $sequence = $c->get(APCuSequence::class);
+                if ($sequence->isAvailable()) {
+                    return $sequence;
+                }
+            }
+
+            return $c->get(FileSequence::class);
+        }, false);
+        $this->registerAlias(IDecoder::class, Decoder::class);
+
+        $this->connectDispatcher();
+    }
+
+    public function boot() {
+        /** @var HookConnector $hookConnector */
+        $hookConnector = $this->get(HookConnector::class);
+        $hookConnector->viewToNode();
+    }
+
+    private function connectDispatcher(): void {
+        /** @var IEventDispatcher $eventDispatcher */
+        $eventDispatcher = $this->get(IEventDispatcher::class);
+        $eventDispatcher->addServiceListener(LoginFailed::class, LoginFailedListener::class);
+        $eventDispatcher->addServiceListener(PostLoginEvent::class, UserLoggedInListener::class);
+        $eventDispatcher->addServiceListener(UserChangedEvent::class, UserChangedListener::class);
+        $eventDispatcher->addServiceListener(BeforeUserDeletedEvent::class, BeforeUserDeletedListener::class);
+
+        FilesMetadataManager::loadListeners($eventDispatcher);
+        GenerateBlurhashMetadata::loadListeners($eventDispatcher);
+    }
+
+    /**
+     * @return \OCP\Contacts\IManager
+     * @deprecated 20.0.0
+     */
+    public function getContactsManager() {
+        return $this->get(\OCP\Contacts\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\Manager
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionManager() {
+        return $this->get(\OCP\Encryption\IManager::class);
+    }
+
+    /**
+     * @return \OC\Encryption\File
+     * @deprecated 20.0.0
+     */
+    public function getEncryptionFilesHelper() {
+        return $this->get(IFile::class);
+    }
+
+    /**
+     * The current request object holding all information about the request
+     * currently being processed is returned from this method.
+     * In case the current execution was not initiated by a web request null is returned
+     *
+     * @return \OCP\IRequest
+     * @deprecated 20.0.0
+     */
+    public function getRequest() {
+        return $this->get(IRequest::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns the root folder of ownCloud's data directory
+     * This is the lazy variant so this gets only initialized once it
+     * is actually used.
+     *
+     * @return IRootFolder
+     * @deprecated 20.0.0
+     */
+    public function getLazyRootFolder() {
+        return $this->get(IRootFolder::class);
+    }
+
+    /**
+     * Returns a view to ownCloud's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder|null
+     * @deprecated 20.0.0
+     */
+    public function getUserFolder($userId = null) {
+        if ($userId === null) {
+            $user = $this->get(IUserSession::class)->getUser();
+            if (!$user) {
+                return null;
+            }
+            $userId = $user->getUID();
+        }
+        $root = $this->get(IRootFolder::class);
+        return $root->getUserFolder($userId);
+    }
+
+    /**
+     * @return \OC\User\Manager
+     * @deprecated 20.0.0
+     */
+    public function getUserManager() {
+        return $this->get(IUserManager::class);
+    }
+
+    /**
+     * @return \OC\Group\Manager
+     * @deprecated 20.0.0
+     */
+    public function getGroupManager() {
+        return $this->get(IGroupManager::class);
+    }
+
+    /**
+     * @return \OC\User\Session
+     * @deprecated 20.0.0
+     */
+    public function getUserSession() {
+        return $this->get(IUserSession::class);
+    }
+
+    /**
+     * @return \OCP\ISession
+     * @deprecated 20.0.0
+     */
+    public function getSession() {
+        return $this->get(Session::class)->getSession();
+    }
+
+    /**
+     * @param \OCP\ISession $session
+     * @return void
+     */
+    public function setSession(\OCP\ISession $session) {
+        $this->get(SessionStorage::class)->setSession($session);
+        $this->get(Session::class)->setSession($session);
+        $this->get(Store::class)->setSession($session);
+    }
+
+    /**
+     * @return \OCP\IConfig
+     * @deprecated 20.0.0
+     */
+    public function getConfig() {
+        return $this->get(AllConfig::class);
+    }
+
+    /**
+     * @return \OC\SystemConfig
+     * @deprecated 20.0.0
+     */
+    public function getSystemConfig() {
+        return $this->get(SystemConfig::class);
+    }
+
+    /**
+     * @return IFactory
+     * @deprecated 20.0.0
+     */
+    public function getL10NFactory() {
+        return $this->get(IFactory::class);
+    }
+
+    /**
+     * get an L10N instance
+     *
+     * @param string $app appid
+     * @param string $lang
+     * @return IL10N
+     * @deprecated 20.0.0 use DI of {@see IL10N} or {@see IFactory} instead, or {@see \OCP\Util::getL10N()} as a last resort
+     */
+    public function getL10N($app, $lang = null) {
+        return $this->get(IFactory::class)->get($app, $lang);
+    }
+
+    /**
+     * @return IURLGenerator
+     * @deprecated 20.0.0
+     */
+    public function getURLGenerator() {
+        return $this->get(IURLGenerator::class);
+    }
+
+    /**
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
+     * getMemCacheFactory() instead.
+     *
+     * @return ICache
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
+     */
+    public function getCache() {
+        return $this->get(ICache::class);
+    }
+
+    /**
+     * Returns an \OCP\CacheFactory instance
+     *
+     * @return \OCP\ICacheFactory
+     * @deprecated 20.0.0
+     */
+    public function getMemCacheFactory() {
+        return $this->get(ICacheFactory::class);
+    }
+
+    /**
+     * Returns the current session
+     *
+     * @return \OCP\IDBConnection
+     * @deprecated 20.0.0
+     */
+    public function getDatabaseConnection() {
+        return $this->get(IDBConnection::class);
+    }
+
+    /**
+     * Returns the activity manager
+     *
+     * @return \OCP\Activity\IManager
+     * @deprecated 20.0.0
+     */
+    public function getActivityManager() {
+        return $this->get(\OCP\Activity\IManager::class);
+    }
+
+    /**
+     * Returns an job list for controlling background jobs
+     *
+     * @return IJobList
+     * @deprecated 20.0.0
+     */
+    public function getJobList() {
+        return $this->get(IJobList::class);
+    }
+
+    /**
+     * Returns a SecureRandom instance
+     *
+     * @return \OCP\Security\ISecureRandom
+     * @deprecated 20.0.0
+     */
+    public function getSecureRandom() {
+        return $this->get(ISecureRandom::class);
+    }
+
+    /**
+     * Returns a Crypto instance
+     *
+     * @return ICrypto
+     * @deprecated 20.0.0
+     */
+    public function getCrypto() {
+        return $this->get(ICrypto::class);
+    }
+
+    /**
+     * Returns a Hasher instance
+     *
+     * @return IHasher
+     * @deprecated 20.0.0
+     */
+    public function getHasher() {
+        return $this->get(IHasher::class);
+    }
+
+    /**
+     * Get the certificate manager
+     *
+     * @return \OCP\ICertificateManager
+     */
+    public function getCertificateManager() {
+        return $this->get(ICertificateManager::class);
+    }
+
+    /**
+     * Get the manager for temporary files and folders
+     *
+     * @return \OCP\ITempManager
+     * @deprecated 20.0.0
+     */
+    public function getTempManager() {
+        return $this->get(ITempManager::class);
+    }
+
+    /**
+     * Get the app manager
+     *
+     * @return \OCP\App\IAppManager
+     * @deprecated 20.0.0
+     */
+    public function getAppManager() {
+        return $this->get(IAppManager::class);
+    }
+
+    /**
+     * Creates a new mailer
+     *
+     * @return IMailer
+     * @deprecated 20.0.0
+     */
+    public function getMailer() {
+        return $this->get(IMailer::class);
+    }
+
+    /**
+     * Get the webroot
+     *
+     * @return string
+     * @deprecated 20.0.0
+     */
+    public function getWebRoot() {
+        return $this->webRoot;
+    }
+
+    /**
+     * Get the locking provider
+     *
+     * @return ILockingProvider
+     * @since 8.1.0
+     * @deprecated 20.0.0
+     */
+    public function getLockingProvider() {
+        return $this->get(ILockingProvider::class);
+    }
+
+    /**
+     * Get the MimeTypeDetector
+     *
+     * @return IMimeTypeDetector
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeDetector() {
+        return $this->get(IMimeTypeDetector::class);
+    }
+
+    /**
+     * Get the MimeTypeLoader
+     *
+     * @return IMimeTypeLoader
+     * @deprecated 20.0.0
+     */
+    public function getMimeTypeLoader() {
+        return $this->get(IMimeTypeLoader::class);
+    }
+
+    /**
+     * Get the Notification Manager
+     *
+     * @return \OCP\Notification\IManager
+     * @since 8.2.0
+     * @deprecated 20.0.0
+     */
+    public function getNotificationManager() {
+        return $this->get(\OCP\Notification\IManager::class);
+    }
+
+    /**
+     * @return \OCA\Theming\ThemingDefaults
+     * @deprecated 20.0.0
+     */
+    public function getThemingDefaults() {
+        return $this->get('ThemingDefaults');
+    }
+
+    /**
+     * @return \OC\IntegrityCheck\Checker
+     * @deprecated 20.0.0
+     */
+    public function getIntegrityCodeChecker() {
+        return $this->get('IntegrityCodeChecker');
+    }
+
+    /**
+     * @return CsrfTokenManager
+     * @deprecated 20.0.0
+     */
+    public function getCsrfTokenManager() {
+        return $this->get(CsrfTokenManager::class);
+    }
+
+    /**
+     * @return ContentSecurityPolicyNonceManager
+     * @deprecated 20.0.0
+     */
+    public function getContentSecurityPolicyNonceManager() {
+        return $this->get(ContentSecurityPolicyNonceManager::class);
+    }
+
+    /**
+     * @return \OCP\Settings\IManager
+     * @deprecated 20.0.0
+     */
+    public function getSettingsManager() {
+        return $this->get(\OC\Settings\Manager::class);
+    }
+
+    /**
+     * @return \OCP\Files\IAppData
+     * @deprecated 20.0.0 Use get(\OCP\Files\AppData\IAppDataFactory::class)->get($app) instead
+     */
+    public function getAppDataDir($app) {
+        $factory = $this->get(\OC\Files\AppData\Factory::class);
+        return $factory->get($app);
+    }
+
+    /**
+     * @return \OCP\Federation\ICloudIdManager
+     * @deprecated 20.0.0
+     */
+    public function getCloudIdManager() {
+        return $this->get(ICloudIdManager::class);
+    }
 }

lib/private/Collaboration/Collaborators/MailByMailPlugin.php

Indentation +22 added lines, -22 removed lines

@@ -20,26 +20,26 @@
  */
 class MailByMailPlugin extends MailPlugin {
 
-	public function __construct(
-		IManager $contactsManager,
-		ICloudIdManager $cloudIdManager,
-		IConfig $config,
-		IGroupManager $groupManager,
-		KnownUserService $knownUserService,
-		IUserSession $userSession,
-		IEmailValidator $emailValidator,
-		mixed $shareWithGroupOnlyExcludeGroupsList = [],
-	) {
-		parent::__construct(
-			$contactsManager,
-			$cloudIdManager,
-			$config,
-			$groupManager,
-			$knownUserService,
-			$userSession,
-			$emailValidator,
-			$shareWithGroupOnlyExcludeGroupsList,
-			IShare::TYPE_EMAIL,
-		);
-	}
+    public function __construct(
+        IManager $contactsManager,
+        ICloudIdManager $cloudIdManager,
+        IConfig $config,
+        IGroupManager $groupManager,
+        KnownUserService $knownUserService,
+        IUserSession $userSession,
+        IEmailValidator $emailValidator,
+        mixed $shareWithGroupOnlyExcludeGroupsList = [],
+    ) {
+        parent::__construct(
+            $contactsManager,
+            $cloudIdManager,
+            $config,
+            $groupManager,
+            $knownUserService,
+            $userSession,
+            $emailValidator,
+            $shareWithGroupOnlyExcludeGroupsList,
+            IShare::TYPE_EMAIL,
+        );
+    }
 }

lib/private/Collaboration/Collaborators/UserByMailPlugin.php

Indentation +22 added lines, -22 removed lines

@@ -20,26 +20,26 @@
  */
 class UserByMailPlugin extends MailPlugin {
 
-	public function __construct(
-		IManager $contactsManager,
-		ICloudIdManager $cloudIdManager,
-		IConfig $config,
-		IGroupManager $groupManager,
-		KnownUserService $knownUserService,
-		IUserSession $userSession,
-		IEmailValidator $emailValidator,
-		mixed $shareWithGroupOnlyExcludeGroupsList = [],
-	) {
-		parent::__construct(
-			$contactsManager,
-			$cloudIdManager,
-			$config,
-			$groupManager,
-			$knownUserService,
-			$userSession,
-			$emailValidator,
-			$shareWithGroupOnlyExcludeGroupsList,
-			IShare::TYPE_USER,
-		);
-	}
+    public function __construct(
+        IManager $contactsManager,
+        ICloudIdManager $cloudIdManager,
+        IConfig $config,
+        IGroupManager $groupManager,
+        KnownUserService $knownUserService,
+        IUserSession $userSession,
+        IEmailValidator $emailValidator,
+        mixed $shareWithGroupOnlyExcludeGroupsList = [],
+    ) {
+        parent::__construct(
+            $contactsManager,
+            $cloudIdManager,
+            $config,
+            $groupManager,
+            $knownUserService,
+            $userSession,
+            $emailValidator,
+            $shareWithGroupOnlyExcludeGroupsList,
+            IShare::TYPE_USER,
+        );
+    }
 }

lib/private/Collaboration/Collaborators/MailPlugin.php

Indentation +249 added lines, -249 removed lines

@@ -21,255 +21,255 @@
 use OCP\Share\IShare;
 
 class MailPlugin implements ISearchPlugin {
-	protected bool $shareWithGroupOnly;
-
-	protected bool $shareeEnumeration;
-
-	protected bool $shareeEnumerationInGroupOnly;
-
-	protected bool $shareeEnumerationPhone;
-
-	protected bool $shareeEnumerationFullMatch;
-
-	protected bool $shareeEnumerationFullMatchEmail;
-
-	public function __construct(
-		private IManager $contactsManager,
-		private ICloudIdManager $cloudIdManager,
-		private IConfig $config,
-		private IGroupManager $groupManager,
-		private KnownUserService $knownUserService,
-		private IUserSession $userSession,
-		private IEmailValidator $emailValidator,
-		private mixed $shareWithGroupOnlyExcludeGroupsList,
-		private int $shareType,
-	) {
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
-		$this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
-		$this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
-		$this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
-		$this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
-
-		if ($this->shareWithGroupOnly) {
-			$this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
-		}
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
-		if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
-			return false;
-		}
-
-		// Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
-		$result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
-		if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
-			return $this->search($matches[1], $limit, $offset, $searchResult);
-		}
-
-		$currentUserId = $this->userSession->getUser()->getUID();
-
-		$result = $userResults = ['wide' => [], 'exact' => []];
-		$userType = new SearchResultType('users');
-		$emailType = new SearchResultType('emails');
-
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search(
-			$search,
-			['EMAIL', 'FN'],
-			[
-				'limit' => $limit,
-				'offset' => $offset,
-				'enumeration' => $this->shareeEnumeration,
-				'fullmatch' => $this->shareeEnumerationFullMatch,
-			]
-		);
-		$lowerSearch = strtolower($search);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['EMAIL'])) {
-				$emailAddresses = $contact['EMAIL'];
-				if (\is_string($emailAddresses)) {
-					$emailAddresses = [$emailAddresses];
-				}
-				foreach ($emailAddresses as $type => $emailAddress) {
-					$displayName = $emailAddress;
-					$emailAddressType = null;
-					if (\is_array($emailAddress)) {
-						$emailAddressData = $emailAddress;
-						$emailAddress = $emailAddressData['value'];
-						$emailAddressType = $emailAddressData['type'];
-					}
-
-					if (!filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
-						continue;
-					}
-
-					if (isset($contact['FN'])) {
-						$displayName = $contact['FN'] . ' (' . $emailAddress . ')';
-					}
-					$exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
-
-					if (isset($contact['isLocalSystemBook'])) {
-						if ($this->shareWithGroupOnly) {
-							/*
+    protected bool $shareWithGroupOnly;
+
+    protected bool $shareeEnumeration;
+
+    protected bool $shareeEnumerationInGroupOnly;
+
+    protected bool $shareeEnumerationPhone;
+
+    protected bool $shareeEnumerationFullMatch;
+
+    protected bool $shareeEnumerationFullMatchEmail;
+
+    public function __construct(
+        private IManager $contactsManager,
+        private ICloudIdManager $cloudIdManager,
+        private IConfig $config,
+        private IGroupManager $groupManager,
+        private KnownUserService $knownUserService,
+        private IUserSession $userSession,
+        private IEmailValidator $emailValidator,
+        private mixed $shareWithGroupOnlyExcludeGroupsList,
+        private int $shareType,
+    ) {
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+        $this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+        $this->shareeEnumerationInGroupOnly = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_group', 'no') === 'yes';
+        $this->shareeEnumerationPhone = $this->shareeEnumeration && $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_to_phone', 'no') === 'yes';
+        $this->shareeEnumerationFullMatch = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match', 'yes') === 'yes';
+        $this->shareeEnumerationFullMatchEmail = $this->config->getAppValue('core', 'shareapi_restrict_user_enumeration_full_match_email', 'yes') === 'yes';
+
+        if ($this->shareWithGroupOnly) {
+            $this->shareWithGroupOnlyExcludeGroupsList = json_decode($this->config->getAppValue('core', 'shareapi_only_share_with_group_members_exclude_group_list', ''), true) ?? [];
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function search($search, $limit, $offset, ISearchResult $searchResult): bool {
+        if ($this->shareeEnumerationFullMatch && !$this->shareeEnumerationFullMatchEmail) {
+            return false;
+        }
+
+        // Extract the email address from "Foo Bar <foo.bar@example.tld>" and then search with "foo.bar@example.tld" instead
+        $result = preg_match('/<([^@]+@.+)>$/', $search, $matches);
+        if ($result && filter_var($matches[1], FILTER_VALIDATE_EMAIL)) {
+            return $this->search($matches[1], $limit, $offset, $searchResult);
+        }
+
+        $currentUserId = $this->userSession->getUser()->getUID();
+
+        $result = $userResults = ['wide' => [], 'exact' => []];
+        $userType = new SearchResultType('users');
+        $emailType = new SearchResultType('emails');
+
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search(
+            $search,
+            ['EMAIL', 'FN'],
+            [
+                'limit' => $limit,
+                'offset' => $offset,
+                'enumeration' => $this->shareeEnumeration,
+                'fullmatch' => $this->shareeEnumerationFullMatch,
+            ]
+        );
+        $lowerSearch = strtolower($search);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['EMAIL'])) {
+                $emailAddresses = $contact['EMAIL'];
+                if (\is_string($emailAddresses)) {
+                    $emailAddresses = [$emailAddresses];
+                }
+                foreach ($emailAddresses as $type => $emailAddress) {
+                    $displayName = $emailAddress;
+                    $emailAddressType = null;
+                    if (\is_array($emailAddress)) {
+                        $emailAddressData = $emailAddress;
+                        $emailAddress = $emailAddressData['value'];
+                        $emailAddressType = $emailAddressData['type'];
+                    }
+
+                    if (!filter_var($emailAddress, FILTER_VALIDATE_EMAIL)) {
+                        continue;
+                    }
+
+                    if (isset($contact['FN'])) {
+                        $displayName = $contact['FN'] . ' (' . $emailAddress . ')';
+                    }
+                    $exactEmailMatch = strtolower($emailAddress) === $lowerSearch;
+
+                    if (isset($contact['isLocalSystemBook'])) {
+                        if ($this->shareWithGroupOnly) {
+                            /*
 							 * Check if the user may share with the user associated with the e-mail of the just found contact
 							 */
-							$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-
-							// ShareWithGroupOnly filtering
-							$userGroups = array_diff($userGroups, $this->shareWithGroupOnlyExcludeGroupsList);
-
-							$found = false;
-							foreach ($userGroups as $userGroup) {
-								if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-									$found = true;
-									break;
-								}
-							}
-							if (!$found) {
-								continue;
-							}
-						}
-						if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
-							try {
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							if ($this->shareType === IShare::TYPE_USER && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								$singleResult = [[
-									'label' => $displayName,
-									'uuid' => $contact['UID'] ?? $emailAddress,
-									'name' => $contact['FN'] ?? $displayName,
-									'value' => [
-										'shareType' => IShare::TYPE_USER,
-										'shareWith' => $cloud->getUser(),
-									],
-									'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
-
-								]];
-								$searchResult->addResultSet($userType, [], $singleResult);
-								$searchResult->markExactIdMatch($emailType);
-							}
-							return false;
-						}
-
-						if ($this->shareeEnumeration) {
-							try {
-								if (!isset($contact['CLOUD'])) {
-									continue;
-								}
-								$cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
-							} catch (\InvalidArgumentException $e) {
-								continue;
-							}
-
-							$addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
-							if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
-								$addToWide = true;
-							}
-
-							if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
-								$addToWide = false;
-								$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
-								foreach ($userGroups as $userGroup) {
-									if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
-										$addToWide = true;
-										break;
-									}
-								}
-							}
-							if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
-								if ($this->shareType === IShare::TYPE_USER) {
-									$userResults['wide'][] = [
-										'label' => $displayName,
-										'uuid' => $contact['UID'] ?? $emailAddress,
-										'name' => $contact['FN'] ?? $displayName,
-										'value' => [
-											'shareType' => IShare::TYPE_USER,
-											'shareWith' => $cloud->getUser(),
-										],
-										'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
-									];
-								}
-								continue;
-							}
-						}
-						continue;
-					}
-
-					if ($this->shareType !== IShare::TYPE_EMAIL) {
-						continue;
-					}
-
-					if ($exactEmailMatch
-						|| (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
-						if ($exactEmailMatch) {
-							$searchResult->markExactIdMatch($emailType);
-						}
-						$result['exact'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $displayName,
-							'uuid' => $contact['UID'] ?? $emailAddress,
-							'name' => $contact['FN'] ?? $displayName,
-							'type' => $emailAddressType ?? '',
-							'value' => [
-								'shareType' => IShare::TYPE_EMAIL,
-								'shareWith' => $emailAddress,
-							],
-						];
-					}
-				}
-			}
-		}
-
-		$reachedEnd = true;
-		if ($this->shareeEnumeration) {
-			$reachedEnd = (count($result['wide']) < $offset + $limit)
-				&& (count($userResults['wide']) < $offset + $limit);
-
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-			$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
-		}
-
-		if ($this->shareType === IShare::TYPE_EMAIL
-				&& !$searchResult->hasExactIdMatch($emailType) && $this->emailValidator->isValid($search)) {
-			$result['exact'][] = [
-				'label' => $search,
-				'uuid' => $search,
-				'value' => [
-					'shareType' => IShare::TYPE_EMAIL,
-					'shareWith' => $search,
-				],
-			];
-		}
-
-		if ($this->shareType === IShare::TYPE_USER && !empty($userResults['wide'])) {
-			$searchResult->addResultSet($userType, $userResults['wide'], []);
-		}
-		if ($this->shareType === IShare::TYPE_EMAIL) {
-			$searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
-		}
-
-		return !$reachedEnd;
-	}
-
-	public function isCurrentUser(ICloudId $cloud): bool {
-		$currentUser = $this->userSession->getUser();
-		return $currentUser instanceof IUser && $currentUser->getUID() === $cloud->getUser();
-	}
+                            $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+
+                            // ShareWithGroupOnly filtering
+                            $userGroups = array_diff($userGroups, $this->shareWithGroupOnlyExcludeGroupsList);
+
+                            $found = false;
+                            foreach ($userGroups as $userGroup) {
+                                if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                    $found = true;
+                                    break;
+                                }
+                            }
+                            if (!$found) {
+                                continue;
+                            }
+                        }
+                        if ($exactEmailMatch && $this->shareeEnumerationFullMatch) {
+                            try {
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            if ($this->shareType === IShare::TYPE_USER && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                $singleResult = [[
+                                    'label' => $displayName,
+                                    'uuid' => $contact['UID'] ?? $emailAddress,
+                                    'name' => $contact['FN'] ?? $displayName,
+                                    'value' => [
+                                        'shareType' => IShare::TYPE_USER,
+                                        'shareWith' => $cloud->getUser(),
+                                    ],
+                                    'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+
+                                ]];
+                                $searchResult->addResultSet($userType, [], $singleResult);
+                                $searchResult->markExactIdMatch($emailType);
+                            }
+                            return false;
+                        }
+
+                        if ($this->shareeEnumeration) {
+                            try {
+                                if (!isset($contact['CLOUD'])) {
+                                    continue;
+                                }
+                                $cloud = $this->cloudIdManager->resolveCloudId($contact['CLOUD'][0] ?? '');
+                            } catch (\InvalidArgumentException $e) {
+                                continue;
+                            }
+
+                            $addToWide = !($this->shareeEnumerationInGroupOnly || $this->shareeEnumerationPhone);
+                            if (!$addToWide && $this->shareeEnumerationPhone && $this->knownUserService->isKnownToUser($currentUserId, $contact['UID'])) {
+                                $addToWide = true;
+                            }
+
+                            if (!$addToWide && $this->shareeEnumerationInGroupOnly) {
+                                $addToWide = false;
+                                $userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+                                foreach ($userGroups as $userGroup) {
+                                    if ($this->groupManager->isInGroup($contact['UID'], $userGroup)) {
+                                        $addToWide = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if ($addToWide && !$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
+                                if ($this->shareType === IShare::TYPE_USER) {
+                                    $userResults['wide'][] = [
+                                        'label' => $displayName,
+                                        'uuid' => $contact['UID'] ?? $emailAddress,
+                                        'name' => $contact['FN'] ?? $displayName,
+                                        'value' => [
+                                            'shareType' => IShare::TYPE_USER,
+                                            'shareWith' => $cloud->getUser(),
+                                        ],
+                                        'shareWithDisplayNameUnique' => !empty($emailAddress) ? $emailAddress : $cloud->getUser()
+                                    ];
+                                }
+                                continue;
+                            }
+                        }
+                        continue;
+                    }
+
+                    if ($this->shareType !== IShare::TYPE_EMAIL) {
+                        continue;
+                    }
+
+                    if ($exactEmailMatch
+                        || (isset($contact['FN']) && strtolower($contact['FN']) === $lowerSearch)) {
+                        if ($exactEmailMatch) {
+                            $searchResult->markExactIdMatch($emailType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $displayName,
+                            'uuid' => $contact['UID'] ?? $emailAddress,
+                            'name' => $contact['FN'] ?? $displayName,
+                            'type' => $emailAddressType ?? '',
+                            'value' => [
+                                'shareType' => IShare::TYPE_EMAIL,
+                                'shareWith' => $emailAddress,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
+
+        $reachedEnd = true;
+        if ($this->shareeEnumeration) {
+            $reachedEnd = (count($result['wide']) < $offset + $limit)
+                && (count($userResults['wide']) < $offset + $limit);
+
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+            $userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
+        }
+
+        if ($this->shareType === IShare::TYPE_EMAIL
+                && !$searchResult->hasExactIdMatch($emailType) && $this->emailValidator->isValid($search)) {
+            $result['exact'][] = [
+                'label' => $search,
+                'uuid' => $search,
+                'value' => [
+                    'shareType' => IShare::TYPE_EMAIL,
+                    'shareWith' => $search,
+                ],
+            ];
+        }
+
+        if ($this->shareType === IShare::TYPE_USER && !empty($userResults['wide'])) {
+            $searchResult->addResultSet($userType, $userResults['wide'], []);
+        }
+        if ($this->shareType === IShare::TYPE_EMAIL) {
+            $searchResult->addResultSet($emailType, $result['wide'], $result['exact']);
+        }
+
+        return !$reachedEnd;
+    }
+
+    public function isCurrentUser(ICloudId $cloud): bool {
+        $currentUser = $this->userSession->getUser();
+        return $currentUser instanceof IUser && $currentUser->getUID() === $cloud->getUser();
+    }
 }

tests/lib/Collaboration/Collaborators/MailPluginTest.php

Indentation +1050 added lines, -1050 removed lines

@@ -27,1102 +27,1102 @@
 use Test\Traits\EmailValidatorTrait;
 
 class MailPluginTest extends TestCase {
-	use EmailValidatorTrait;
+    use EmailValidatorTrait;
 
-	/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
-	protected $config;
+    /** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
+    protected $config;
 
-	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $contactsManager;
+    /** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $contactsManager;
 
-	/** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $cloudIdManager;
+    /** @var ICloudIdManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $cloudIdManager;
 
-	/** @var MailPlugin */
-	protected $plugin;
+    /** @var MailPlugin */
+    protected $plugin;
 
-	/** @var SearchResult */
-	protected $searchResult;
+    /** @var SearchResult */
+    protected $searchResult;
 
-	/** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
-	protected $groupManager;
+    /** @var IGroupManager|\PHPUnit\Framework\MockObject\MockObject */
+    protected $groupManager;
 
-	/** @var KnownUserService|\PHPUnit\Framework\MockObject\MockObject */
-	protected $knownUserService;
+    /** @var KnownUserService|\PHPUnit\Framework\MockObject\MockObject */
+    protected $knownUserService;
 
-	/** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
-	protected $userSession;
+    /** @var IUserSession|\PHPUnit\Framework\MockObject\MockObject */
+    protected $userSession;
 
-	protected function setUp(): void {
-		parent::setUp();
+    protected function setUp(): void {
+        parent::setUp();
 
-		$this->config = $this->createMock(IConfig::class);
-		$this->contactsManager = $this->createMock(IManager::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->knownUserService = $this->createMock(KnownUserService::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->cloudIdManager = new CloudIdManager(
-			$this->createMock(ICacheFactory::class),
-			$this->createMock(IEventDispatcher::class),
-			$this->contactsManager,
-			$this->createMock(IURLGenerator::class),
-			$this->createMock(IUserManager::class),
-		);
+        $this->config = $this->createMock(IConfig::class);
+        $this->contactsManager = $this->createMock(IManager::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->knownUserService = $this->createMock(KnownUserService::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->cloudIdManager = new CloudIdManager(
+            $this->createMock(ICacheFactory::class),
+            $this->createMock(IEventDispatcher::class),
+            $this->contactsManager,
+            $this->createMock(IURLGenerator::class),
+            $this->createMock(IUserManager::class),
+        );
 
-		$this->searchResult = new SearchResult();
-	}
+        $this->searchResult = new SearchResult();
+    }
 
-	public function instantiatePlugin(int $shareType) {
-		$this->plugin = new MailPlugin(
-			$this->contactsManager,
-			$this->cloudIdManager,
-			$this->config,
-			$this->groupManager,
-			$this->knownUserService,
-			$this->userSession,
-			$this->getEmailValidatorWithStrictEmailCheck(),
-			[],
-			$shareType,
-		);
-	}
+    public function instantiatePlugin(int $shareType) {
+        $this->plugin = new MailPlugin(
+            $this->contactsManager,
+            $this->cloudIdManager,
+            $this->config,
+            $this->groupManager,
+            $this->knownUserService,
+            $this->userSession,
+            $this->getEmailValidatorWithStrictEmailCheck(),
+            [],
+            $shareType,
+        );
+    }
 
-	/**
-	 *
-	 * @param string $searchTerm
-	 * @param array $contacts
-	 * @param bool $shareeEnumeration
-	 * @param array $expectedResult
-	 * @param bool $expectedExactIdMatch
-	 * @param bool $expectedMoreResults
-	 * @param bool $validEmail
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSearchEmail')]
-	public function testSearchEmail($searchTerm, $contacts, $shareeEnumeration, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $validEmail): void {
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(
-				function ($appName, $key, $default) use ($shareeEnumeration) {
-					if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
-						return $shareeEnumeration ? 'yes' : 'no';
-					}
-					return $default;
-				}
-			);
+    /**
+     *
+     * @param string $searchTerm
+     * @param array $contacts
+     * @param bool $shareeEnumeration
+     * @param array $expectedResult
+     * @param bool $expectedExactIdMatch
+     * @param bool $expectedMoreResults
+     * @param bool $validEmail
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSearchEmail')]
+    public function testSearchEmail($searchTerm, $contacts, $shareeEnumeration, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $validEmail): void {
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(
+                function ($appName, $key, $default) use ($shareeEnumeration) {
+                    if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
+                        return $shareeEnumeration ? 'yes' : 'no';
+                    }
+                    return $default;
+                }
+            );
 
-		$this->instantiatePlugin(IShare::TYPE_EMAIL);
+        $this->instantiatePlugin(IShare::TYPE_EMAIL);
 
-		$currentUser = $this->createMock(IUser::class);
-		$currentUser->method('getUID')
-			->willReturn('current');
-		$this->userSession->method('getUser')
-			->willReturn($currentUser);
+        $currentUser = $this->createMock(IUser::class);
+        $currentUser->method('getUID')
+            ->willReturn('current');
+        $this->userSession->method('getUser')
+            ->willReturn($currentUser);
 
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
-				if ($search === $searchTerm) {
-					return $contacts;
-				}
-				return [];
-			});
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
+                if ($search === $searchTerm) {
+                    return $contacts;
+                }
+                return [];
+            });
 
-		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
-		$result = $this->searchResult->asArray();
+        $moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
+        $result = $this->searchResult->asArray();
 
-		$this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
-		$this->assertEquals($expectedResult, $result);
-		$this->assertSame($expectedMoreResults, $moreResults);
-	}
+        $this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
+        $this->assertEquals($expectedResult, $result);
+        $this->assertSame($expectedMoreResults, $moreResults);
+    }
 
-	public static function dataSearchEmail(): array {
-		return [
-			// data set 0
-			['test', [], true, ['emails' => [], 'exact' => ['emails' => []]], false, false, false],
-			// data set 1
-			['test', [], false, ['emails' => [], 'exact' => ['emails' => []]], false, false, false],
-			// data set 2
-			[
-				'test@remote.com',
-				[],
-				true,
-				['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
-				false,
-				false,
-				true,
-			],
-			// data set 3
-			[ // no valid email address
-				'test@remote',
-				[],
-				true,
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 4
-			[
-				'test@remote.com',
-				[],
-				false,
-				['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
-				false,
-				false,
-				true,
-			],
-			// data set 5
-			[
-				'test',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@example.com',
-						],
-					],
-				],
-				true,
-				['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 6
-			[
-				'test',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'isLocalSystemBook' => true,
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				false,
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 7
-			[
-				'test@remote.com',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ example.com',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ example.com',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ example.com',
-						'EMAIL' => [
-							'username@example.com',
-						],
-					],
-				],
-				true,
-				['emails' => [['uuid' => 'uid1', 'name' => 'User @ example.com', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
-				false,
-				false,
-				true,
-			],
-			// data set 8
-			[
-				'test@remote.com',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'isLocalSystemBook' => true,
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				false,
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
-				false,
-				false,
-				true,
-			],
-			// data set 9
-			[
-				'username@example.com',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ example.com',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ example.com',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ example.com',
-						'EMAIL' => [
-							'username@example.com',
-						],
-					],
-				],
-				true,
-				['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
-				true,
-				false,
-				false,
-			],
-			// data set 10
-			[
-				'username@example.com',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User3 @ example.com',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ example.com',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ example.com',
-						'EMAIL' => [
-							'username@example.com',
-						],
-					],
-				],
-				false,
-				['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
-				true,
-				false,
-				false,
-			],
-			// data set 11
-			// contact with space
-			[
-				'user name@localhost',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User Name @ Localhost',
-						'EMAIL' => [
-							'user name@localhost',
-						],
-					],
-				],
-				false,
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 12
-			// remote with space, no contact
-			[
-				'user space@remote.com',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'isLocalSystemBook' => true,
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				false,
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 13
-			// Local user found by email => no result
-			[
-				'test@example.com',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-					]
-				],
-				false,
-				['exact' => []],
-				false,
-				false,
-				true,
-			],
-			// data set 14
-			// Current local user found by email => no result
-			[
-				'test@example.com',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['current@localhost'],
-						'isLocalSystemBook' => true,
-					]
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-				true,
-			],
-			// data set 15
-			// Several local users found by email => no result nor pagination
-			[
-				'test@example',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User1',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test1@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2',
-						'EMAIL' => ['test@example.de'],
-						'CLOUD' => ['test2@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3',
-						'EMAIL' => ['test@example.org'],
-						'CLOUD' => ['test3@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid4',
-						'FN' => 'User4',
-						'EMAIL' => ['test@example.net'],
-						'CLOUD' => ['test4@localhost'],
-						'isLocalSystemBook' => true,
-					],
-				],
-				true,
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				false,
-			],
-			// data set 16
-			// Pagination and "more results" for normal emails
-			[
-				'test@example',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User1',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test1@localhost'],
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2',
-						'EMAIL' => ['test@example.de'],
-						'CLOUD' => ['test2@localhost'],
-					],
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3',
-						'EMAIL' => ['test@example.org'],
-						'CLOUD' => ['test3@localhost'],
-					],
-					[
-						'UID' => 'uid4',
-						'FN' => 'User4',
-						'EMAIL' => ['test@example.net'],
-						'CLOUD' => ['test4@localhost'],
-					],
-				],
-				true,
-				['emails' => [
-					['uuid' => 'uid1', 'name' => 'User1', 'type' => '', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@example.com']],
-					['uuid' => 'uid2', 'name' => 'User2', 'type' => '', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@example.de']],
-				], 'exact' => ['emails' => []]],
-				false,
-				true,
-				false,
-			],
-			// data set 17
-			// multiple email addresses with type
-			[
-				'User Name',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User Name',
-						'EMAIL' => [
-							['type' => 'HOME', 'value' => 'username@example.com'],
-							['type' => 'WORK', 'value' => 'other@example.com'],
-						],
-					],
-				],
-				false,
-				['emails' => [
-				], 'exact' => ['emails' => [
-					['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'HOME', 'label' => 'User Name (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']],
-					['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'WORK', 'label' => 'User Name (other@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'other@example.com']]
-				]]],
-				false,
-				false,
-				false,
-			],
-			// data set 18
-			// idn email
-			[
-				'test@lölölölölölölöl.com',
-				[],
-				true,
-				['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@lölölölölölölöl.com', 'label' => 'test@lölölölölölölöl.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@lölölölölölölöl.com']]]]],
-				false,
-				false,
-				true,
-			],
-		];
-	}
+    public static function dataSearchEmail(): array {
+        return [
+            // data set 0
+            ['test', [], true, ['emails' => [], 'exact' => ['emails' => []]], false, false, false],
+            // data set 1
+            ['test', [], false, ['emails' => [], 'exact' => ['emails' => []]], false, false, false],
+            // data set 2
+            [
+                'test@remote.com',
+                [],
+                true,
+                ['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+                false,
+                false,
+                true,
+            ],
+            // data set 3
+            [ // no valid email address
+                'test@remote',
+                [],
+                true,
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 4
+            [
+                'test@remote.com',
+                [],
+                false,
+                ['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@remote.com', 'label' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+                false,
+                false,
+                true,
+            ],
+            // data set 5
+            [
+                'test',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@example.com',
+                        ],
+                    ],
+                ],
+                true,
+                ['emails' => [['uuid' => 'uid1', 'name' => 'User @ Localhost', 'type' => '', 'label' => 'User @ Localhost (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 6
+            [
+                'test',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'isLocalSystemBook' => true,
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 7
+            [
+                'test@remote.com',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ example.com',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ example.com',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ example.com',
+                        'EMAIL' => [
+                            'username@example.com',
+                        ],
+                    ],
+                ],
+                true,
+                ['emails' => [['uuid' => 'uid1', 'name' => 'User @ example.com', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+                false,
+                false,
+                true,
+            ],
+            // data set 8
+            [
+                'test@remote.com',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'isLocalSystemBook' => true,
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [], 'exact' => ['emails' => [['label' => 'test@remote.com', 'uuid' => 'test@remote.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@remote.com']]]]],
+                false,
+                false,
+                true,
+            ],
+            // data set 9
+            [
+                'username@example.com',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ example.com',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ example.com',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ example.com',
+                        'EMAIL' => [
+                            'username@example.com',
+                        ],
+                    ],
+                ],
+                true,
+                ['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
+                true,
+                false,
+                false,
+            ],
+            // data set 10
+            [
+                'username@example.com',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User3 @ example.com',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ example.com',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ example.com',
+                        'EMAIL' => [
+                            'username@example.com',
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [], 'exact' => ['emails' => [['name' => 'User @ example.com', 'uuid' => 'uid1', 'type' => '', 'label' => 'User @ example.com (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']]]]],
+                true,
+                false,
+                false,
+            ],
+            // data set 11
+            // contact with space
+            [
+                'user name@localhost',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User Name @ Localhost',
+                        'EMAIL' => [
+                            'user name@localhost',
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 12
+            // remote with space, no contact
+            [
+                'user space@remote.com',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'isLocalSystemBook' => true,
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 13
+            // Local user found by email => no result
+            [
+                'test@example.com',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                    ]
+                ],
+                false,
+                ['exact' => []],
+                false,
+                false,
+                true,
+            ],
+            // data set 14
+            // Current local user found by email => no result
+            [
+                'test@example.com',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['current@localhost'],
+                        'isLocalSystemBook' => true,
+                    ]
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+                true,
+            ],
+            // data set 15
+            // Several local users found by email => no result nor pagination
+            [
+                'test@example',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User1',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test1@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2',
+                        'EMAIL' => ['test@example.de'],
+                        'CLOUD' => ['test2@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3',
+                        'EMAIL' => ['test@example.org'],
+                        'CLOUD' => ['test3@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid4',
+                        'FN' => 'User4',
+                        'EMAIL' => ['test@example.net'],
+                        'CLOUD' => ['test4@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                ],
+                true,
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                false,
+            ],
+            // data set 16
+            // Pagination and "more results" for normal emails
+            [
+                'test@example',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User1',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test1@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2',
+                        'EMAIL' => ['test@example.de'],
+                        'CLOUD' => ['test2@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3',
+                        'EMAIL' => ['test@example.org'],
+                        'CLOUD' => ['test3@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid4',
+                        'FN' => 'User4',
+                        'EMAIL' => ['test@example.net'],
+                        'CLOUD' => ['test4@localhost'],
+                    ],
+                ],
+                true,
+                ['emails' => [
+                    ['uuid' => 'uid1', 'name' => 'User1', 'type' => '', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@example.com']],
+                    ['uuid' => 'uid2', 'name' => 'User2', 'type' => '', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@example.de']],
+                ], 'exact' => ['emails' => []]],
+                false,
+                true,
+                false,
+            ],
+            // data set 17
+            // multiple email addresses with type
+            [
+                'User Name',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User Name',
+                        'EMAIL' => [
+                            ['type' => 'HOME', 'value' => 'username@example.com'],
+                            ['type' => 'WORK', 'value' => 'other@example.com'],
+                        ],
+                    ],
+                ],
+                false,
+                ['emails' => [
+                ], 'exact' => ['emails' => [
+                    ['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'HOME', 'label' => 'User Name (username@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'username@example.com']],
+                    ['name' => 'User Name', 'uuid' => 'uid1', 'type' => 'WORK', 'label' => 'User Name (other@example.com)', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'other@example.com']]
+                ]]],
+                false,
+                false,
+                false,
+            ],
+            // data set 18
+            // idn email
+            [
+                'test@lölölölölölölöl.com',
+                [],
+                true,
+                ['emails' => [], 'exact' => ['emails' => [['uuid' => 'test@lölölölölölölöl.com', 'label' => 'test@lölölölölölölöl.com', 'value' => ['shareType' => IShare::TYPE_EMAIL, 'shareWith' => 'test@lölölölölölölöl.com']]]]],
+                false,
+                false,
+                true,
+            ],
+        ];
+    }
 
-	/**
-	 *
-	 * @param string $searchTerm
-	 * @param array $contacts
-	 * @param bool $shareeEnumeration
-	 * @param array $expectedResult
-	 * @param bool $expectedExactIdMatch
-	 * @param bool $expectedMoreResults
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSearchUser')]
-	public function testSearchUser($searchTerm, $contacts, $shareeEnumeration, $expectedResult, $expectedExactIdMatch, $expectedMoreResults): void {
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(
-				function ($appName, $key, $default) use ($shareeEnumeration) {
-					if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
-						return $shareeEnumeration ? 'yes' : 'no';
-					}
-					return $default;
-				}
-			);
+    /**
+     *
+     * @param string $searchTerm
+     * @param array $contacts
+     * @param bool $shareeEnumeration
+     * @param array $expectedResult
+     * @param bool $expectedExactIdMatch
+     * @param bool $expectedMoreResults
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSearchUser')]
+    public function testSearchUser($searchTerm, $contacts, $shareeEnumeration, $expectedResult, $expectedExactIdMatch, $expectedMoreResults): void {
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(
+                function ($appName, $key, $default) use ($shareeEnumeration) {
+                    if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
+                        return $shareeEnumeration ? 'yes' : 'no';
+                    }
+                    return $default;
+                }
+            );
 
-		$this->instantiatePlugin(IShare::TYPE_USER);
+        $this->instantiatePlugin(IShare::TYPE_USER);
 
-		$currentUser = $this->createMock(IUser::class);
-		$currentUser->method('getUID')
-			->willReturn('current');
-		$this->userSession->method('getUser')
-			->willReturn($currentUser);
+        $currentUser = $this->createMock(IUser::class);
+        $currentUser->method('getUID')
+            ->willReturn('current');
+        $this->userSession->method('getUser')
+            ->willReturn($currentUser);
 
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
-				if ($search === $searchTerm) {
-					return $contacts;
-				}
-				return [];
-			});
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
+                if ($search === $searchTerm) {
+                    return $contacts;
+                }
+                return [];
+            });
 
-		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
-		$result = $this->searchResult->asArray();
+        $moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
+        $result = $this->searchResult->asArray();
 
-		$this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
-		$this->assertEquals($expectedResult, $result);
-		$this->assertSame($expectedMoreResults, $moreResults);
-	}
+        $this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
+        $this->assertEquals($expectedResult, $result);
+        $this->assertSame($expectedMoreResults, $moreResults);
+    }
 
-	public static function dataSearchUser(): array {
-		return [
-			// data set 0
-			['test', [], true, ['exact' => []], false, false],
-			// data set 1
-			['test', [], false, ['exact' => []], false, false],
-			// data set 2
-			[
-				'test@remote.com',
-				[],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 3
-			[
-				'test@remote.com',
-				[],
-				false,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 4
-			[
-				'test',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 5
-			[
-				'test',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'isLocalSystemBook' => true,
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				false,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 6
-			[
-				'test@remote.com',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 7
-			[
-				'username@localhost',
-				[
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3 @ Localhost',
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2 @ Localhost',
-						'EMAIL' => [
-						],
-					],
-					[
-						'UID' => 'uid1',
-						'FN' => 'User @ Localhost',
-						'EMAIL' => [
-							'username@localhost',
-						],
-					],
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 8
-			// Local user found by email
-			[
-				'test@example.com',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-					]
-				],
-				false,
-				['users' => [], 'exact' => ['users' => [['uuid' => 'uid1', 'name' => 'User', 'label' => 'User (test@example.com)','value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test'], 'shareWithDisplayNameUnique' => 'test@example.com']]]],
-				true,
-				false,
-			],
-			// data set 9
-			// Current local user found by email => no result
-			[
-				'test@example.com',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['current@localhost'],
-						'isLocalSystemBook' => true,
-					]
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-			// data set 10
-			// Pagination and "more results" for user matches by emails
-			[
-				'test@example',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User1',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test1@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2',
-						'EMAIL' => ['test@example.de'],
-						'CLOUD' => ['test2@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3',
-						'EMAIL' => ['test@example.org'],
-						'CLOUD' => ['test3@localhost'],
-						'isLocalSystemBook' => true,
-					],
-					[
-						'UID' => 'uid4',
-						'FN' => 'User4',
-						'EMAIL' => ['test@example.net'],
-						'CLOUD' => ['test4@localhost'],
-						'isLocalSystemBook' => true,
-					],
-				],
-				true,
-				['users' => [
-					['uuid' => 'uid1', 'name' => 'User1', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test1'], 'shareWithDisplayNameUnique' => 'test@example.com'],
-					['uuid' => 'uid2', 'name' => 'User2', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test2'], 'shareWithDisplayNameUnique' => 'test@example.de'],
-				], 'exact' => ['users' => []]],
-				false,
-				true,
-			],
-			// data set 11
-			// Pagination and "more results" for normal emails
-			[
-				'test@example',
-				[
-					[
-						'UID' => 'uid1',
-						'FN' => 'User1',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test1@localhost'],
-					],
-					[
-						'UID' => 'uid2',
-						'FN' => 'User2',
-						'EMAIL' => ['test@example.de'],
-						'CLOUD' => ['test2@localhost'],
-					],
-					[
-						'UID' => 'uid3',
-						'FN' => 'User3',
-						'EMAIL' => ['test@example.org'],
-						'CLOUD' => ['test3@localhost'],
-					],
-					[
-						'UID' => 'uid4',
-						'FN' => 'User4',
-						'EMAIL' => ['test@example.net'],
-						'CLOUD' => ['test4@localhost'],
-					],
-				],
-				true,
-				['exact' => []],
-				false,
-				false,
-			],
-		];
-	}
+    public static function dataSearchUser(): array {
+        return [
+            // data set 0
+            ['test', [], true, ['exact' => []], false, false],
+            // data set 1
+            ['test', [], false, ['exact' => []], false, false],
+            // data set 2
+            [
+                'test@remote.com',
+                [],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 3
+            [
+                'test@remote.com',
+                [],
+                false,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 4
+            [
+                'test',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 5
+            [
+                'test',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'isLocalSystemBook' => true,
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                false,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 6
+            [
+                'test@remote.com',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 7
+            [
+                'username@localhost',
+                [
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3 @ Localhost',
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2 @ Localhost',
+                        'EMAIL' => [
+                        ],
+                    ],
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User @ Localhost',
+                        'EMAIL' => [
+                            'username@localhost',
+                        ],
+                    ],
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 8
+            // Local user found by email
+            [
+                'test@example.com',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                    ]
+                ],
+                false,
+                ['users' => [], 'exact' => ['users' => [['uuid' => 'uid1', 'name' => 'User', 'label' => 'User (test@example.com)','value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test'], 'shareWithDisplayNameUnique' => 'test@example.com']]]],
+                true,
+                false,
+            ],
+            // data set 9
+            // Current local user found by email => no result
+            [
+                'test@example.com',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['current@localhost'],
+                        'isLocalSystemBook' => true,
+                    ]
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+            // data set 10
+            // Pagination and "more results" for user matches by emails
+            [
+                'test@example',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User1',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test1@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2',
+                        'EMAIL' => ['test@example.de'],
+                        'CLOUD' => ['test2@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3',
+                        'EMAIL' => ['test@example.org'],
+                        'CLOUD' => ['test3@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                    [
+                        'UID' => 'uid4',
+                        'FN' => 'User4',
+                        'EMAIL' => ['test@example.net'],
+                        'CLOUD' => ['test4@localhost'],
+                        'isLocalSystemBook' => true,
+                    ],
+                ],
+                true,
+                ['users' => [
+                    ['uuid' => 'uid1', 'name' => 'User1', 'label' => 'User1 (test@example.com)', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test1'], 'shareWithDisplayNameUnique' => 'test@example.com'],
+                    ['uuid' => 'uid2', 'name' => 'User2', 'label' => 'User2 (test@example.de)', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test2'], 'shareWithDisplayNameUnique' => 'test@example.de'],
+                ], 'exact' => ['users' => []]],
+                false,
+                true,
+            ],
+            // data set 11
+            // Pagination and "more results" for normal emails
+            [
+                'test@example',
+                [
+                    [
+                        'UID' => 'uid1',
+                        'FN' => 'User1',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test1@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid2',
+                        'FN' => 'User2',
+                        'EMAIL' => ['test@example.de'],
+                        'CLOUD' => ['test2@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid3',
+                        'FN' => 'User3',
+                        'EMAIL' => ['test@example.org'],
+                        'CLOUD' => ['test3@localhost'],
+                    ],
+                    [
+                        'UID' => 'uid4',
+                        'FN' => 'User4',
+                        'EMAIL' => ['test@example.net'],
+                        'CLOUD' => ['test4@localhost'],
+                    ],
+                ],
+                true,
+                ['exact' => []],
+                false,
+                false,
+            ],
+        ];
+    }
 
-	/**
-	 *
-	 * @param string $searchTerm
-	 * @param array $contacts
-	 * @param array $expectedResult
-	 * @param bool $expectedExactIdMatch
-	 * @param bool $expectedMoreResults
-	 * @param array $userToGroupMapping
-	 * @param bool $validEmail
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSearchEmailGroupsOnly')]
-	public function testSearchEmailGroupsOnly($searchTerm, $contacts, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $userToGroupMapping, $validEmail): void {
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(
-				function ($appName, $key, $default) {
-					if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
-						return 'yes';
-					} elseif ($appName === 'core' && $key === 'shareapi_only_share_with_group_members') {
-						return 'yes';
-					}
-					return $default;
-				}
-			);
+    /**
+     *
+     * @param string $searchTerm
+     * @param array $contacts
+     * @param array $expectedResult
+     * @param bool $expectedExactIdMatch
+     * @param bool $expectedMoreResults
+     * @param array $userToGroupMapping
+     * @param bool $validEmail
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSearchEmailGroupsOnly')]
+    public function testSearchEmailGroupsOnly($searchTerm, $contacts, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $userToGroupMapping, $validEmail): void {
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(
+                function ($appName, $key, $default) {
+                    if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
+                        return 'yes';
+                    } elseif ($appName === 'core' && $key === 'shareapi_only_share_with_group_members') {
+                        return 'yes';
+                    }
+                    return $default;
+                }
+            );
 
-		$this->instantiatePlugin(IShare::TYPE_EMAIL);
+        $this->instantiatePlugin(IShare::TYPE_EMAIL);
 
-		/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
-		$currentUser = $this->createMock('\OCP\IUser');
+        /** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
+        $currentUser = $this->createMock('\OCP\IUser');
 
-		$currentUser->expects($this->any())
-			->method('getUID')
-			->willReturn('currentUser');
+        $currentUser->expects($this->any())
+            ->method('getUID')
+            ->willReturn('currentUser');
 
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
-				if ($search === $searchTerm) {
-					return $contacts;
-				}
-				return [];
-			});
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
+                if ($search === $searchTerm) {
+                    return $contacts;
+                }
+                return [];
+            });
 
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($currentUser);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($currentUser);
 
-		$this->groupManager->expects($this->any())
-			->method('getUserGroupIds')
-			->willReturnCallback(function (IUser $user) use ($userToGroupMapping) {
-				return $userToGroupMapping[$user->getUID()];
-			});
+        $this->groupManager->expects($this->any())
+            ->method('getUserGroupIds')
+            ->willReturnCallback(function (IUser $user) use ($userToGroupMapping) {
+                return $userToGroupMapping[$user->getUID()];
+            });
 
-		$this->groupManager->expects($this->any())
-			->method('isInGroup')
-			->willReturnCallback(function ($userId, $group) use ($userToGroupMapping) {
-				return in_array($group, $userToGroupMapping[$userId]);
-			});
+        $this->groupManager->expects($this->any())
+            ->method('isInGroup')
+            ->willReturnCallback(function ($userId, $group) use ($userToGroupMapping) {
+                return in_array($group, $userToGroupMapping[$userId]);
+            });
 
-		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
-		$result = $this->searchResult->asArray();
+        $moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
+        $result = $this->searchResult->asArray();
 
-		$this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
-		$this->assertEquals($expectedResult, $result);
-		$this->assertSame($expectedMoreResults, $moreResults);
-	}
+        $this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
+        $this->assertEquals($expectedResult, $result);
+        $this->assertSame($expectedMoreResults, $moreResults);
+    }
 
-	public static function dataSearchEmailGroupsOnly(): array {
-		return [
-			// The user `User` can share with the current user
-			[
-				'test',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group1'],
-				],
-				false,
-			],
-			// The user `User` cannot share with the current user
-			[
-				'test',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['emails' => [], 'exact' => ['emails' => []]],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group2'],
-				],
-				false,
-			],
-			// The user `User` cannot share with the current user, but there is an exact match on the e-mail address -> share by e-mail
-			[
-				'test@example.com',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['emails' => [], 'exact' => ['emails' => [['label' => 'test@example.com', 'uuid' => 'test@example.com', 'value' => ['shareType' => IShare::TYPE_EMAIL,'shareWith' => 'test@example.com']]]]],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group2'],
-				],
-				true,
-			]
-		];
-	}
+    public static function dataSearchEmailGroupsOnly(): array {
+        return [
+            // The user `User` can share with the current user
+            [
+                'test',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group1'],
+                ],
+                false,
+            ],
+            // The user `User` cannot share with the current user
+            [
+                'test',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['emails' => [], 'exact' => ['emails' => []]],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group2'],
+                ],
+                false,
+            ],
+            // The user `User` cannot share with the current user, but there is an exact match on the e-mail address -> share by e-mail
+            [
+                'test@example.com',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['emails' => [], 'exact' => ['emails' => [['label' => 'test@example.com', 'uuid' => 'test@example.com', 'value' => ['shareType' => IShare::TYPE_EMAIL,'shareWith' => 'test@example.com']]]]],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group2'],
+                ],
+                true,
+            ]
+        ];
+    }
 
-	/**
-	 *
-	 * @param string $searchTerm
-	 * @param array $contacts
-	 * @param array $expectedResult
-	 * @param bool $expectedExactIdMatch
-	 * @param bool $expectedMoreResults
-	 * @param array $userToGroupMapping
-	 */
-	#[\PHPUnit\Framework\Attributes\DataProvider('dataSearchUserGroupsOnly')]
-	public function testSearchUserGroupsOnly($searchTerm, $contacts, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $userToGroupMapping): void {
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(
-				function ($appName, $key, $default) {
-					if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
-						return 'yes';
-					} elseif ($appName === 'core' && $key === 'shareapi_only_share_with_group_members') {
-						return 'yes';
-					}
-					return $default;
-				}
-			);
+    /**
+     *
+     * @param string $searchTerm
+     * @param array $contacts
+     * @param array $expectedResult
+     * @param bool $expectedExactIdMatch
+     * @param bool $expectedMoreResults
+     * @param array $userToGroupMapping
+     */
+    #[\PHPUnit\Framework\Attributes\DataProvider('dataSearchUserGroupsOnly')]
+    public function testSearchUserGroupsOnly($searchTerm, $contacts, $expectedResult, $expectedExactIdMatch, $expectedMoreResults, $userToGroupMapping): void {
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(
+                function ($appName, $key, $default) {
+                    if ($appName === 'core' && $key === 'shareapi_allow_share_dialog_user_enumeration') {
+                        return 'yes';
+                    } elseif ($appName === 'core' && $key === 'shareapi_only_share_with_group_members') {
+                        return 'yes';
+                    }
+                    return $default;
+                }
+            );
 
-		$this->instantiatePlugin(IShare::TYPE_USER);
+        $this->instantiatePlugin(IShare::TYPE_USER);
 
-		/** @var \OCP\IUser | \PHPUnit\Framework\MockObject\MockObject */
-		$currentUser = $this->createMock('\OCP\IUser');
+        /** @var \OCP\IUser | \PHPUnit\Framework\MockObject\MockObject */
+        $currentUser = $this->createMock('\OCP\IUser');
 
-		$currentUser->expects($this->any())
-			->method('getUID')
-			->willReturn('currentUser');
+        $currentUser->expects($this->any())
+            ->method('getUID')
+            ->willReturn('currentUser');
 
-		$this->contactsManager->expects($this->any())
-			->method('search')
-			->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
-				if ($search === $searchTerm) {
-					return $contacts;
-				}
-				return [];
-			});
+        $this->contactsManager->expects($this->any())
+            ->method('search')
+            ->willReturnCallback(function ($search, $searchAttributes) use ($searchTerm, $contacts) {
+                if ($search === $searchTerm) {
+                    return $contacts;
+                }
+                return [];
+            });
 
-		$this->userSession->expects($this->any())
-			->method('getUser')
-			->willReturn($currentUser);
+        $this->userSession->expects($this->any())
+            ->method('getUser')
+            ->willReturn($currentUser);
 
-		$this->groupManager->expects($this->any())
-			->method('getUserGroupIds')
-			->willReturnCallback(function (\OCP\IUser $user) use ($userToGroupMapping) {
-				return $userToGroupMapping[$user->getUID()];
-			});
+        $this->groupManager->expects($this->any())
+            ->method('getUserGroupIds')
+            ->willReturnCallback(function (\OCP\IUser $user) use ($userToGroupMapping) {
+                return $userToGroupMapping[$user->getUID()];
+            });
 
-		$this->groupManager->expects($this->any())
-			->method('isInGroup')
-			->willReturnCallback(function ($userId, $group) use ($userToGroupMapping) {
-				return in_array($group, $userToGroupMapping[$userId]);
-			});
+        $this->groupManager->expects($this->any())
+            ->method('isInGroup')
+            ->willReturnCallback(function ($userId, $group) use ($userToGroupMapping) {
+                return in_array($group, $userToGroupMapping[$userId]);
+            });
 
-		$moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
-		$result = $this->searchResult->asArray();
+        $moreResults = $this->plugin->search($searchTerm, 2, 0, $this->searchResult);
+        $result = $this->searchResult->asArray();
 
-		$this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
-		$this->assertEquals($expectedResult, $result);
-		$this->assertSame($expectedMoreResults, $moreResults);
-	}
+        $this->assertSame($expectedExactIdMatch, $this->searchResult->hasExactIdMatch(new SearchResultType('emails')));
+        $this->assertEquals($expectedResult, $result);
+        $this->assertSame($expectedMoreResults, $moreResults);
+    }
 
-	public static function dataSearchUserGroupsOnly(): array {
-		return [
-			// The user `User` can share with the current user
-			[
-				'test',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['users' => [['label' => 'User (test@example.com)', 'uuid' => 'User', 'name' => 'User', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test'],'shareWithDisplayNameUnique' => 'test@example.com',]], 'exact' => ['users' => []]],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group1'],
-				],
-			],
-			// The user `User` cannot share with the current user
-			[
-				'test',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['exact' => []],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group2'],
-				],
-			],
-			// The user `User` cannot share with the current user, but there is an exact match on the e-mail address -> share by e-mail
-			[
-				'test@example.com',
-				[
-					[
-						'FN' => 'User',
-						'EMAIL' => ['test@example.com'],
-						'CLOUD' => ['test@localhost'],
-						'isLocalSystemBook' => true,
-						'UID' => 'User',
-					]
-				],
-				['exact' => []],
-				false,
-				false,
-				[
-					'currentUser' => ['group1'],
-					'User' => ['group2'],
-				],
-			]
-		];
-	}
+    public static function dataSearchUserGroupsOnly(): array {
+        return [
+            // The user `User` can share with the current user
+            [
+                'test',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['users' => [['label' => 'User (test@example.com)', 'uuid' => 'User', 'name' => 'User', 'value' => ['shareType' => IShare::TYPE_USER, 'shareWith' => 'test'],'shareWithDisplayNameUnique' => 'test@example.com',]], 'exact' => ['users' => []]],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group1'],
+                ],
+            ],
+            // The user `User` cannot share with the current user
+            [
+                'test',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['exact' => []],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group2'],
+                ],
+            ],
+            // The user `User` cannot share with the current user, but there is an exact match on the e-mail address -> share by e-mail
+            [
+                'test@example.com',
+                [
+                    [
+                        'FN' => 'User',
+                        'EMAIL' => ['test@example.com'],
+                        'CLOUD' => ['test@localhost'],
+                        'isLocalSystemBook' => true,
+                        'UID' => 'User',
+                    ]
+                ],
+                ['exact' => []],
+                false,
+                false,
+                [
+                    'currentUser' => ['group1'],
+                    'User' => ['group2'],
+                ],
+            ]
+        ];
+    }
 }