nextcloud / server

lib/private/Remote/Api/ApiBase.php

Indentation +61 added lines, -61 removed lines

@@ -26,72 +26,72 @@
 use OCP\Remote\IInstance;
 
 class ApiBase {
-	/** @var IInstance */
-	private $instance;
-	/** @var ICredentials */
-	private $credentials;
-	/** @var IClientService */
-	private $clientService;
+    /** @var IInstance */
+    private $instance;
+    /** @var ICredentials */
+    private $credentials;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
-		$this->instance = $instance;
-		$this->credentials = $credentials;
-		$this->clientService = $clientService;
-	}
+    public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) {
+        $this->instance = $instance;
+        $this->credentials = $credentials;
+        $this->clientService = $clientService;
+    }
 
-	protected function getHttpClient() {
-		return $this->clientService->newClient();
-	}
+    protected function getHttpClient() {
+        return $this->clientService->newClient();
+    }
 
-	protected function addDefaultHeaders(array $headers) {
-		return array_merge([
-			'OCS-APIREQUEST' => 'true',
-			'Accept' => 'application/json'
-		], $headers);
-	}
+    protected function addDefaultHeaders(array $headers) {
+        return array_merge([
+            'OCS-APIREQUEST' => 'true',
+            'Accept' => 'application/json'
+        ], $headers);
+    }
 
-	/**
-	 * @param string $method
-	 * @param string $url
-	 * @param array $body
-	 * @param array $query
-	 * @param array $headers
-	 * @return resource|string
-	 * @throws \InvalidArgumentException
-	 */
-	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
-		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
-		$options = [
-			'query' => $query,
-			'headers' => $this->addDefaultHeaders($headers),
-			'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
-		];
-		if ($body) {
-			$options['body'] = $body;
-		}
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array $body
+     * @param array $query
+     * @param array $headers
+     * @return resource|string
+     * @throws \InvalidArgumentException
+     */
+    protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
+        $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
+        $options = [
+            'query' => $query,
+            'headers' => $this->addDefaultHeaders($headers),
+            'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()]
+        ];
+        if ($body) {
+            $options['body'] = $body;
+        }
 
-		$client = $this->getHttpClient();
+        $client = $this->getHttpClient();
 
-		switch ($method) {
-			case 'get':
-				$response = $client->get($fullUrl, $options);
-				break;
-			case 'post':
-				$response = $client->post($fullUrl, $options);
-				break;
-			case 'put':
-				$response = $client->put($fullUrl, $options);
-				break;
-			case 'delete':
-				$response = $client->delete($fullUrl, $options);
-				break;
-			case 'options':
-				$response = $client->options($fullUrl, $options);
-				break;
-			default:
-				throw new \InvalidArgumentException('Invalid method ' . $method);
-		}
+        switch ($method) {
+            case 'get':
+                $response = $client->get($fullUrl, $options);
+                break;
+            case 'post':
+                $response = $client->post($fullUrl, $options);
+                break;
+            case 'put':
+                $response = $client->put($fullUrl, $options);
+                break;
+            case 'delete':
+                $response = $client->delete($fullUrl, $options);
+                break;
+            case 'options':
+                $response = $client->options($fullUrl, $options);
+                break;
+            default:
+                throw new \InvalidArgumentException('Invalid method ' . $method);
+        }
 
-		return $response->getBody();
-	}
+        return $response->getBody();
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	 * @throws \InvalidArgumentException
 	 */
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
-		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;
+		$fullUrl = trim($this->instance->getFullUrl(), '/').'/'.$url;
 		$options = [
 			'query' => $query,
 			'headers' => $this->addDefaultHeaders($headers),
@@ -89,7 +89,7 @@ 
 				$response = $client->options($fullUrl, $options);
 				break;
 			default:
-				throw new \InvalidArgumentException('Invalid method ' . $method);
+				throw new \InvalidArgumentException('Invalid method '.$method);
 		}
 
 		return $response->getBody();

lib/private/Remote/InstanceFactory.php

Indentation +11 added lines, -11 removed lines

@@ -27,17 +27,17 @@
 use OCP\Remote\IInstanceFactory;
 
 class InstanceFactory implements IInstanceFactory {
-	/** @var ICache */
-	private $cache;
-	/** @var IClientService */
-	private $clientService;
+    /** @var ICache */
+    private $cache;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(ICache $cache, IClientService $clientService) {
-		$this->cache = $cache;
-		$this->clientService = $clientService;
-	}
+    public function __construct(ICache $cache, IClientService $clientService) {
+        $this->cache = $cache;
+        $this->clientService = $clientService;
+    }
 
-	public function getInstance($url) {
-		return new Instance($url, $this->cache, $this->clientService);
-	}
+    public function getInstance($url) {
+        return new Instance($url, $this->cache, $this->clientService);
+    }
 }

