nextcloud / server

lib/private/Remote/Api/ApiBase.php

Doc Comments +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 	 * @param array $body
 	 * @param array $query
 	 * @param array $headers
-	 * @return resource|string
+	 * @return string
 	 */
 	protected function request($method, $url, array $body = [], array $query = [], array $headers = []) {
 		$fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url;

Indentation +60 added lines, -60 removed lines

@@ -26,71 +26,71 @@
 use OCP\Http\Client\IClientService;
 
 class ApiBase {
-	/** @var Instance */
-	private $instance;
-	/** @var Credentials */
-	private $credentials;
-	/** @var IClientService */
-	private $clientService;
+    /** @var Instance */
+    private $instance;
+    /** @var Credentials */
+    private $credentials;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(Instance $instance, Credentials $credentials, IClientService $clientService) {
-		$this->instance = $instance;
-		$this->credentials = $credentials;
-		$this->clientService = $clientService;
-	}
+    public function __construct(Instance $instance, Credentials $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
-	 */
-	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
+     */
+    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

@@ -59,7 +59,7 @@ 
 	 * @return resource|string
 	 */
 	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),
@@ -88,7 +88,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/Credentials.php

Indentation +24 added lines, -24 removed lines

@@ -23,31 +23,31 @@
 
 
 class Credentials {
-	/** @var string */
-	private $user;
-	/** @var string */
-	private $password;
+    /** @var string */
+    private $user;
+    /** @var string */
+    private $password;
 
-	/**
-	 * @param string $user
-	 * @param string $password
-	 */
-	public function __construct($user, $password) {
-		$this->user = $user;
-		$this->password = $password;
-	}
+    /**
+     * @param string $user
+     * @param string $password
+     */
+    public function __construct($user, $password) {
+        $this->user = $user;
+        $this->password = $password;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getUsername() {
-		return $this->user;
-	}
+    /**
+     * @return string
+     */
+    public function getUsername() {
+        return $this->user;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getPassword() {
-		return $this->password;
-	}
+    /**
+     * @return string
+     */
+    public function getPassword() {
+        return $this->password;
+    }
 }

lib/private/Remote/Api/OCS.php

Indentation +47 added lines, -47 removed lines

@@ -28,54 +28,54 @@
 use OCP\API;
 
 class OCS extends ApiBase {
-	/**
-	 * @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();
-			} else if ($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'] === API::RESPOND_UNAUTHORISED) {
-			throw new ForbiddenException();
-		}
-		if ($response['ocs']['meta']['statuscode'] === API::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();
+            } else if ($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'] === API::RESPOND_UNAUTHORISED) {
+            throw new ForbiddenException();
+        }
+        if ($response['ocs']['meta']['statuscode'] === API::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'];
+    }
 
-	public function getUser($userId) {
-		return new User($this->request('get', 'cloud/users/' . $userId));
-	}
+    public function getUser($userId) {
+        return new User($this->request('get', 'cloud/users/' . $userId));
+    }
 
-	/**
-	 * @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'];
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -41,7 +41,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();
@@ -61,14 +61,14 @@ 
 			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'];
 	}
 
 	public function getUser($userId) {
-		return new User($this->request('get', 'cloud/users/' . $userId));
+		return new User($this->request('get', 'cloud/users/'.$userId));
 	}
 
 	/**

lib/private/Remote/User.php

Indentation +98 added lines, -98 removed lines

@@ -23,102 +23,102 @@
 
 
 class User {
-	/** @var array */
-	private $data;
-
-	public function __construct(array $data) {
-		$this->data = $data;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUserId() {
-		return $this->data['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEmail() {
-		return $this->data['email'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDisplayName() {
-		return $this->data['displayname'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPhone() {
-		return $this->data['phone'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAddress() {
-		return $this->data['address'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getWebsite() {
-		return $this->data['website'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTwitter() {
-		return isset($this->data['twitter']) ? $this->data['twitter'] : '';
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getGroups() {
-		return $this->data['groups'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getLanguage() {
-		return $this->data['language'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getUsedSpace() {
-		return $this->data['quota']['used'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getFreeSpace() {
-		return $this->data['quota']['free'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalSpace() {
-		return $this->data['quota']['total'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getQuota() {
-		return $this->data['quota']['quota'];
-	}
+    /** @var array */
+    private $data;
+
+    public function __construct(array $data) {
+        $this->data = $data;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getUserId() {
+        return $this->data['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail() {
+        return $this->data['email'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayName() {
+        return $this->data['displayname'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPhone() {
+        return $this->data['phone'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getAddress() {
+        return $this->data['address'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getWebsite() {
+        return $this->data['website'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getTwitter() {
+        return isset($this->data['twitter']) ? $this->data['twitter'] : '';
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getGroups() {
+        return $this->data['groups'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getLanguage() {
+        return $this->data['language'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getUsedSpace() {
+        return $this->data['quota']['used'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getFreeSpace() {
+        return $this->data['quota']['free'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalSpace() {
+        return $this->data['quota']['total'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getQuota() {
+        return $this->data['quota']['quota'];
+    }
 }

lib/private/Remote/Instance.php

Indentation +87 added lines, -87 removed lines

@@ -29,102 +29,102 @@
  * Provides some basic info about a remote Nextcloud instance
  */
 class Instance {
-	/** @var string */
-	private $url;
+    /** @var string */
+    private $url;
 
-	/** @var ICache */
-	private $cache;
+    /** @var ICache */
+    private $cache;
 
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	private $status;
+    private $status;
 
-	/**
-	 * @param string $url
-	 * @param ICache $cache
-	 * @param IClientService $clientService
-	 */
-	public function __construct($url, ICache $cache, IClientService $clientService) {
-		$url = str_replace('https://', '', $url);
-		$this->url = str_replace('http://', '', $url);
-		$this->cache = $cache;
-		$this->clientService = $clientService;
-	}
+    /**
+     * @param string $url
+     * @param ICache $cache
+     * @param IClientService $clientService
+     */
+    public function __construct($url, ICache $cache, IClientService $clientService) {
+        $url = str_replace('https://', '', $url);
+        $this->url = str_replace('http://', '', $url);
+        $this->cache = $cache;
+        $this->clientService = $clientService;
+    }
 
-	/**
-	 * @return string The url of the remote server without protocol
-	 */
-	public function getUrl() {
-		return $this->url;
-	}
+    /**
+     * @return string The url of the remote server without protocol
+     */
+    public function getUrl() {
+        return $this->url;
+    }
 
-	/**
-	 * @return string The of of the remote server with protocol
-	 */
-	public function getFullUrl() {
-		return $this->getProtocol() . '://' . $this->getUrl();
-	}
+    /**
+     * @return string The of of the remote server with protocol
+     */
+    public function getFullUrl() {
+        return $this->getProtocol() . '://' . $this->getUrl();
+    }
 
-	/**
-	 * @return string The full version string in '13.1.2.3' format
-	 */
-	public function getVersion() {
-		$status = $this->getStatus();
-		return $status['version'];
-	}
+    /**
+     * @return string The full version string in '13.1.2.3' format
+     */
+    public function getVersion() {
+        $status = $this->getStatus();
+        return $status['version'];
+    }
 
-	/**
-	 * @return string 'http' or 'https'
-	 */
-	public function getProtocol() {
-		$status = $this->getStatus();
-		return $status['protocol'];
-	}
+    /**
+     * @return string 'http' or 'https'
+     */
+    public function getProtocol() {
+        $status = $this->getStatus();
+        return $status['protocol'];
+    }
 
-	/**
-	 * Check that the remote server is installed and not in maintenance mode
-	 *
-	 * @return bool
-	 */
-	public function isActive() {
-		$status = $this->getStatus();
-		return $status['installed'] && !$status['maintenance'];
-	}
+    /**
+     * Check that the remote server is installed and not in maintenance mode
+     *
+     * @return bool
+     */
+    public function isActive() {
+        $status = $this->getStatus();
+        return $status['installed'] && !$status['maintenance'];
+    }
 
-	private function getStatus() {
-		if ($this->status) {
-			return $this->status;
-		}
-		$key = 'remote/' . $this->url . '/status';
-		$status = $this->cache->get($key);
-		if (!$status) {
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
-			$protocol = 'https';
-			if (!$response) {
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
-				$protocol = 'http';
-			}
-			$status = json_decode($response, true);
-			if ($status) {
-				$status['protocol'] = $protocol;
-			}
-			if ($status) {
-				$this->cache->set($key, $status, 5 * 60);
-				$this->status = $status;
-			} else {
-				throw new NotFoundException('Remote server not found at address ' . $this->url);
-			}
-		}
-		return $status;
-	}
+    private function getStatus() {
+        if ($this->status) {
+            return $this->status;
+        }
+        $key = 'remote/' . $this->url . '/status';
+        $status = $this->cache->get($key);
+        if (!$status) {
+            $response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
+            $protocol = 'https';
+            if (!$response) {
+                $response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
+                $protocol = 'http';
+            }
+            $status = json_decode($response, true);
+            if ($status) {
+                $status['protocol'] = $protocol;
+            }
+            if ($status) {
+                $this->cache->set($key, $status, 5 * 60);
+                $this->status = $status;
+            } else {
+                throw new NotFoundException('Remote server not found at address ' . $this->url);
+            }
+        }
+        return $status;
+    }
 
-	private function downloadStatus($url) {
-		try {
-			$request = $this->clientService->newClient()->get($url);
-			return $request->getBody();
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+    private function downloadStatus($url) {
+        try {
+            $request = $this->clientService->newClient()->get($url);
+            return $request->getBody();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
 	 * @return string The of of the remote server with protocol
 	 */
 	public function getFullUrl() {
-		return $this->getProtocol() . '://' . $this->getUrl();
+		return $this->getProtocol().'://'.$this->getUrl();
 	}
 
 	/**
@@ -96,13 +96,13 @@ 
 		if ($this->status) {
 			return $this->status;
 		}
-		$key = 'remote/' . $this->url . '/status';
+		$key = 'remote/'.$this->url.'/status';
 		$status = $this->cache->get($key);
 		if (!$status) {
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
+			$response = $this->downloadStatus('https://'.$this->getUrl().'/status.php');
 			$protocol = 'https';
 			if (!$response) {
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
+				$response = $this->downloadStatus('http://'.$this->getUrl().'/status.php');
 				$protocol = 'http';
 			}
 			$status = json_decode($response, true);
@@ -113,7 +113,7 @@ 
 				$this->cache->set($key, $status, 5 * 60);
 				$this->status = $status;
 			} else {
-				throw new NotFoundException('Remote server not found at address ' . $this->url);
+				throw new NotFoundException('Remote server not found at address '.$this->url);
 			}
 		}
 		return $status;