nextcloud / server

apps/files_sharing/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

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

apps/admin_audit/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

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

apps/dav/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

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

apps/comments/composer/composer/autoload_psr4.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +7 added lines, -7 removed lines

@@ -65,7 +65,7 @@ 
 	 * @return string The of of the remote server with protocol
 	 */
 	public function getFullUrl() {
-		return $this->getProtocol() . '://' . $this->getUrl();
+		return $this->getProtocol().'://'.$this->getUrl();
 	}
 
 	/**
@@ -103,17 +103,17 @@ 
 		if ($this->status) {
 			return $this->status;
 		}
-		$key = 'remote/' . $this->url . '/status';
-		$httpsKey = 'remote/' . $this->url . '/https';
+		$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');
+			$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');
+					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');
+				$response = $this->downloadStatus('http://'.$this->getUrl().'/status.php');
 				$protocol = 'http';
 			} else {
 				$this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
@@ -126,7 +126,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;

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

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