lib/private/Remote/Api/OCS.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
 		try {
-			$response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
+			$response = json_decode(parent::request($method, 'ocs/v2.php/'.$url, $body, $query, $headers), true);
 		} catch (ClientException $e) {
 			if ($e->getResponse()->getStatusCode() === 404) {
 				throw new NotFoundException();
@@ -63,7 +63,7 @@ 
 			throw new NotFoundException();
 		}
 		if ($response['ocs']['meta']['status'] !== 'ok') {
-			throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
+			throw new \Exception('Unknown ocs error '.$response['ocs']['meta']['message']);
 		}
 
 		return $response['ocs']['data'];
@@ -78,13 +78,13 @@ 
 	private function checkResponseArray(array $data, $type, array $keys) {
 		foreach ($keys as $key) {
 			if (!array_key_exists($key, $data)) {
-				throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
+				throw new \Exception('Invalid '.$type.' response, expected field '.$key.' not found');
 			}
 		}
 	}
 
 	public function getUser($userId) {
-		$result = $this->request('get', 'cloud/users/' . $userId);
+		$result = $this->request('get', 'cloud/users/'.$userId);
 		$this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
 		return new User($result);
 	}

Indentation +62 added lines, -62 removed lines

@@ -32,70 +32,70 @@
 use OCP\Remote\Api\IUserApi;
 
 class OCS extends ApiBase implements ICapabilitiesApi, IUserApi {
-	/**
-	 * @param string $method
-	 * @param string $url
-	 * @param array $body
-	 * @param array $query
-	 * @param array $headers
-	 * @return array
-	 * @throws ForbiddenException
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
-		try {
-			$response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
-		} catch (ClientException $e) {
-			if ($e->getResponse()->getStatusCode() === 404) {
-				throw new NotFoundException();
-			} elseif ($e->getResponse()->getStatusCode() === 403 || $e->getResponse()->getStatusCode() === 401) {
-				throw new ForbiddenException();
-			} else {
-				throw $e;
-			}
-		}
-		if (!isset($response['ocs']) || !isset($response['ocs']['meta'])) {
-			throw new \Exception('Invalid ocs response');
-		}
-		if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_UNAUTHORISED) {
-			throw new ForbiddenException();
-		}
-		if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_NOT_FOUND) {
-			throw new NotFoundException();
-		}
-		if ($response['ocs']['meta']['status'] !== 'ok') {
-			throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
-		}
+    /**
+     * @param string $method
+     * @param string $url
+     * @param array $body
+     * @param array $query
+     * @param array $headers
+     * @return array
+     * @throws ForbiddenException
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
+        try {
+            $response = json_decode(parent::request($method, 'ocs/v2.php/' . $url, $body, $query, $headers), true);
+        } catch (ClientException $e) {
+            if ($e->getResponse()->getStatusCode() === 404) {
+                throw new NotFoundException();
+            } elseif ($e->getResponse()->getStatusCode() === 403 || $e->getResponse()->getStatusCode() === 401) {
+                throw new ForbiddenException();
+            } else {
+                throw $e;
+            }
+        }
+        if (!isset($response['ocs']) || !isset($response['ocs']['meta'])) {
+            throw new \Exception('Invalid ocs response');
+        }
+        if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_UNAUTHORISED) {
+            throw new ForbiddenException();
+        }
+        if ($response['ocs']['meta']['statuscode'] === OCSController::RESPOND_NOT_FOUND) {
+            throw new NotFoundException();
+        }
+        if ($response['ocs']['meta']['status'] !== 'ok') {
+            throw new \Exception('Unknown ocs error ' . $response['ocs']['meta']['message']);
+        }
 
-		return $response['ocs']['data'];
-	}
+        return $response['ocs']['data'];
+    }
 
-	/**
-	 * @param array $data
-	 * @param string $type
-	 * @param string[] $keys
-	 * @throws \Exception
-	 */
-	private function checkResponseArray(array $data, $type, array $keys) {
-		foreach ($keys as $key) {
-			if (!array_key_exists($key, $data)) {
-				throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
-			}
-		}
-	}
+    /**
+     * @param array $data
+     * @param string $type
+     * @param string[] $keys
+     * @throws \Exception
+     */
+    private function checkResponseArray(array $data, $type, array $keys) {
+        foreach ($keys as $key) {
+            if (!array_key_exists($key, $data)) {
+                throw new \Exception('Invalid ' . $type . ' response, expected field ' . $key . ' not found');
+            }
+        }
+    }
 
-	public function getUser($userId) {
-		$result = $this->request('get', 'cloud/users/' . $userId);
-		$this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
-		return new User($result);
-	}
+    public function getUser($userId) {
+        $result = $this->request('get', 'cloud/users/' . $userId);
+        $this->checkResponseArray($result, 'user', User::EXPECTED_KEYS);
+        return new User($result);
+    }
 
-	/**
-	 * @return array The capabilities in the form of [$appId => [$capability => $value]]
-	 */
-	public function getCapabilities() {
-		$result = $this->request('get', 'cloud/capabilities');
-		return $result['capabilities'];
-	}
+    /**
+     * @return array The capabilities in the form of [$appId => [$capability => $value]]
+     */
+    public function getCapabilities() {
+        $result = $this->request('get', 'cloud/capabilities');
+        return $result['capabilities'];
+    }
 }

apps/files/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files\\' => array($baseDir . '/../lib'),
+    'OCA\\Files\\' => array($baseDir.'/../lib'),
 );

apps/encryption/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Encryption\\' => array($baseDir . '/../lib'),
+    'OCA\\Encryption\\' => array($baseDir.'/../lib'),
 );

apps/federatedfilesharing/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\FederatedFileSharing\\' => array($baseDir . '/../lib'),
+    'OCA\\FederatedFileSharing\\' => array($baseDir.'/../lib'),
 );

apps/federation/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Federation\\' => array($baseDir . '/../lib'),
+    'OCA\\Federation\\' => array($baseDir.'/../lib'),
 );

apps/files_external/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files_External\\' => array($baseDir . '/../lib'),
+    'OCA\\Files_External\\' => array($baseDir.'/../lib'),
 );

apps/lookup_server_connector/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\LookupServerConnector\\' => array($baseDir . '/../lib'),
+    'OCA\\LookupServerConnector\\' => array($baseDir.'/../lib'),
 );