nextcloud / server

build/integration/features/bootstrap/RoutingContext.php

Indentation +28 added lines, -28 removed lines

@@ -11,32 +11,32 @@
 require __DIR__ . '/autoload.php';
 
 class RoutingContext implements Context, SnippetAcceptingContext {
-	use Provisioning;
-	use AppConfiguration;
-	use CommandLine;
-
-	protected function resetAppConfigs(): void {
-	}
-
-	/**
-	 * @AfterScenario
-	 */
-	public function deleteMemcacheSetting(): void {
-		$this->invokingTheCommand('config:system:delete memcache.local');
-	}
-
-	/**
-	 * @Given /^route "([^"]*)" of app "([^"]*)" is defined in routes.php$/
-	 */
-	public function routeOfAppIsDefinedInRoutesPhP(string $route, string $app): void {
-		$previousUser = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		$this->sendingTo('GET', "/apps/testing/api/v1/routes/routesphp/{$app}");
-		$this->theHTTPStatusCodeShouldBe('200');
-
-		Assert::assertStringContainsString($route, $this->response->getBody()->getContents());
-
-		$this->currentUser = $previousUser;
-	}
+    use Provisioning;
+    use AppConfiguration;
+    use CommandLine;
+
+    protected function resetAppConfigs(): void {
+    }
+
+    /**
+     * @AfterScenario
+     */
+    public function deleteMemcacheSetting(): void {
+        $this->invokingTheCommand('config:system:delete memcache.local');
+    }
+
+    /**
+     * @Given /^route "([^"]*)" of app "([^"]*)" is defined in routes.php$/
+     */
+    public function routeOfAppIsDefinedInRoutesPhP(string $route, string $app): void {
+        $previousUser = $this->currentUser;
+        $this->currentUser = 'admin';
+
+        $this->sendingTo('GET', "/apps/testing/api/v1/routes/routesphp/{$app}");
+        $this->theHTTPStatusCodeShouldBe('200');
+
+        Assert::assertStringContainsString($route, $this->response->getBody()->getContents());
+
+        $this->currentUser = $previousUser;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 use Behat\Behat\Context\SnippetAcceptingContext;
 use PHPUnit\Framework\Assert;
 
-require __DIR__ . '/autoload.php';
+require __DIR__.'/autoload.php';
 
 class RoutingContext implements Context, SnippetAcceptingContext {
 	use Provisioning;

build/integration/features/bootstrap/Provisioning.php

Indentation +1020 added lines, -1020 removed lines

@@ -14,1024 +14,1024 @@
 require __DIR__ . '/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) {
-		$previousUser = $this->currentUser;
-		$this->currentUser = 'admin';
-
-		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.
-
-		$this->currentUser = $previousUser;
-	}
-
-	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) {
+        $previousUser = $this->currentUser;
+        $this->currentUser = 'admin';
+
+        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.
+
+        $this->currentUser = $previousUser;
+    }
+
+    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]);
+            }
+        }
+    }
 }

lib/private/Route/CachingRouter.php

Indentation +129 added lines, -129 removed lines

