nextcloud / server

lib/private/Command/QueueBus.php

Indentation +40 added lines, -40 removed lines

@@ -26,48 +26,48 @@
 use OCP\Command\ICommand;
 
 class QueueBus implements IBus {
-	/**
-	 * @var ICommand[]|callable[]
-	 */
-	private $queue = [];
+    /**
+     * @var ICommand[]|callable[]
+     */
+    private $queue = [];
 
-	/**
-	 * Schedule a command to be fired
-	 *
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	public function push($command) {
-		$this->queue[] = $command;
-	}
+    /**
+     * Schedule a command to be fired
+     *
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    public function push($command) {
+        $this->queue[] = $command;
+    }
 
-	/**
-	 * Require all commands using a trait to be run synchronous
-	 *
-	 * @param string $trait
-	 */
-	public function requireSync($trait) {
-	}
+    /**
+     * Require all commands using a trait to be run synchronous
+     *
+     * @param string $trait
+     */
+    public function requireSync($trait) {
+    }
 
-	/**
-	 * @param \OCP\Command\ICommand | callable $command
-	 */
-	private function runCommand($command) {
-		if ($command instanceof ICommand) {
-			// ensure the command can be serialized
-			$serialized = serialize($command);
-			if(strlen($serialized) > 4000) {
-				throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
-			}
-			$unserialized = unserialize($serialized);
-			$unserialized->handle();
-		} else {
-			$command();
-		}
-	}
+    /**
+     * @param \OCP\Command\ICommand | callable $command
+     */
+    private function runCommand($command) {
+        if ($command instanceof ICommand) {
+            // ensure the command can be serialized
+            $serialized = serialize($command);
+            if(strlen($serialized) > 4000) {
+                throw new \InvalidArgumentException('Trying to push a command which serialized form can not be stored in the database (>4000 character)');
+            }
+            $unserialized = unserialize($serialized);
+            $unserialized->handle();
+        } else {
+            $command();
+        }
+    }
 
-	public function run() {
-		while ($command = array_shift($this->queue)) {
-			$this->runCommand($command);
-		}
-	}
+    public function run() {
+        while ($command = array_shift($this->queue)) {
+            $this->runCommand($command);
+        }
+    }
 }

lib/private/AppFramework/Http.php

Indentation +115 added lines, -115 removed lines

