nextcloud / server

lib/private/Search.php

Indentation +86 added lines, -86 removed lines

@@ -34,97 +34,97 @@
  */
 class Search implements ISearch {
 
-	private $providers = array();
-	private $registeredProviders = array();
+    private $providers = array();
+    private $registeredProviders = array();
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @return array An array of OC\Search\Result's
-	 */
-	public function search($query, array $inApps = array()) {
-		// old apps might assume they get all results, so we set size 0
-		return $this->searchPaged($query, $inApps, 1, 0);
-	}
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @return array An array of OC\Search\Result's
+     */
+    public function search($query, array $inApps = array()) {
+        // old apps might assume they get all results, so we set size 0
+        return $this->searchPaged($query, $inApps, 1, 0);
+    }
 
-	/**
-	 * Search all providers for $query
-	 * @param string $query
-	 * @param string[] $inApps optionally limit results to the given apps
-	 * @param int $page pages start at page 1
-	 * @param int $size, 0 = all
-	 * @return array An array of OC\Search\Result's
-	 */
-	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
-		$this->initProviders();
-		$results = array();
-		foreach($this->providers as $provider) {
-			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
-				continue;
-			}
-			if ($provider instanceof PagedProvider) {
-				$results = array_merge($results, $provider->searchPaged($query, $page, $size));
-			} else if ($provider instanceof Provider) {
-				$providerResults = $provider->search($query);
-				if ($size > 0) {
-					$slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
-					$results = array_merge($results, $slicedResults);
-				} else {
-					$results = array_merge($results, $providerResults);
-				}
-			} else {
-				\OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
-			}
-		}
-		return $results;
-	}
+    /**
+     * Search all providers for $query
+     * @param string $query
+     * @param string[] $inApps optionally limit results to the given apps
+     * @param int $page pages start at page 1
+     * @param int $size, 0 = all
+     * @return array An array of OC\Search\Result's
+     */
+    public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
+        $this->initProviders();
+        $results = array();
+        foreach($this->providers as $provider) {
+            /** @var $provider Provider */
+            if ( ! $provider->providesResultsFor($inApps) ) {
+                continue;
+            }
+            if ($provider instanceof PagedProvider) {
+                $results = array_merge($results, $provider->searchPaged($query, $page, $size));
+            } else if ($provider instanceof Provider) {
+                $providerResults = $provider->search($query);
+                if ($size > 0) {
+                    $slicedResults = array_slice($providerResults, ($page - 1) * $size, $size);
+                    $results = array_merge($results, $slicedResults);
+                } else {
+                    $results = array_merge($results, $providerResults);
+                }
+            } else {
+                \OC::$server->getLogger()->warning('Ignoring Unknown search provider', array('provider' => $provider));
+            }
+        }
+        return $results;
+    }
 
-	/**
-	 * Remove all registered search providers
-	 */
-	public function clearProviders() {
-		$this->providers = array();
-		$this->registeredProviders = array();
-	}
+    /**
+     * Remove all registered search providers
+     */
+    public function clearProviders() {
+        $this->providers = array();
+        $this->registeredProviders = array();
+    }
 
-	/**
-	 * Remove one existing search provider
-	 * @param string $provider class name of a OC\Search\Provider
-	 */
-	public function removeProvider($provider) {
-		$this->registeredProviders = array_filter(
-			$this->registeredProviders,
-			function ($element) use ($provider) {
-				return ($element['class'] != $provider);
-			}
-		);
-		// force regeneration of providers on next search
-		$this->providers = array();
-	}
+    /**
+     * Remove one existing search provider
+     * @param string $provider class name of a OC\Search\Provider
+     */
+    public function removeProvider($provider) {
+        $this->registeredProviders = array_filter(
+            $this->registeredProviders,
+            function ($element) use ($provider) {
+                return ($element['class'] != $provider);
+            }
+        );
+        // force regeneration of providers on next search
+        $this->providers = array();
+    }
 