@@ -21,144 +21,144 @@
 use Symfony\Component\Routing\RouteCollection;
 
 class CachingRouter extends Router {
-	protected ICache $cache;
+    protected ICache $cache;
 
-	protected array $legacyCreatedRoutes = [];
+    protected array $legacyCreatedRoutes = [];
 
-	public function __construct(
-		ICacheFactory $cacheFactory,
-		LoggerInterface $logger,
-		IRequest $request,
-		IConfig $config,
-		IEventLogger $eventLogger,
-		ContainerInterface $container,
-		IAppManager $appManager,
-	) {
-		$this->cache = $cacheFactory->createLocal('route');
-		parent::__construct($logger, $request, $config, $eventLogger, $container, $appManager);
-	}
+    public function __construct(
+        ICacheFactory $cacheFactory,
+        LoggerInterface $logger,
+        IRequest $request,
+        IConfig $config,
+        IEventLogger $eventLogger,
+        ContainerInterface $container,
+        IAppManager $appManager,
+    ) {
+        $this->cache = $cacheFactory->createLocal('route');
+        parent::__construct($logger, $request, $config, $eventLogger, $container, $appManager);
+    }
 
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 * @param bool $absolute
-	 * @return string
-	 */
-	public function generate($name, $parameters = [], $absolute = false) {
-		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
-		$cachedKey = $this->cache->get($key);
-		if ($cachedKey) {
-			return $cachedKey;
-		} else {
-			$url = parent::generate($name, $parameters, $absolute);
-			if ($url) {
-				$this->cache->set($key, $url, 3600);
-			}
-			return $url;
-		}
-	}
+    /**
+     * Generate url based on $name and $parameters
+     *
+     * @param string $name Name of the route to use.
+     * @param array $parameters Parameters for the route
+     * @param bool $absolute
+     * @return string
+     */
+    public function generate($name, $parameters = [], $absolute = false) {
+        asort($parameters);
+        $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+        $cachedKey = $this->cache->get($key);
+        if ($cachedKey) {
+            return $cachedKey;
+        } else {
+            $url = parent::generate($name, $parameters, $absolute);
+            if ($url) {
+                $this->cache->set($key, $url, 3600);
+            }
+            return $url;
+        }
+    }
 
-	private function serializeRouteCollection(RouteCollection $collection): array {
-		$dumper = new CompiledUrlMatcherDumper($collection);
-		return $dumper->getCompiledRoutes();
-	}
+    private function serializeRouteCollection(RouteCollection $collection): array {
+        $dumper = new CompiledUrlMatcherDumper($collection);
+        return $dumper->getCompiledRoutes();
+    }
 
-	/**
-	 * Find the route matching $url
-	 *
-	 * @param string $url The url to find
-	 * @throws \Exception
-	 * @return array
-	 */
-	public function findMatchingRoute(string $url): array {
-		$this->eventLogger->start('cacheroute:match', 'Match route');
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection';
-		$cachedRoutes = $this->cache->get($key);
-		if (!$cachedRoutes) {
-			// Ensure that all apps are loaded, as for users with an active
-			// session only the apps that are enabled for that user might have
-			// been loaded.
-			$enabledApps = $this->appManager->getEnabledApps();
-			foreach ($enabledApps as $app) {
-				$this->appManager->loadApp($app);
-			}
-			parent::loadRoutes();
-			$cachedRoutes = $this->serializeRouteCollection($this->root);
-			$this->cache->set($key, $cachedRoutes, ($this->config->getSystemValueBool('debug') ? 3 : 3600));
-		}
-		$matcher = new CompiledUrlMatcher($cachedRoutes, $this->context);
-		$this->eventLogger->start('cacheroute:url:match', 'Symfony URL match call');
-		try {
-			$parameters = $matcher->match($url);
-		} catch (ResourceNotFoundException $e) {
-			if (!str_ends_with($url, '/')) {
-				// We allow links to apps/files? for backwards compatibility reasons
-				// However, since Symfony does not allow empty route names, the route
-				// we need to match is '/', so we need to append the '/' here.
-				try {
-					$parameters = $matcher->match($url . '/');
-				} catch (ResourceNotFoundException $newException) {
-					// If we still didn't match a route, we throw the original exception
-					throw $e;
-				}
-			} else {
-				throw $e;
-			}
-		}
-		$this->eventLogger->end('cacheroute:url:match');
+    /**
+     * Find the route matching $url
+     *
+     * @param string $url The url to find
+     * @throws \Exception
+     * @return array
+     */
+    public function findMatchingRoute(string $url): array {
+        $this->eventLogger->start('cacheroute:match', 'Match route');
+        $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection';
+        $cachedRoutes = $this->cache->get($key);
+        if (!$cachedRoutes) {
+            // Ensure that all apps are loaded, as for users with an active
+            // session only the apps that are enabled for that user might have
+            // been loaded.
+            $enabledApps = $this->appManager->getEnabledApps();
+            foreach ($enabledApps as $app) {
+                $this->appManager->loadApp($app);
+            }
+            parent::loadRoutes();
+            $cachedRoutes = $this->serializeRouteCollection($this->root);
+            $this->cache->set($key, $cachedRoutes, ($this->config->getSystemValueBool('debug') ? 3 : 3600));
+        }
+        $matcher = new CompiledUrlMatcher($cachedRoutes, $this->context);
+        $this->eventLogger->start('cacheroute:url:match', 'Symfony URL match call');
+        try {
+            $parameters = $matcher->match($url);
+        } catch (ResourceNotFoundException $e) {
+            if (!str_ends_with($url, '/')) {
+                // We allow links to apps/files? for backwards compatibility reasons
+                // However, since Symfony does not allow empty route names, the route
+                // we need to match is '/', so we need to append the '/' here.
+                try {
+                    $parameters = $matcher->match($url . '/');
+                } catch (ResourceNotFoundException $newException) {
+                    // If we still didn't match a route, we throw the original exception
+                    throw $e;
+                }
+            } else {
+                throw $e;
+            }
+        }
+        $this->eventLogger->end('cacheroute:url:match');
 
-		$this->eventLogger->end('cacheroute:match');
-		return $parameters;
-	}
+        $this->eventLogger->end('cacheroute:match');
+        return $parameters;
+    }
 
-	/**
-	 * @param array{action:mixed, ...} $parameters
-	 */
-	protected function callLegacyActionRoute(array $parameters): void {
-		/*
+    /**
+     * @param array{action:mixed, ...} $parameters
+     */
+    protected function callLegacyActionRoute(array $parameters): void {
+        /*
 		 * Closures cannot be serialized to cache, so for legacy routes calling an action we have to include the routes.php file again
 		 */
-		$app = $parameters['app'];
-		$this->useCollection($app);
-		parent::requireRouteFile($parameters['route-file'], $app);
-		$collection = $this->getCollection($app);
-		$parameters['action'] = $collection->get($parameters['_route'])?->getDefault('action');
-		parent::callLegacyActionRoute($parameters);
-	}
+        $app = $parameters['app'];
+        $this->useCollection($app);
+        parent::requireRouteFile($parameters['route-file'], $app);
+        $collection = $this->getCollection($app);
+        $parameters['action'] = $collection->get($parameters['_route'])?->getDefault('action');
+        parent::callLegacyActionRoute($parameters);
+    }
 
-	/**
-	 * Create a \OC\Route\Route.
-	 * Deprecated
-	 *
-	 * @param string $name Name of the route to create.
-	 * @param string $pattern The pattern to match
-	 * @param array $defaults An array of default parameter values
-	 * @param array $requirements An array of requirements for parameters (regexes)
-	 */
-	public function create($name, $pattern, array $defaults = [], array $requirements = []): Route {
-		$this->legacyCreatedRoutes[] = $name;
-		return parent::create($name, $pattern, $defaults, $requirements);
-	}
+    /**
+     * Create a \OC\Route\Route.
+     * Deprecated
+     *
+     * @param string $name Name of the route to create.
+     * @param string $pattern The pattern to match
+     * @param array $defaults An array of default parameter values
+     * @param array $requirements An array of requirements for parameters (regexes)
+     */
+    public function create($name, $pattern, array $defaults = [], array $requirements = []): Route {
+        $this->legacyCreatedRoutes[] = $name;
+        return parent::create($name, $pattern, $defaults, $requirements);
+    }
 
-	/**
-	 * Require a routes.php file
-	 */
-	protected function requireRouteFile(string $file, string $appName): void {
-		$this->legacyCreatedRoutes = [];
-		parent::requireRouteFile($file, $appName);
-		foreach ($this->legacyCreatedRoutes as $routeName) {
-			$route = $this->collection?->get($routeName);
-			if ($route === null) {
-				/* Should never happen */
-				throw new \Exception("Could not find route $routeName");
-			}
-			if ($route->hasDefault('action')) {
-				$route->setDefault('route-file', $file);
-				$route->setDefault('app', $appName);
-			}
-		}
-	}
+    /**
+     * Require a routes.php file
+     */
+    protected function requireRouteFile(string $file, string $appName): void {
+        $this->legacyCreatedRoutes = [];
+        parent::requireRouteFile($file, $appName);
+        foreach ($this->legacyCreatedRoutes as $routeName) {
+            $route = $this->collection?->get($routeName);
+            if ($route === null) {
+                /* Should never happen */
+                throw new \Exception("Could not find route $routeName");
+            }
+            if ($route->hasDefault('action')) {
+                $route->setDefault('route-file', $file);
+                $route->setDefault('app', $appName);
+            }
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
 	 */
 	public function generate($name, $parameters = [], $absolute = false) {
 		asort($parameters);
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute;
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute;
 		$cachedKey = $this->cache->get($key);
 		if ($cachedKey) {
 			return $cachedKey;
@@ -75,7 +75,7 @@ 
 	 */
 	public function findMatchingRoute(string $url): array {
 		$this->eventLogger->start('cacheroute:match', 'Match route');
-		$key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . '#rootCollection';
+		$key = $this->context->getHost().'#'.$this->context->getBaseUrl().'#rootCollection';
 		$cachedRoutes = $this->cache->get($key);
 		if (!$cachedRoutes) {
 			// Ensure that all apps are loaded, as for users with an active
@@ -99,7 +99,7 @@ 
 				// However, since Symfony does not allow empty route names, the route
 				// we need to match is '/', so we need to append the '/' here.
 				try {
-					$parameters = $matcher->match($url . '/');
+					$parameters = $matcher->match($url.'/');
 				} catch (ResourceNotFoundException $newException) {
 					// If we still didn't match a route, we throw the original exception
 					throw $e;

apps/testing/lib/Controller/RoutesController.php

Indentation +24 added lines, -24 removed lines

@@ -15,28 +15,28 @@
 
 class RoutesController extends OCSController {
 
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IAppManager $appManager,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	public function getRoutesInRoutesPhp(string $app): DataResponse {
-		try {
-			$appPath = $this->appManager->getAppPath($app);
-		} catch (AppPathNotFoundException) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		$file = $appPath . '/appinfo/routes.php';
-		if (!file_exists($file)) {
-			return new DataResponse();
-		}
-
-		$routes = include $file;
-
-		return new DataResponse($routes);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IAppManager $appManager,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    public function getRoutesInRoutesPhp(string $app): DataResponse {
+        try {
+            $appPath = $this->appManager->getAppPath($app);
+        } catch (AppPathNotFoundException) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        $file = $appPath . '/appinfo/routes.php';
+        if (!file_exists($file)) {
+            return new DataResponse();
+        }
+
+        $routes = include $file;
+
+        return new DataResponse($routes);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		$file = $appPath . '/appinfo/routes.php';
+		$file = $appPath.'/appinfo/routes.php';
 		if (!file_exists($file)) {
 			return new DataResponse();
 		}

apps/testing/appinfo/routes.php

Indentation +62 added lines, -62 removed lines

@@ -6,67 +6,67 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 return [
-	'routes' => [
-		[
-			'name' => 'RateLimitTest#userAndAnonProtected',
-			'url' => '/userAndAnonProtected',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'RateLimitTest#onlyAnonProtected',
-			'url' => '/anonProtected',
-			'verb' => 'GET',
-		],
-	],
+    'routes' => [
+        [
+            'name' => 'RateLimitTest#userAndAnonProtected',
+            'url' => '/userAndAnonProtected',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'RateLimitTest#onlyAnonProtected',
+            'url' => '/anonProtected',
+            'verb' => 'GET',
+        ],
+    ],
 
-	'ocs' => [
-		[
-			'name' => 'Config#setAppValue',
-			'url' => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Config#deleteAppValue',
-			'url' => '/api/v1/app/{appid}/{configkey}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#isLockingEnabled',
-			'url' => '/api/v1/lockprovisioning',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#isLocked',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'GET',
-		],
-		[
-			'name' => 'Locking#acquireLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'POST',
-		],
-		[
-			'name' => 'Locking#changeLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'PUT',
-		],
-		[
-			'name' => 'Locking#releaseLock',
-			'url' => '/api/v1/lockprovisioning/{type}/{user}',
-			'verb' => 'DELETE',
-		],
-		[
-			'name' => 'Locking#releaseAll',
-			'url' => '/api/v1/lockprovisioning/{type}',
-			'verb' => 'DELETE',
-			'defaults' => [
-				'type' => null
-			]
-		],
-		[
-			'name' => 'Routes#getRoutesInRoutesPhp',
-			'url' => '/api/v1/routes/routesphp/{app}',
-			'verb' => 'GET',
-		],
-	],
+    'ocs' => [
+        [
+            'name' => 'Config#setAppValue',
+            'url' => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Config#deleteAppValue',
+            'url' => '/api/v1/app/{appid}/{configkey}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#isLockingEnabled',
+            'url' => '/api/v1/lockprovisioning',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#isLocked',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'GET',
+        ],
+        [
+            'name' => 'Locking#acquireLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'POST',
+        ],
+        [
+            'name' => 'Locking#changeLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'PUT',
+        ],
+        [
+            'name' => 'Locking#releaseLock',
+            'url' => '/api/v1/lockprovisioning/{type}/{user}',
+            'verb' => 'DELETE',
+        ],
+        [
+            'name' => 'Locking#releaseAll',
+            'url' => '/api/v1/lockprovisioning/{type}',
+            'verb' => 'DELETE',
+            'defaults' => [
+                'type' => null
+            ]
+        ],
+        [
+            'name' => 'Routes#getRoutesInRoutesPhp',
+            'url' => '/api/v1/routes/routesphp/{app}',
+            'verb' => 'GET',
+        ],
+    ],
 ];

apps/testing/composer/composer/autoload_static.php

Spacing +33 added lines, -33 removed lines

@@ -6,52 +6,52 @@
 
 class ComposerStaticInitTesting
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' =>
-        array (
+        array(
             'OCA\\Testing\\' => 12,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Testing\\' =>
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Testing\\AlternativeHomeUserBackend' => __DIR__ . '/..' . '/../lib/AlternativeHomeUserBackend.php',
-        'OCA\\Testing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Testing\\Controller\\ConfigController' => __DIR__ . '/..' . '/../lib/Controller/ConfigController.php',
-        'OCA\\Testing\\Controller\\LockingController' => __DIR__ . '/..' . '/../lib/Controller/LockingController.php',
-        'OCA\\Testing\\Controller\\RateLimitTestController' => __DIR__ . '/..' . '/../lib/Controller/RateLimitTestController.php',
-        'OCA\\Testing\\Controller\\RoutesController' => __DIR__ . '/..' . '/../lib/Controller/RoutesController.php',
-        'OCA\\Testing\\Conversion\\ConversionProvider' => __DIR__ . '/..' . '/../lib/Conversion/ConversionProvider.php',
-        'OCA\\Testing\\HiddenGroupBackend' => __DIR__ . '/..' . '/../lib/HiddenGroupBackend.php',
-        'OCA\\Testing\\Listener\\GetDeclarativeSettingsValueListener' => __DIR__ . '/..' . '/../lib/Listener/GetDeclarativeSettingsValueListener.php',
-        'OCA\\Testing\\Listener\\RegisterDeclarativeSettingsListener' => __DIR__ . '/..' . '/../lib/Listener/RegisterDeclarativeSettingsListener.php',
-        'OCA\\Testing\\Listener\\SetDeclarativeSettingsValueListener' => __DIR__ . '/..' . '/../lib/Listener/SetDeclarativeSettingsValueListener.php',
-        'OCA\\Testing\\Locking\\FakeDBLockingProvider' => __DIR__ . '/..' . '/../lib/Locking/FakeDBLockingProvider.php',
-        'OCA\\Testing\\Migration\\Version30000Date20240102030405' => __DIR__ . '/..' . '/../lib/Migration/Version30000Date20240102030405.php',
-        'OCA\\Testing\\Provider\\FakeText2ImageProvider' => __DIR__ . '/..' . '/../lib/Provider/FakeText2ImageProvider.php',
-        'OCA\\Testing\\Provider\\FakeTextProcessingProvider' => __DIR__ . '/..' . '/../lib/Provider/FakeTextProcessingProvider.php',
-        'OCA\\Testing\\Provider\\FakeTextProcessingProviderSync' => __DIR__ . '/..' . '/../lib/Provider/FakeTextProcessingProviderSync.php',
-        'OCA\\Testing\\Provider\\FakeTranslationProvider' => __DIR__ . '/..' . '/../lib/Provider/FakeTranslationProvider.php',
-        'OCA\\Testing\\Settings\\DeclarativeSettingsForm' => __DIR__ . '/..' . '/../lib/Settings/DeclarativeSettingsForm.php',
-        'OCA\\Testing\\TaskProcessing\\FakeContextWriteProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeContextWriteProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTextToImageProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTextToImageProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTextToTextChatProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTextToTextChatProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTextToTextProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTextToTextProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTextToTextSummaryProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTextToTextSummaryProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTranscribeProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTranscribeProvider.php',
-        'OCA\\Testing\\TaskProcessing\\FakeTranslateProvider' => __DIR__ . '/..' . '/../lib/TaskProcessing/FakeTranslateProvider.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Testing\\AlternativeHomeUserBackend' => __DIR__.'/..'.'/../lib/AlternativeHomeUserBackend.php',
+        'OCA\\Testing\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Testing\\Controller\\ConfigController' => __DIR__.'/..'.'/../lib/Controller/ConfigController.php',
+        'OCA\\Testing\\Controller\\LockingController' => __DIR__.'/..'.'/../lib/Controller/LockingController.php',
+        'OCA\\Testing\\Controller\\RateLimitTestController' => __DIR__.'/..'.'/../lib/Controller/RateLimitTestController.php',
+        'OCA\\Testing\\Controller\\RoutesController' => __DIR__.'/..'.'/../lib/Controller/RoutesController.php',
+        'OCA\\Testing\\Conversion\\ConversionProvider' => __DIR__.'/..'.'/../lib/Conversion/ConversionProvider.php',
+        'OCA\\Testing\\HiddenGroupBackend' => __DIR__.'/..'.'/../lib/HiddenGroupBackend.php',
+        'OCA\\Testing\\Listener\\GetDeclarativeSettingsValueListener' => __DIR__.'/..'.'/../lib/Listener/GetDeclarativeSettingsValueListener.php',
+        'OCA\\Testing\\Listener\\RegisterDeclarativeSettingsListener' => __DIR__.'/..'.'/../lib/Listener/RegisterDeclarativeSettingsListener.php',
+        'OCA\\Testing\\Listener\\SetDeclarativeSettingsValueListener' => __DIR__.'/..'.'/../lib/Listener/SetDeclarativeSettingsValueListener.php',
+        'OCA\\Testing\\Locking\\FakeDBLockingProvider' => __DIR__.'/..'.'/../lib/Locking/FakeDBLockingProvider.php',
+        'OCA\\Testing\\Migration\\Version30000Date20240102030405' => __DIR__.'/..'.'/../lib/Migration/Version30000Date20240102030405.php',
+        'OCA\\Testing\\Provider\\FakeText2ImageProvider' => __DIR__.'/..'.'/../lib/Provider/FakeText2ImageProvider.php',
+        'OCA\\Testing\\Provider\\FakeTextProcessingProvider' => __DIR__.'/..'.'/../lib/Provider/FakeTextProcessingProvider.php',
+        'OCA\\Testing\\Provider\\FakeTextProcessingProviderSync' => __DIR__.'/..'.'/../lib/Provider/FakeTextProcessingProviderSync.php',
+        'OCA\\Testing\\Provider\\FakeTranslationProvider' => __DIR__.'/..'.'/../lib/Provider/FakeTranslationProvider.php',
+        'OCA\\Testing\\Settings\\DeclarativeSettingsForm' => __DIR__.'/..'.'/../lib/Settings/DeclarativeSettingsForm.php',
+        'OCA\\Testing\\TaskProcessing\\FakeContextWriteProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeContextWriteProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTextToImageProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTextToImageProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTextToTextChatProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTextToTextChatProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTextToTextProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTextToTextProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTextToTextSummaryProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTextToTextSummaryProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTranscribeProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTranscribeProvider.php',
+        'OCA\\Testing\\TaskProcessing\\FakeTranslateProvider' => __DIR__.'/..'.'/../lib/TaskProcessing/FakeTranslateProvider.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitTesting::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitTesting::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitTesting::$classMap;

apps/testing/composer/composer/autoload_classmap.php

Spacing +26 added lines, -26 removed lines

@@ -6,30 +6,30 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Testing\\AlternativeHomeUserBackend' => $baseDir . '/../lib/AlternativeHomeUserBackend.php',
-    'OCA\\Testing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Testing\\Controller\\ConfigController' => $baseDir . '/../lib/Controller/ConfigController.php',
-    'OCA\\Testing\\Controller\\LockingController' => $baseDir . '/../lib/Controller/LockingController.php',
-    'OCA\\Testing\\Controller\\RateLimitTestController' => $baseDir . '/../lib/Controller/RateLimitTestController.php',
-    'OCA\\Testing\\Controller\\RoutesController' => $baseDir . '/../lib/Controller/RoutesController.php',
-    'OCA\\Testing\\Conversion\\ConversionProvider' => $baseDir . '/../lib/Conversion/ConversionProvider.php',
-    'OCA\\Testing\\HiddenGroupBackend' => $baseDir . '/../lib/HiddenGroupBackend.php',
-    'OCA\\Testing\\Listener\\GetDeclarativeSettingsValueListener' => $baseDir . '/../lib/Listener/GetDeclarativeSettingsValueListener.php',
-    'OCA\\Testing\\Listener\\RegisterDeclarativeSettingsListener' => $baseDir . '/../lib/Listener/RegisterDeclarativeSettingsListener.php',
-    'OCA\\Testing\\Listener\\SetDeclarativeSettingsValueListener' => $baseDir . '/../lib/Listener/SetDeclarativeSettingsValueListener.php',
-    'OCA\\Testing\\Locking\\FakeDBLockingProvider' => $baseDir . '/../lib/Locking/FakeDBLockingProvider.php',
-    'OCA\\Testing\\Migration\\Version30000Date20240102030405' => $baseDir . '/../lib/Migration/Version30000Date20240102030405.php',
-    'OCA\\Testing\\Provider\\FakeText2ImageProvider' => $baseDir . '/../lib/Provider/FakeText2ImageProvider.php',
-    'OCA\\Testing\\Provider\\FakeTextProcessingProvider' => $baseDir . '/../lib/Provider/FakeTextProcessingProvider.php',
-    'OCA\\Testing\\Provider\\FakeTextProcessingProviderSync' => $baseDir . '/../lib/Provider/FakeTextProcessingProviderSync.php',
-    'OCA\\Testing\\Provider\\FakeTranslationProvider' => $baseDir . '/../lib/Provider/FakeTranslationProvider.php',
-    'OCA\\Testing\\Settings\\DeclarativeSettingsForm' => $baseDir . '/../lib/Settings/DeclarativeSettingsForm.php',
-    'OCA\\Testing\\TaskProcessing\\FakeContextWriteProvider' => $baseDir . '/../lib/TaskProcessing/FakeContextWriteProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTextToImageProvider' => $baseDir . '/../lib/TaskProcessing/FakeTextToImageProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTextToTextChatProvider' => $baseDir . '/../lib/TaskProcessing/FakeTextToTextChatProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTextToTextProvider' => $baseDir . '/../lib/TaskProcessing/FakeTextToTextProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTextToTextSummaryProvider' => $baseDir . '/../lib/TaskProcessing/FakeTextToTextSummaryProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTranscribeProvider' => $baseDir . '/../lib/TaskProcessing/FakeTranscribeProvider.php',
-    'OCA\\Testing\\TaskProcessing\\FakeTranslateProvider' => $baseDir . '/../lib/TaskProcessing/FakeTranslateProvider.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Testing\\AlternativeHomeUserBackend' => $baseDir.'/../lib/AlternativeHomeUserBackend.php',
+    'OCA\\Testing\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Testing\\Controller\\ConfigController' => $baseDir.'/../lib/Controller/ConfigController.php',
+    'OCA\\Testing\\Controller\\LockingController' => $baseDir.'/../lib/Controller/LockingController.php',
+    'OCA\\Testing\\Controller\\RateLimitTestController' => $baseDir.'/../lib/Controller/RateLimitTestController.php',
+    'OCA\\Testing\\Controller\\RoutesController' => $baseDir.'/../lib/Controller/RoutesController.php',
+    'OCA\\Testing\\Conversion\\ConversionProvider' => $baseDir.'/../lib/Conversion/ConversionProvider.php',
+    'OCA\\Testing\\HiddenGroupBackend' => $baseDir.'/../lib/HiddenGroupBackend.php',
+    'OCA\\Testing\\Listener\\GetDeclarativeSettingsValueListener' => $baseDir.'/../lib/Listener/GetDeclarativeSettingsValueListener.php',
+    'OCA\\Testing\\Listener\\RegisterDeclarativeSettingsListener' => $baseDir.'/../lib/Listener/RegisterDeclarativeSettingsListener.php',
+    'OCA\\Testing\\Listener\\SetDeclarativeSettingsValueListener' => $baseDir.'/../lib/Listener/SetDeclarativeSettingsValueListener.php',
+    'OCA\\Testing\\Locking\\FakeDBLockingProvider' => $baseDir.'/../lib/Locking/FakeDBLockingProvider.php',
+    'OCA\\Testing\\Migration\\Version30000Date20240102030405' => $baseDir.'/../lib/Migration/Version30000Date20240102030405.php',
+    'OCA\\Testing\\Provider\\FakeText2ImageProvider' => $baseDir.'/../lib/Provider/FakeText2ImageProvider.php',
+    'OCA\\Testing\\Provider\\FakeTextProcessingProvider' => $baseDir.'/../lib/Provider/FakeTextProcessingProvider.php',
+    'OCA\\Testing\\Provider\\FakeTextProcessingProviderSync' => $baseDir.'/../lib/Provider/FakeTextProcessingProviderSync.php',
+    'OCA\\Testing\\Provider\\FakeTranslationProvider' => $baseDir.'/../lib/Provider/FakeTranslationProvider.php',
+    'OCA\\Testing\\Settings\\DeclarativeSettingsForm' => $baseDir.'/../lib/Settings/DeclarativeSettingsForm.php',
+    'OCA\\Testing\\TaskProcessing\\FakeContextWriteProvider' => $baseDir.'/../lib/TaskProcessing/FakeContextWriteProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTextToImageProvider' => $baseDir.'/../lib/TaskProcessing/FakeTextToImageProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTextToTextChatProvider' => $baseDir.'/../lib/TaskProcessing/FakeTextToTextChatProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTextToTextProvider' => $baseDir.'/../lib/TaskProcessing/FakeTextToTextProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTextToTextSummaryProvider' => $baseDir.'/../lib/TaskProcessing/FakeTextToTextSummaryProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTranscribeProvider' => $baseDir.'/../lib/TaskProcessing/FakeTranscribeProvider.php',
+    'OCA\\Testing\\TaskProcessing\\FakeTranslateProvider' => $baseDir.'/../lib/TaskProcessing/FakeTranslateProvider.php',
 );