@@ -33,121 +33,121 @@
 
 class Http extends BaseHttp {
 
-	private $server;
-	private $protocolVersion;
-	protected $headers;
-
-	/**
-	 * @param array $server $_SERVER
-	 * @param string $protocolVersion the http version to use defaults to HTTP/1.1
-	 */
-	public function __construct($server, $protocolVersion='HTTP/1.1') {
-		$this->server = $server;
-		$this->protocolVersion = $protocolVersion;
-
-		$this->headers = array(
-			self::STATUS_CONTINUE => 'Continue',
-			self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
-			self::STATUS_PROCESSING => 'Processing',
-			self::STATUS_OK => 'OK',
-			self::STATUS_CREATED => 'Created',
-			self::STATUS_ACCEPTED => 'Accepted',
-			self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
-			self::STATUS_NO_CONTENT => 'No Content',
-			self::STATUS_RESET_CONTENT => 'Reset Content',
-			self::STATUS_PARTIAL_CONTENT => 'Partial Content',
-			self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
-			self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
-			self::STATUS_IM_USED => 'IM Used', // RFC 3229
-			self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
-			self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
-			self::STATUS_FOUND => 'Found',
-			self::STATUS_SEE_OTHER => 'See Other',
-			self::STATUS_NOT_MODIFIED => 'Not Modified',
-			self::STATUS_USE_PROXY => 'Use Proxy',
-			self::STATUS_RESERVED => 'Reserved',
-			self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
-			self::STATUS_BAD_REQUEST => 'Bad request',
-			self::STATUS_UNAUTHORIZED => 'Unauthorized',
-			self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
-			self::STATUS_FORBIDDEN => 'Forbidden',
-			self::STATUS_NOT_FOUND => 'Not Found',
-			self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
-			self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
-			self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
-			self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
-			self::STATUS_CONFLICT => 'Conflict',
-			self::STATUS_GONE => 'Gone',
-			self::STATUS_LENGTH_REQUIRED => 'Length Required',
-			self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
-			self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
-			self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
-			self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
-			self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
-			self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
-			self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
-			self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
-			self::STATUS_LOCKED => 'Locked', // RFC 4918
-			self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
-			self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
-			self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
-			self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
-			self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
-			self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
-			self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
-			self::STATUS_BAD_GATEWAY => 'Bad Gateway',
-			self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
-			self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
-			self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
-			self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
-			self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
-			self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
-			self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
-			self::STATUS_NOT_EXTENDED => 'Not extended',
-			self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
-		);
-	}
-
-
-	/**
-	 * Gets the correct header
-	 * @param int Http::CONSTANT $status the constant from the Http class
-	 * @param \DateTime $lastModified formatted last modified date
-	 * @param string $ETag the etag
-	 * @return string
-	 */
-	public function getStatusHeader($status, \DateTime $lastModified=null, 
-	                                $ETag=null) {
-
-		if(!is_null($lastModified)) {
-			$lastModified = $lastModified->format(\DateTime::RFC2822);
-		}
-
-		// if etag or lastmodified have not changed, return a not modified
-		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
-
-			||
-
-			(isset($this->server['HTTP_IF_MODIFIED_SINCE'])
-			&& trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
-				$lastModified)) {
-
-			$status = self::STATUS_NOT_MODIFIED;
-		}
-
-		// we have one change currently for the http 1.0 header that differs
-		// from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
-		// if this differs any more, we want to create childclasses for this
-		if($status === self::STATUS_TEMPORARY_REDIRECT 
-			&& $this->protocolVersion === 'HTTP/1.0') {
-
-			$status = self::STATUS_FOUND;
-		}
-
-		return $this->protocolVersion . ' ' . $status . ' ' . 
-			$this->headers[$status];
-	}
+    private $server;
+    private $protocolVersion;
+    protected $headers;
+
+    /**
+     * @param array $server $_SERVER
+     * @param string $protocolVersion the http version to use defaults to HTTP/1.1
+     */
+    public function __construct($server, $protocolVersion='HTTP/1.1') {
+        $this->server = $server;
+        $this->protocolVersion = $protocolVersion;
+
+        $this->headers = array(
+            self::STATUS_CONTINUE => 'Continue',
+            self::STATUS_SWITCHING_PROTOCOLS => 'Switching Protocols',
+            self::STATUS_PROCESSING => 'Processing',
+            self::STATUS_OK => 'OK',
+            self::STATUS_CREATED => 'Created',
+            self::STATUS_ACCEPTED => 'Accepted',
+            self::STATUS_NON_AUTHORATIVE_INFORMATION => 'Non-Authorative Information',
+            self::STATUS_NO_CONTENT => 'No Content',
+            self::STATUS_RESET_CONTENT => 'Reset Content',
+            self::STATUS_PARTIAL_CONTENT => 'Partial Content',
+            self::STATUS_MULTI_STATUS => 'Multi-Status', // RFC 4918
+            self::STATUS_ALREADY_REPORTED => 'Already Reported', // RFC 5842
+            self::STATUS_IM_USED => 'IM Used', // RFC 3229
+            self::STATUS_MULTIPLE_CHOICES => 'Multiple Choices',
+            self::STATUS_MOVED_PERMANENTLY => 'Moved Permanently',
+            self::STATUS_FOUND => 'Found',
+            self::STATUS_SEE_OTHER => 'See Other',
+            self::STATUS_NOT_MODIFIED => 'Not Modified',
+            self::STATUS_USE_PROXY => 'Use Proxy',
+            self::STATUS_RESERVED => 'Reserved',
+            self::STATUS_TEMPORARY_REDIRECT => 'Temporary Redirect',
+            self::STATUS_BAD_REQUEST => 'Bad request',
+            self::STATUS_UNAUTHORIZED => 'Unauthorized',
+            self::STATUS_PAYMENT_REQUIRED => 'Payment Required',
+            self::STATUS_FORBIDDEN => 'Forbidden',
+            self::STATUS_NOT_FOUND => 'Not Found',
+            self::STATUS_METHOD_NOT_ALLOWED => 'Method Not Allowed',
+            self::STATUS_NOT_ACCEPTABLE => 'Not Acceptable',
+            self::STATUS_PROXY_AUTHENTICATION_REQUIRED => 'Proxy Authentication Required',
+            self::STATUS_REQUEST_TIMEOUT => 'Request Timeout',
+            self::STATUS_CONFLICT => 'Conflict',
+            self::STATUS_GONE => 'Gone',
+            self::STATUS_LENGTH_REQUIRED => 'Length Required',
+            self::STATUS_PRECONDITION_FAILED => 'Precondition failed',
+            self::STATUS_REQUEST_ENTITY_TOO_LARGE => 'Request Entity Too Large',
+            self::STATUS_REQUEST_URI_TOO_LONG => 'Request-URI Too Long',
+            self::STATUS_UNSUPPORTED_MEDIA_TYPE => 'Unsupported Media Type',
+            self::STATUS_REQUEST_RANGE_NOT_SATISFIABLE => 'Requested Range Not Satisfiable',
+            self::STATUS_EXPECTATION_FAILED => 'Expectation Failed',
+            self::STATUS_IM_A_TEAPOT => 'I\'m a teapot', // RFC 2324
+            self::STATUS_UNPROCESSABLE_ENTITY => 'Unprocessable Entity', // RFC 4918
+            self::STATUS_LOCKED => 'Locked', // RFC 4918
+            self::STATUS_FAILED_DEPENDENCY => 'Failed Dependency', // RFC 4918
+            self::STATUS_UPGRADE_REQUIRED => 'Upgrade required',
+            self::STATUS_PRECONDITION_REQUIRED => 'Precondition required', // draft-nottingham-http-new-status
+            self::STATUS_TOO_MANY_REQUESTS => 'Too Many Requests', // draft-nottingham-http-new-status
+            self::STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE => 'Request Header Fields Too Large', // draft-nottingham-http-new-status
+            self::STATUS_INTERNAL_SERVER_ERROR => 'Internal Server Error',
+            self::STATUS_NOT_IMPLEMENTED => 'Not Implemented',
+            self::STATUS_BAD_GATEWAY => 'Bad Gateway',
+            self::STATUS_SERVICE_UNAVAILABLE => 'Service Unavailable',
+            self::STATUS_GATEWAY_TIMEOUT => 'Gateway Timeout',
+            self::STATUS_HTTP_VERSION_NOT_SUPPORTED => 'HTTP Version not supported',
+            self::STATUS_VARIANT_ALSO_NEGOTIATES => 'Variant Also Negotiates',
+            self::STATUS_INSUFFICIENT_STORAGE => 'Insufficient Storage', // RFC 4918
+            self::STATUS_LOOP_DETECTED => 'Loop Detected', // RFC 5842
+            self::STATUS_BANDWIDTH_LIMIT_EXCEEDED => 'Bandwidth Limit Exceeded', // non-standard
+            self::STATUS_NOT_EXTENDED => 'Not extended',
+            self::STATUS_NETWORK_AUTHENTICATION_REQUIRED => 'Network Authentication Required', // draft-nottingham-http-new-status
+        );
+    }
+
+
+    /**
+     * Gets the correct header
+     * @param int Http::CONSTANT $status the constant from the Http class
+     * @param \DateTime $lastModified formatted last modified date
+     * @param string $ETag the etag
+     * @return string
+     */
+    public function getStatusHeader($status, \DateTime $lastModified=null, 
+                                    $ETag=null) {
+
+        if(!is_null($lastModified)) {
+            $lastModified = $lastModified->format(\DateTime::RFC2822);
+        }
+
+        // if etag or lastmodified have not changed, return a not modified
+        if ((isset($this->server['HTTP_IF_NONE_MATCH'])
+            && trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
+
+            ||
+
+            (isset($this->server['HTTP_IF_MODIFIED_SINCE'])
+            && trim($this->server['HTTP_IF_MODIFIED_SINCE']) === 
+                $lastModified)) {
+
+            $status = self::STATUS_NOT_MODIFIED;
+        }
+
+        // we have one change currently for the http 1.0 header that differs
+        // from 1.1: STATUS_TEMPORARY_REDIRECT should be STATUS_FOUND
+        // if this differs any more, we want to create childclasses for this
+        if($status === self::STATUS_TEMPORARY_REDIRECT 
+            && $this->protocolVersion === 'HTTP/1.0') {
+
+            $status = self::STATUS_FOUND;
+        }
+
+        return $this->protocolVersion . ' ' . $status . ' ' . 
+            $this->headers[$status];
+    }
 
 
 }