-	/**
-	 * Register a new search provider to search with
-	 * @param string $class class name of a OC\Search\Provider
-	 * @param array $options optional
-	 */
-	public function registerProvider($class, array $options = array()) {
-		$this->registeredProviders[] = array('class' => $class, 'options' => $options);
-	}
+    /**
+     * Register a new search provider to search with
+     * @param string $class class name of a OC\Search\Provider
+     * @param array $options optional
+     */
+    public function registerProvider($class, array $options = array()) {
+        $this->registeredProviders[] = array('class' => $class, 'options' => $options);
+    }
 
-	/**
-	 * Create instances of all the registered search providers
-	 */
-	private function initProviders() {
-		if( ! empty($this->providers) ) {
-			return;
-		}
-		foreach($this->registeredProviders as $provider) {
-			$class = $provider['class'];
-			$options = $provider['options'];
-			$this->providers[] = new $class($options);
-		}
-	}
+    /**
+     * Create instances of all the registered search providers
+     */
+    private function initProviders() {
+        if( ! empty($this->providers) ) {
+            return;
+        }
+        foreach($this->registeredProviders as $provider) {
+            $class = $provider['class'];
+            $options = $provider['options'];
+            $this->providers[] = new $class($options);
+        }
+    }
 
 }

Spacing +5 added lines, -5 removed lines