lib/public/Remote/IInstanceFactory.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
  * @since 13.0.0
  */
 interface IInstanceFactory {
-	/**
-	 * @param string $url
-	 * @return IInstance
-	 *
-	 * @since 13.0.0
-	 */
-	public function getInstance($url);
+    /**
+     * @param string $url
+     * @return IInstance
+     *
+     * @since 13.0.0
+     */
+    public function getInstance($url);
 }

lib/private/Remote/Instance.php

Indentation +103 added lines, -103 removed lines

@@ -30,118 +30,118 @@
  * Provides some basic info about a remote Nextcloud instance
  */
 class Instance implements IInstance {
-	/** @var string */
-	private $url;
+    /** @var string */
+    private $url;
 
-	/** @var ICache */
-	private $cache;
+    /** @var ICache */
+    private $cache;
 
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	/** @var array|null */
-	private $status;
+    /** @var array|null */
+    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'];
+    }
 
-	/**
-	 * @return array
-	 * @throws NotFoundException
-	 * @throws \Exception
-	 */
-	private function getStatus() {
-		if ($this->status) {
-			return $this->status;
-		}
-		$key = 'remote/' . $this->url . '/status';
-		$httpsKey = 'remote/' . $this->url . '/https';
-		$status = $this->cache->get($key);
-		if (!$status) {
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
-			$protocol = 'https';
-			if (!$response) {
-				if ($status = $this->cache->get($httpsKey)) {
-					throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
-				}
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
-				$protocol = 'http';
-			} else {
-				$this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
-			}
-			$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;
-	}
+    /**
+     * @return array
+     * @throws NotFoundException
+     * @throws \Exception
+     */
+    private function getStatus() {
+        if ($this->status) {
+            return $this->status;
+        }
+        $key = 'remote/' . $this->url . '/status';
+        $httpsKey = 'remote/' . $this->url . '/https';
+        $status = $this->cache->get($key);
+        if (!$status) {
+            $response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
+            $protocol = 'https';
+            if (!$response) {
+                if ($status = $this->cache->get($httpsKey)) {
+                    throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
+                }
+                $response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
+                $protocol = 'http';
+            } else {
+                $this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
+            }
+            $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;
+    }
 
-	/**
-	 * @param string $url
-	 * @return bool|string
-	 */
-	private function downloadStatus($url) {
-		try {
-			$request = $this->clientService->newClient()->get($url);
-			return $request->getBody();
-		} catch (\Exception $e) {
-			return false;
-		}
-	}
+    /**
+     * @param string $url
+     * @return bool|string
+     */
+    private function downloadStatus($url) {
+        try {
+            $request = $this->clientService->newClient()->get($url);
+            return $request->getBody();
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
 }

lib/private/Remote/Api/ApiFactory.php

Indentation +8 added lines, -8 removed lines

@@ -28,14 +28,14 @@
 use OCP\Remote\IInstance;
 
 class ApiFactory implements IApiFactory {
-	/** @var IClientService */
-	private $clientService;
+    /** @var IClientService */
+    private $clientService;
 
-	public function __construct(IClientService $clientService) {
-		$this->clientService = $clientService;
-	}
+    public function __construct(IClientService $clientService) {
+        $this->clientService = $clientService;
+    }
 
-	public function getApiCollection(IInstance $instance, ICredentials $credentials) {
-		return new ApiCollection($instance, $credentials, $this->clientService);
-	}
+    public function getApiCollection(IInstance $instance, ICredentials $credentials) {
+        return new ApiCollection($instance, $credentials, $this->clientService);
+    }
 }

lib/private/Remote/Api/ApiCollection.php

Indentation +17 added lines, -17 removed lines

@@ -28,24 +28,24 @@
 use OCP\Remote\IInstance;
 
 class ApiCollection implements IApiCollection {
-	/** @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;
+    }
 
-	public function getCapabilitiesApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getCapabilitiesApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 
-	public function getUserApi() {
-		return new OCS($this->instance, $this->credentials, $this->clientService);
-	}
+    public function getUserApi() {
+        return new OCS($this->instance, $this->credentials, $this->clientService);
+    }
 }

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();
+    }
 }

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

Indentation +62 added lines, -62 removed lines

@@ -30,70 +30,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();
-			} 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'];
+    }
 
-	/**
-	 * @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'];
+    }
 }