@@ -59,9 +59,9 @@ 
 	public function searchPaged($query, array $inApps = array(), $page = 1, $size = 30) {
 		$this->initProviders();
 		$results = array();
-		foreach($this->providers as $provider) {
+		foreach ($this->providers as $provider) {
 			/** @var $provider Provider */
-			if ( ! $provider->providesResultsFor($inApps) ) {
+			if (!$provider->providesResultsFor($inApps)) {
 				continue;
 			}
 			if ($provider instanceof PagedProvider) {
@@ -96,7 +96,7 @@ 
 	public function removeProvider($provider) {
 		$this->registeredProviders = array_filter(
 			$this->registeredProviders,
-			function ($element) use ($provider) {
+			function($element) use ($provider) {
 				return ($element['class'] != $provider);
 			}
 		);
@@ -117,10 +117,10 @@ 
 	 * Create instances of all the registered search providers
 	 */
 	private function initProviders() {
-		if( ! empty($this->providers) ) {
+		if (!empty($this->providers)) {
 			return;
 		}
-		foreach($this->registeredProviders as $provider) {
+		foreach ($this->registeredProviders as $provider) {
 			$class = $provider['class'];
 			$options = $provider['options'];
 			$this->providers[] = new $class($options);

lib/private/Http/Client/Response.php

Indentation +41 added lines, -41 removed lines

@@ -32,51 +32,51 @@
  * @package OC\Http
  */
 class Response implements IResponse {
-	/** @var GuzzleResponse */
-	private $response;
+    /** @var GuzzleResponse */
+    private $response;
 
-	/**
-	 * @var bool
-	 */
-	private $stream;
+    /**
+     * @var bool
+     */
+    private $stream;
 
-	/**
-	 * @param GuzzleResponse $response
-	 * @param bool $stream
-	 */
-	public function __construct(GuzzleResponse $response, $stream = false) {
-		$this->response = $response;
-		$this->stream = $stream;
-	}
+    /**
+     * @param GuzzleResponse $response
+     * @param bool $stream
+     */
+    public function __construct(GuzzleResponse $response, $stream = false) {
+        $this->response = $response;
+        $this->stream = $stream;
+    }
 
-	/**
-	 * @return string|resource
-	 */
-	public function getBody() {
-		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
-	}
+    /**
+     * @return string|resource
+     */
+    public function getBody() {
+        return $this->stream ?
+            $this->response->getBody()->detach():
+            $this->response->getBody()->getContents();
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->response->getStatusCode();
-	}
+    /**
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->response->getStatusCode();
+    }
 
-	/**
-	 * @param $key
-	 * @return string
-	 */
-	public function getHeader($key) {
-		return $this->response->getHeader($key);
-	}
+    /**
+     * @param $key
+     * @return string
+     */
+    public function getHeader($key) {
+        return $this->response->getHeader($key);
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getHeaders() {
-		return $this->response->getHeaders();
-	}
+    /**
+     * @return array
+     */
+    public function getHeaders() {
+        return $this->response->getHeaders();
+    }
 }

Spacing +1 added lines, -2 removed lines

@@ -54,8 +54,7 @@
 	 */
 	public function getBody() {
 		return $this->stream ?
-			$this->response->getBody()->detach():
-			$this->response->getBody()->getContents();
+			$this->response->getBody()->detach() : $this->response->getBody()->getContents();
 	}
 
 	/**

lib/private/Http/Client/ClientService.php

Indentation +19 added lines, -19 removed lines

@@ -33,25 +33,25 @@
  * @package OC\Http
  */
 class ClientService implements IClientService {
-	/** @var IConfig */
-	private $config;
-	/** @var ICertificateManager */
-	private $certificateManager;
+    /** @var IConfig */
+    private $config;
+    /** @var ICertificateManager */
+    private $certificateManager;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICertificateManager $certificateManager
-	 */
-	public function __construct(IConfig $config,
-								ICertificateManager $certificateManager) {
-		$this->config = $config;
-		$this->certificateManager = $certificateManager;
-	}
+    /**
+     * @param IConfig $config
+     * @param ICertificateManager $certificateManager
+     */
+    public function __construct(IConfig $config,
+                                ICertificateManager $certificateManager) {
+        $this->config = $config;
+        $this->certificateManager = $certificateManager;
+    }
 
-	/**
-	 * @return Client
-	 */
-	public function newClient() {
-		return new Client($this->config, $this->certificateManager, new GuzzleClient());
-	}
+    /**
+     * @return Client
+     */
+    public function newClient() {
+        return new Client($this->config, $this->certificateManager, new GuzzleClient());
+    }
 }

lib/private/Session/Memory.php

Indentation +72 added lines, -72 removed lines

@@ -38,86 +38,86 @@
  * @package OC\Session
  */
 class Memory extends Session {
-	protected $data;
+    protected $data;
 
-	public function __construct($name) {
-		//no need to use $name since all data is already scoped to this instance
-		$this->data = array();
-	}
+    public function __construct($name) {
+        //no need to use $name since all data is already scoped to this instance
+        $this->data = array();
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set($key, $value) {
-		$this->validateSession();
-		$this->data[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set($key, $value) {
+        $this->validateSession();
+        $this->data[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $this->data[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get($key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $this->data[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists($key) {
+        return isset($this->data[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove($key) {
-		$this->validateSession();
-		unset($this->data[$key]);
-	}
+    /**
+     * @param string $key
+     */
+    public function remove($key) {
+        $this->validateSession();
+        unset($this->data[$key]);
+    }
 
-	public function clear() {
-		$this->data = array();
-	}
+    public function clear() {
+        $this->data = array();
+    }
 
-	/**
-	 * Stub since the session ID does not need to get regenerated for the cache
-	 *
-	 * @param bool $deleteOldSession
-	 */
-	public function regenerateId($deleteOldSession = true) {}
+    /**
+     * Stub since the session ID does not need to get regenerated for the cache
+     *
+     * @param bool $deleteOldSession
+     */
+    public function regenerateId($deleteOldSession = true) {}
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId() {
-		throw new SessionNotAvailableException('Memory session does not have an ID');
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId() {
+        throw new SessionNotAvailableException('Memory session does not have an ID');
+    }
 
-	/**
-	 * Helper function for PHPUnit execution - don't use in non-test code
-	 */
-	public function reopen() {
-		$this->sessionClosed = false;
-	}
+    /**
+     * Helper function for PHPUnit execution - don't use in non-test code
+     */
+    public function reopen() {
+        $this->sessionClosed = false;
+    }
 
-	/**
-	 * In case the session has already been locked an exception will be thrown
-	 *
-	 * @throws Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new Exception('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * In case the session has already been locked an exception will be thrown
+     *
+     * @throws Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new Exception('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 }

lib/private/Session/Internal.php

Indentation +105 added lines, -105 removed lines

@@ -38,120 +38,120 @@
  * @package OC\Session
  */
 class Internal extends Session {
-	/**
-	 * @param string $name
-	 * @throws \Exception
-	 */
-	public function __construct($name) {
-		session_name($name);
-		set_error_handler(array($this, 'trapError'));
-		try {
-			session_start();
-		} catch (\Exception $e) {
-			setcookie(session_name(), null, -1, \OC::$WEBROOT ? : '/');
-		}
-		restore_error_handler();
-		if (!isset($_SESSION)) {
-			throw new \Exception('Failed to start session');
-		}
-	}
+    /**
+     * @param string $name
+     * @throws \Exception
+     */
+    public function __construct($name) {
+        session_name($name);
+        set_error_handler(array($this, 'trapError'));
+        try {
+            session_start();
+        } catch (\Exception $e) {
+            setcookie(session_name(), null, -1, \OC::$WEBROOT ? : '/');
+        }
+        restore_error_handler();
+        if (!isset($_SESSION)) {
+            throw new \Exception('Failed to start session');
+        }
+    }
 
-	/**
-	 * @param string $key
-	 * @param integer $value
-	 */
-	public function set($key, $value) {
-		$this->validateSession();
-		$_SESSION[$key] = $value;
-	}
+    /**
+     * @param string $key
+     * @param integer $value
+     */
+    public function set($key, $value) {
+        $this->validateSession();
+        $_SESSION[$key] = $value;
+    }
 
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function get($key) {
-		if (!$this->exists($key)) {
-			return null;
-		}
-		return $_SESSION[$key];
-	}
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function get($key) {
+        if (!$this->exists($key)) {
+            return null;
+        }
+        return $_SESSION[$key];
+    }
 
-	/**
-	 * @param string $key
-	 * @return bool
-	 */
-	public function exists($key) {
-		return isset($_SESSION[$key]);
-	}
+    /**
+     * @param string $key
+     * @return bool
+     */
+    public function exists($key) {
+        return isset($_SESSION[$key]);
+    }
 
-	/**
-	 * @param string $key
-	 */
-	public function remove($key) {
-		if (isset($_SESSION[$key])) {
-			unset($_SESSION[$key]);
-		}
-	}
+    /**
+     * @param string $key
+     */
+    public function remove($key) {
+        if (isset($_SESSION[$key])) {
+            unset($_SESSION[$key]);
+        }
+    }
 
-	public function clear() {
-		session_unset();
-		$this->regenerateId();
-		@session_start();
-		$_SESSION = array();
-	}
+    public function clear() {
+        session_unset();
+        $this->regenerateId();
+        @session_start();
+        $_SESSION = array();
+    }
 
-	public function close() {
-		session_write_close();
-		parent::close();
-	}
+    public function close() {
+        session_write_close();
+        parent::close();
+    }
 
-	/**
-	 * Wrapper around session_regenerate_id
-	 *
-	 * @param bool $deleteOldSession Whether to delete the old associated session file or not.
-	 * @return void
-	 */
-	public function regenerateId($deleteOldSession = true) {
-		@session_regenerate_id($deleteOldSession);
-	}
+    /**
+     * Wrapper around session_regenerate_id
+     *
+     * @param bool $deleteOldSession Whether to delete the old associated session file or not.
+     * @return void
+     */
+    public function regenerateId($deleteOldSession = true) {
+        @session_regenerate_id($deleteOldSession);
+    }
 
-	/**
-	 * Wrapper around session_id
-	 *
-	 * @return string
-	 * @throws SessionNotAvailableException
-	 * @since 9.1.0
-	 */
-	public function getId() {
-		$id = @session_id();
-		if ($id === '') {
-			throw new SessionNotAvailableException();
-		}
-		return $id;
-	}
+    /**
+     * Wrapper around session_id
+     *
+     * @return string
+     * @throws SessionNotAvailableException
+     * @since 9.1.0
+     */
+    public function getId() {
+        $id = @session_id();
+        if ($id === '') {
+            throw new SessionNotAvailableException();
+        }
+        return $id;
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	public function reopen() {
-		throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.');
-	}
+    /**
+     * @throws \Exception
+     */
+    public function reopen() {
+        throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.');
+    }
 
-	/**
-	 * @param int $errorNumber
-	 * @param string $errorString
-	 * @throws \ErrorException
-	 */
-	public function trapError($errorNumber, $errorString) {
-		throw new \ErrorException($errorString);
-	}
+    /**
+     * @param int $errorNumber
+     * @param string $errorString
+     * @throws \ErrorException
+     */
+    public function trapError($errorNumber, $errorString) {
+        throw new \ErrorException($errorString);
+    }
 
-	/**
-	 * @throws \Exception
-	 */
-	private function validateSession() {
-		if ($this->sessionClosed) {
-			throw new \Exception('Session has been closed - no further changes to the session are allowed');
-		}
-	}
+    /**
+     * @throws \Exception
+     */
+    private function validateSession() {
+        if ($this->sessionClosed) {
+            throw new \Exception('Session has been closed - no further changes to the session are allowed');
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 		try {
 			session_start();
 		} catch (\Exception $e) {
-			setcookie(session_name(), null, -1, \OC::$WEBROOT ? : '/');
+			setcookie(session_name(), null, -1, \OC::$WEBROOT ?: '/');
 		}
 		restore_error_handler();
 		if (!isset($_SESSION)) {

lib/private/Session/Session.php

Indentation +43 added lines, -43 removed lines

@@ -28,53 +28,53 @@
 
 abstract class Session implements \ArrayAccess, ISession {
 
-	/**
-	 * @var bool
-	 */
-	protected $sessionClosed = false;
+    /**
+     * @var bool
+     */
+    protected $sessionClosed = false;
 
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct($name);
+    /**
+     * $name serves as a namespace for the session keys
+     *
+     * @param string $name
+     */
+    abstract public function __construct($name);
 
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset) {
-		return $this->exists($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+        return $this->exists($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 
-	/**
-	 * Close the session and release the lock
-	 */
-	public function close() {
-		$this->sessionClosed = true;
-	}
+    /**
+     * Close the session and release the lock
+     */
+    public function close() {
+        $this->sessionClosed = true;
+    }
 }

lib/private/Session/CryptoWrapper.php

Indentation +45 added lines, -45 removed lines

@@ -48,56 +48,56 @@
  * @package OC\Session
  */
 class CryptoWrapper {
-	const COOKIE_NAME = 'oc_sessionPassphrase';
+    const COOKIE_NAME = 'oc_sessionPassphrase';
 
-	/** @var ISession */
-	protected $session;
+    /** @var ISession */
+    protected $session;
 
-	/** @var \OCP\Security\ICrypto */
-	protected $crypto;
+    /** @var \OCP\Security\ICrypto */
+    protected $crypto;
 
-	/** @var ISecureRandom */
-	protected $random;
+    /** @var ISecureRandom */
+    protected $random;
 
-	/**
-	 * @param IConfig $config
-	 * @param ICrypto $crypto
-	 * @param ISecureRandom $random
-	 * @param IRequest $request
-	 */
-	public function __construct(IConfig $config,
-								ICrypto $crypto,
-								ISecureRandom $random,
-								IRequest $request) {
-		$this->crypto = $crypto;
-		$this->config = $config;
-		$this->random = $random;
+    /**
+     * @param IConfig $config
+     * @param ICrypto $crypto
+     * @param ISecureRandom $random
+     * @param IRequest $request
+     */
+    public function __construct(IConfig $config,
+                                ICrypto $crypto,
+                                ISecureRandom $random,
+                                IRequest $request) {
+        $this->crypto = $crypto;
+        $this->config = $config;
+        $this->random = $random;
 
-		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
-			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
-		} else {
-			$this->passphrase = $this->random->generate(128);
-			$secureCookie = $request->getServerProtocol() === 'https';
-			// FIXME: Required for CI
-			if (!defined('PHPUNIT_RUN')) {
-				$webRoot = \OC::$WEBROOT;
-				if($webRoot === '') {
-					$webRoot = '/';
-				}
-				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
-			}
-		}
-	}
+        if (!is_null($request->getCookie(self::COOKIE_NAME))) {
+            $this->passphrase = $request->getCookie(self::COOKIE_NAME);
+        } else {
+            $this->passphrase = $this->random->generate(128);
+            $secureCookie = $request->getServerProtocol() === 'https';
+            // FIXME: Required for CI
+            if (!defined('PHPUNIT_RUN')) {
+                $webRoot = \OC::$WEBROOT;
+                if($webRoot === '') {
+                    $webRoot = '/';
+                }
+                setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
+            }
+        }
+    }
 
-	/**
-	 * @param ISession $session
-	 * @return ISession
-	 */
-	public function wrapSession(ISession $session) {
-		if (!($session instanceof CryptoSessionData)) {
-			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
-		}
+    /**
+     * @param ISession $session
+     * @return ISession
+     */
+    public function wrapSession(ISession $session) {
+        if (!($session instanceof CryptoSessionData)) {
+            return new CryptoSessionData($session, $this->crypto, $this->passphrase);
+        }
 
-		return $session;
-	}
+        return $session;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 			// FIXME: Required for CI
 			if (!defined('PHPUNIT_RUN')) {
 				$webRoot = \OC::$WEBROOT;
-				if($webRoot === '') {
+				if ($webRoot === '') {
 					$webRoot = '/';
 				}
 				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);

lib/private/Comments/ManagerFactory.php

Indentation +28 added lines, -28 removed lines

@@ -30,34 +30,34 @@
 
 class ManagerFactory implements ICommentsManagerFactory {
 
-	/**
-	 * Server container
-	 *
-	 * @var IServerContainer
-	 */
-	private $serverContainer;
+    /**
+     * Server container
+     *
+     * @var IServerContainer
+     */
+    private $serverContainer;
 
-	/**
-	 * Constructor for the comments manager factory
-	 *
-	 * @param IServerContainer $serverContainer server container
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
+    /**
+     * Constructor for the comments manager factory
+     *
+     * @param IServerContainer $serverContainer server container
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
 
-	/**
-	 * creates and returns an instance of the ICommentsManager
-	 *
-	 * @return ICommentsManager
-	 * @since 9.0.0
-	 */
-	public function getManager() {
-		return new Manager(
-			$this->serverContainer->getDatabaseConnection(),
-			$this->serverContainer->getLogger(),
-			$this->serverContainer->getConfig(),
-			$this->serverContainer->getEventDispatcher()
-		);
-	}
+    /**
+     * creates and returns an instance of the ICommentsManager
+     *
+     * @return ICommentsManager
+     * @since 9.0.0
+     */
+    public function getManager() {
+        return new Manager(
+            $this->serverContainer->getDatabaseConnection(),
+            $this->serverContainer->getLogger(),
+            $this->serverContainer->getConfig(),
+            $this->serverContainer->getEventDispatcher()
+        );
+    }
 }

lib/private/Notification/Action.php

Indentation +144 added lines, -144 removed lines

@@ -27,148 +27,148 @@
 
 class Action implements IAction {
 
-	/** @var string */
-	protected $label;
-
-	/** @var string */
-	protected $labelParsed;
-
-	/** @var string */
-	protected $link;
-
-	/** @var string */
-	protected $requestType;
-
-	/** @var string */
-	protected $icon;
-
-	/** @var bool */
-	protected $primary;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->label = '';
-		$this->labelParsed = '';
-		$this->link = '';
-		$this->requestType = '';
-		$this->primary = false;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setLabel($label) {
-		if (!is_string($label) || $label === '' || isset($label[32])) {
-			throw new \InvalidArgumentException('The given label is invalid');
-		}
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedLabel($label) {
-		if (!is_string($label) || $label === '') {
-			throw new \InvalidArgumentException('The given parsed label is invalid');
-		}
-		$this->labelParsed = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedLabel() {
-		return $this->labelParsed;
-	}
-
-	/**
-	 * @param $primary bool
-	 * @return $this
-	 * @throws \InvalidArgumentException if $primary is invalid
-	 * @since 9.0.0
-	 */
-	public function setPrimary($primary) {
-		if (!is_bool($primary)) {
-			throw new \InvalidArgumentException('The given primary option is invalid');
-		}
-
-		$this->primary = $primary;
-		return $this;
-	}
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isPrimary() {
-		return $this->primary;
-	}
-
-	/**
-	 * @param string $link
-	 * @param string $requestType
-	 * @return $this
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink($link, $requestType) {
-		if (!is_string($link) || $link === '' || isset($link[256])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
-			throw new \InvalidArgumentException('The given request type is invalid');
-		}
-		$this->link = $link;
-		$this->requestType = $requestType;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink() {
-		return $this->link;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getRequestType() {
-		return $this->requestType;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValid() {
-		return $this->label !== '' && $this->link !== '';
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValidParsed() {
-		return $this->labelParsed !== '' && $this->link !== '';
-	}
+    /** @var string */
+    protected $label;
+
+    /** @var string */
+    protected $labelParsed;
+
+    /** @var string */
+    protected $link;
+
+    /** @var string */
+    protected $requestType;
+
+    /** @var string */
+    protected $icon;
+
+    /** @var bool */
+    protected $primary;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->label = '';
+        $this->labelParsed = '';
+        $this->link = '';
+        $this->requestType = '';
+        $this->primary = false;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setLabel($label) {
+        if (!is_string($label) || $label === '' || isset($label[32])) {
+            throw new \InvalidArgumentException('The given label is invalid');
+        }
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setParsedLabel($label) {
+        if (!is_string($label) || $label === '') {
+            throw new \InvalidArgumentException('The given parsed label is invalid');
+        }
+        $this->labelParsed = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedLabel() {
+        return $this->labelParsed;
+    }
+
+    /**
+     * @param $primary bool
+     * @return $this
+     * @throws \InvalidArgumentException if $primary is invalid
+     * @since 9.0.0
+     */
+    public function setPrimary($primary) {
+        if (!is_bool($primary)) {
+            throw new \InvalidArgumentException('The given primary option is invalid');
+        }
+
+        $this->primary = $primary;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isPrimary() {
+        return $this->primary;
+    }
+
+    /**
+     * @param string $link
+     * @param string $requestType
+     * @return $this
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink($link, $requestType) {
+        if (!is_string($link) || $link === '' || isset($link[256])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
+            throw new \InvalidArgumentException('The given request type is invalid');
+        }
+        $this->link = $link;
+        $this->requestType = $requestType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink() {
+        return $this->link;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getRequestType() {
+        return $this->requestType;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid() {
+        return $this->label !== '' && $this->link !== '';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValidParsed() {
+        return $this->labelParsed !== '' && $this->link !== '';
+    }
 }