nextcloud / server

lib/private/Lockdown/Filesystem/NullStorage.php

Indentation +114 added lines, -114 removed lines

@@ -25,155 +25,155 @@
 use OCP\Files\Storage\IStorage;
 
 class NullStorage extends Common {
-	public function __construct($parameters) {
-		parent::__construct($parameters);
-	}
+    public function __construct($parameters) {
+        parent::__construct($parameters);
+    }
 
-	public function getId() {
-		return 'null';
-	}
+    public function getId() {
+        return 'null';
+    }
 
-	public function mkdir($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function mkdir($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rmdir($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rmdir($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function opendir($path) {
-		return new IteratorDirectory([]);
-	}
+    public function opendir($path) {
+        return new IteratorDirectory([]);
+    }
 
-	public function is_dir($path) {
-		return $path === '';
-	}
+    public function is_dir($path) {
+        return $path === '';
+    }
 
-	public function is_file($path) {
-		return false;
-	}
+    public function is_file($path) {
+        return false;
+    }
 
-	public function stat($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function stat($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function filetype($path) {
-		return ($path === '') ? 'dir' : false;
-	}
+    public function filetype($path) {
+        return ($path === '') ? 'dir' : false;
+    }
 
-	public function filesize($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function filesize($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function isCreatable($path) {
-		return false;
-	}
+    public function isCreatable($path) {
+        return false;
+    }
 
-	public function isReadable($path) {
-		return $path === '';
-	}
+    public function isReadable($path) {
+        return $path === '';
+    }
 
-	public function isUpdatable($path) {
-		return false;
-	}
+    public function isUpdatable($path) {
+        return false;
+    }
 
-	public function isDeletable($path) {
-		return false;
-	}
+    public function isDeletable($path) {
+        return false;
+    }
 
-	public function isSharable($path) {
-		return false;
-	}
+    public function isSharable($path) {
+        return false;
+    }
 
-	public function getPermissions($path) {
-		return null;
-	}
+    public function getPermissions($path) {
+        return null;
+    }
 
-	public function file_exists($path) {
-		return $path === '';
-	}
+    public function file_exists($path) {
+        return $path === '';
+    }
 
-	public function filemtime($path) {
-		return ($path === '') ? time() : false;
-	}
+    public function filemtime($path) {
+        return ($path === '') ? time() : false;
+    }
 
-	public function file_get_contents($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_get_contents($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function file_put_contents($path, $data) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function file_put_contents($path, $data) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function unlink($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function unlink($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function rename($path1, $path2) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function rename($path1, $path2) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function copy($path1, $path2) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copy($path1, $path2) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function fopen($path, $mode) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function fopen($path, $mode) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getMimeType($path) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function getMimeType($path) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function hash($type, $path, $raw = false) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function hash($type, $path, $raw = false) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function free_space($path) {
-		return FileInfo::SPACE_UNKNOWN;
-	}
+    public function free_space($path) {
+        return FileInfo::SPACE_UNKNOWN;
+    }
 
-	public function touch($path, $mtime = null) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function touch($path, $mtime = null) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function getLocalFile($path) {
-		return false;
-	}
+    public function getLocalFile($path) {
+        return false;
+    }
 
-	public function hasUpdated($path, $time) {
-		return false;
-	}
+    public function hasUpdated($path, $time) {
+        return false;
+    }
 
-	public function getETag($path) {
-		return '';
-	}
+    public function getETag($path) {
+        return '';
+    }
 
-	public function isLocal() {
-		return false;
-	}
+    public function isLocal() {
+        return false;
+    }
 
-	public function getDirectDownload($path) {
-		return false;
-	}
+    public function getDirectDownload($path) {
+        return false;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
-	}
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
+    }
 
-	public function test() {
-		return true;
-	}
+    public function test() {
+        return true;
+    }
 
-	public function getOwner($path) {
-		return null;
-	}
+    public function getOwner($path) {
+        return null;
+    }
 
-	public function getCache($path = '', $storage = null) {
-		return new NullCache();
-	}
+    public function getCache($path = '', $storage = null) {
+        return new NullCache();
+    }
 }

lib/private/Files/Storage/FailedStorage.php

Indentation +165 added lines, -165 removed lines

@@ -34,185 +34,185 @@
  */
 class FailedStorage extends Common {
 
-	/** @var \Exception */
-	protected $e;
-
-	/**
-	 * @param array $params ['exception' => \Exception]
-	 */
-	public function __construct($params) {
-		$this->e = $params['exception'];
-		if (!$this->e) {
-			throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
-		}
-	}
-
-	public function getId() {
-		// we can't return anything sane here
-		return 'failedstorage';
-	}
-
-	public function mkdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rmdir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function opendir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_dir($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function is_file($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function stat($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filetype($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filesize($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isCreatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isReadable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isUpdatable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isDeletable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function isSharable($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getPermissions($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_exists($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function filemtime($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_get_contents($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function file_put_contents($path, $data) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function unlink($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function rename($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function copy($path1, $path2) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function fopen($path, $mode) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function getMimeType($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function hash($type, $path, $raw = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
-
-	public function free_space($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    /** @var \Exception */
+    protected $e;
+
+    /**
+     * @param array $params ['exception' => \Exception]
+     */
+    public function __construct($params) {
+        $this->e = $params['exception'];
+        if (!$this->e) {
+            throw new \InvalidArgumentException('Missing "exception" argument in FailedStorage constructor');
+        }
+    }
+
+    public function getId() {
+        // we can't return anything sane here
+        return 'failedstorage';
+    }
+
+    public function mkdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rmdir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function opendir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_dir($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function is_file($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function stat($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filetype($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filesize($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isCreatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isReadable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isUpdatable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isDeletable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function isSharable($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getPermissions($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_exists($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function filemtime($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_get_contents($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function file_put_contents($path, $data) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function unlink($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function rename($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function copy($path1, $path2) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function fopen($path, $mode) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function getMimeType($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function hash($type, $path, $raw = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
+
+    public function free_space($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function search($query) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function search($query) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function touch($path, $mtime = null) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function touch($path, $mtime = null) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFile($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFile($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getLocalFolder($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getLocalFolder($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function hasUpdated($path, $time) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function hasUpdated($path, $time) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getETag($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getETag($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getDirectDownload($path) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getDirectDownload($path) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function verifyPath($path, $fileName) {
-		return true;
-	}
+    public function verifyPath($path, $fileName) {
+        return true;
+    }
 
-	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function acquireLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function acquireLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function releaseLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function releaseLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function changeLock($path, $type, ILockingProvider $provider) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function changeLock($path, $type, ILockingProvider $provider) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getAvailability() {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function getAvailability() {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function setAvailability($isAvailable) {
-		throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
-	}
+    public function setAvailability($isAvailable) {
+        throw new StorageNotAvailableException($this->e->getMessage(), $this->e->getCode(), $this->e);
+    }
 
-	public function getCache($path = '', $storage = null) {
-		return new FailedCache();
-	}
+    public function getCache($path = '', $storage = null) {
+        return new FailedCache();
+    }
 }

lib/private/Route/Route.php

Indentation +115 added lines, -115 removed lines

@@ -32,128 +32,128 @@
 use Symfony\Component\Routing\Route as SymfonyRoute;
 
 class Route extends SymfonyRoute implements IRoute {
-	/**
-	 * Specify the method when this route is to be used
-	 *
-	 * @param string $method HTTP method (uppercase)
-	 * @return \OC\Route\Route
-	 */
-	public function method($method) {
-		$this->setMethods($method);
-		return $this;
-	}
+    /**
+     * Specify the method when this route is to be used
+     *
+     * @param string $method HTTP method (uppercase)
+     * @return \OC\Route\Route
+     */
+    public function method($method) {
+        $this->setMethods($method);
+        return $this;
+    }
 
-	/**
-	 * Specify POST as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function post() {
-		$this->method('POST');
-		return $this;
-	}
+    /**
+     * Specify POST as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function post() {
+        $this->method('POST');
+        return $this;
+    }
 
-	/**
-	 * Specify GET as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function get() {
-		$this->method('GET');
-		return $this;
-	}
+    /**
+     * Specify GET as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function get() {
+        $this->method('GET');
+        return $this;
+    }
 
-	/**
-	 * Specify PUT as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function put() {
-		$this->method('PUT');
-		return $this;
-	}
+    /**
+     * Specify PUT as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function put() {
+        $this->method('PUT');
+        return $this;
+    }
 
-	/**
-	 * Specify DELETE as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function delete() {
-		$this->method('DELETE');
-		return $this;
-	}
+    /**
+     * Specify DELETE as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function delete() {
+        $this->method('DELETE');
+        return $this;
+    }
 
-	/**
-	 * Specify PATCH as the method to use with this route
-	 * @return \OC\Route\Route
-	 */
-	public function patch() {
-		$this->method('PATCH');
-		return $this;
-	}
+    /**
+     * Specify PATCH as the method to use with this route
+     * @return \OC\Route\Route
+     */
+    public function patch() {
+        $this->method('PATCH');
+        return $this;
+    }
 
-	/**
-	 * Defaults to use for this route
-	 *
-	 * @param array $defaults The defaults
-	 * @return \OC\Route\Route
-	 */
-	public function defaults($defaults) {
-		$action = $this->getDefault('action');
-		$this->setDefaults($defaults);
-		if (isset($defaults['action'])) {
-			$action = $defaults['action'];
-		}
-		$this->action($action);
-		return $this;
-	}
+    /**
+     * Defaults to use for this route
+     *
+     * @param array $defaults The defaults
+     * @return \OC\Route\Route
+     */
+    public function defaults($defaults) {
+        $action = $this->getDefault('action');
+        $this->setDefaults($defaults);
+        if (isset($defaults['action'])) {
+            $action = $defaults['action'];
+        }
+        $this->action($action);
+        return $this;
+    }
 
-	/**
-	 * Requirements for this route
-	 *
-	 * @param array $requirements The requirements
-	 * @return \OC\Route\Route
-	 */
-	public function requirements($requirements) {
-		$method = $this->getMethods();
-		$this->setRequirements($requirements);
-		if (isset($requirements['_method'])) {
-			$method = $requirements['_method'];
-		}
-		if ($method) {
-			$this->method($method);
-		}
-		return $this;
-	}
+    /**
+     * Requirements for this route
+     *
+     * @param array $requirements The requirements
+     * @return \OC\Route\Route
+     */
+    public function requirements($requirements) {
+        $method = $this->getMethods();
+        $this->setRequirements($requirements);
+        if (isset($requirements['_method'])) {
+            $method = $requirements['_method'];
+        }
+        if ($method) {
+            $this->method($method);
+        }
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches
-	 *
-	 * @param string|callable $class the class or a callable
-	 * @param string $function the function to use with the class
-	 * @return \OC\Route\Route
-	 *
-	 * This function is called with $class set to a callable or
-	 * to the class with $function
-	 */
-	public function action($class, $function = null) {
-		$action = array($class, $function);
-		if (is_null($function)) {
-			$action = $class;
-		}
-		$this->setDefault('action', $action);
-		return $this;
-	}
+    /**
+     * The action to execute when this route matches
+     *
+     * @param string|callable $class the class or a callable
+     * @param string $function the function to use with the class
+     * @return \OC\Route\Route
+     *
+     * This function is called with $class set to a callable or
+     * to the class with $function
+     */
+    public function action($class, $function = null) {
+        $action = array($class, $function);
+        if (is_null($function)) {
+            $action = $class;
+        }
+        $this->setDefault('action', $action);
+        return $this;
+    }
 
-	/**
-	 * The action to execute when this route matches, includes a file like
-	 * it is called directly
-	 * @param string $file
-	 * @return void
-	 */
-	public function actionInclude($file) {
-		$function = function($param) use ($file) {
-			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
-			unset($param);
-			require_once "$file";
-		} ;
-		$this->action($function);
-	}
+    /**
+     * The action to execute when this route matches, includes a file like
+     * it is called directly
+     * @param string $file
+     * @return void
+     */
+    public function actionInclude($file) {
+        $function = function($param) use ($file) {
+            unset($param["_route"]);
+            $_GET=array_merge($_GET, $param);
+            unset($param);
+            require_once "$file";
+        } ;
+        $this->action($function);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 	public function actionInclude($file) {
 		$function = function($param) use ($file) {
 			unset($param["_route"]);
-			$_GET=array_merge($_GET, $param);
+			$_GET = array_merge($_GET, $param);
 			unset($param);
 			require_once "$file";
 		} ;

apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php

Indentation +58 added lines, -58 removed lines

@@ -13,74 +13,74 @@
 use OCP\Share\IManager;
 
 class ShareInfoMiddleware extends Middleware {
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	public function __construct(IManager $shareManager) {
-		$this->shareManager = $shareManager;
-	}
+    public function __construct(IManager $shareManager) {
+        $this->shareManager = $shareManager;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @throws S2SException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!($controller instanceof ShareInfoController)) {
-			return;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @throws S2SException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!($controller instanceof ShareInfoController)) {
+            return;
+        }
 
-		if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
-			throw new S2SException();
-		}
-	}
+        if (!$this->shareManager->outgoingServer2ServerSharesAllowed()) {
+            throw new S2SException();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if (!($controller instanceof ShareInfoController)) {
-			throw $exception;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if (!($controller instanceof ShareInfoController)) {
+            throw $exception;
+        }
 
-		if ($exception instanceof S2SException) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
+        if ($exception instanceof S2SException) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param Response $response
-	 * @return Response
-	 */
-	public function afterController($controller, $methodName, Response $response) {
-		if (!($controller instanceof ShareInfoController)) {
-			return $response;
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param Response $response
+     * @return Response
+     */
+    public function afterController($controller, $methodName, Response $response) {
+        if (!($controller instanceof ShareInfoController)) {
+            return $response;
+        }
 
-		if (!($response instanceof JSONResponse)) {
-			return $response;
-		}
+        if (!($response instanceof JSONResponse)) {
+            return $response;
+        }
 
-		$data = $response->getData();
-		$status = 'error';
+        $data = $response->getData();
+        $status = 'error';
 
-		if ($response->getStatus() === Http::STATUS_OK) {
-			$status = 'success';
-		}
+        if ($response->getStatus() === Http::STATUS_OK) {
+            $status = 'success';
+        }
 
-		$response->setData([
-			'data' => $data,
-			'status' => $status,
-		]);
+        $response->setData([
+            'data' => $data,
+            'status' => $status,
+        ]);
 
-		return $response;
-	}
+        return $response;
+    }
 }

apps/files_sharing/lib/Controller/ShareInfoController.php

Indentation +110 added lines, -110 removed lines

@@ -17,114 +17,114 @@
 
 class ShareInfoController extends ApiController {
 
-	/** @var IManager */
-	private $shareManager;
-
-	/**
-	 * ShareInfoController constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								IManager $shareManager) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-	}
-
-	/**
-	 * @PublicPage
-	 * @NoCSRFRequired
-	 *
-	 * @param string $t
-	 * @param null $password
-	 * @param null $dir
-	 * @return JSONResponse
-	 * @throws ShareNotFound
-	 */
-	public function info($t, $password = null, $dir = null) {
-		try {
-			$share = $this->shareManager->getShareByToken($t);
-		} catch (ShareNotFound $e) {
-			return new JSONResponse([], Http::STATUS_NOT_FOUND);
-		}
-
-		if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-
-		$isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
-		if (!$isWritable) {
-			$this->addROWrapper();
-		}
-
-		$node = $share->getNode();
-
-		if ($dir !== null && $node instanceof Folder) {
-			try {
-				$node = $node->get($dir);
-			} catch (NotFoundException $e) {
-
-			}
-		}
-
-		return new JSONResponse($this->parseNode($node));
-	}
-
-	private function parseNode(Node $node) {
-		if ($node instanceof File) {
-			return $this->parseFile($node);
-		}
-		return $this->parseFolder($node);
-	}
-
-	private function parseFile(File $file) {
-		return $this->format($file);
-	}
-
-	private function parseFolder(Folder $folder) {
-		$data = $this->format($folder);
-
-		$data['children'] = [];
-
-		$nodes = $folder->getDirectoryListing();
-		foreach ($nodes as $node) {
-			$data['children'][] = $this->parseNode($node);
-		}
-
-		return $data;
-	}
-
-	private function format(Node $node) {
-		$entry = [];
-
-		$entry['id'] = $node->getId();
-		$entry['parentId'] = $node->getParent()->getId();
-		$entry['mtime'] = $node->getMTime();
-
-		$entry['name'] = $node->getName();
-		$entry['permissions'] = $node->getPermissions();
-		$entry['mimetype'] = $node->getMimetype();
-		$entry['size'] = $node->getSize();
-		$entry['type'] = $node->getType();
-		$entry['etag'] = $node->getEtag();
-
-		return $entry;
-	}
-
-	protected function addROWrapper() {
-		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
-		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
-			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
-		});
-		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
-	}
+    /** @var IManager */
+    private $shareManager;
+
+    /**
+     * ShareInfoController constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param IManager $shareManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                IManager $shareManager) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+    }
+
+    /**
+     * @PublicPage
+     * @NoCSRFRequired
+     *
+     * @param string $t
+     * @param null $password
+     * @param null $dir
+     * @return JSONResponse
+     * @throws ShareNotFound
+     */
+    public function info($t, $password = null, $dir = null) {
+        try {
+            $share = $this->shareManager->getShareByToken($t);
+        } catch (ShareNotFound $e) {
+            return new JSONResponse([], Http::STATUS_NOT_FOUND);
+        }
+
+        if ($share->getPassword() && !$this->shareManager->checkPassword($share, $password)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        if (!($share->getPermissions() & Constants::PERMISSION_READ)) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+
+        $isWritable = $share->getPermissions() & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
+        if (!$isWritable) {
+            $this->addROWrapper();
+        }
+
+        $node = $share->getNode();
+
+        if ($dir !== null && $node instanceof Folder) {
+            try {
+                $node = $node->get($dir);
+            } catch (NotFoundException $e) {
+
+            }
+        }
+
+        return new JSONResponse($this->parseNode($node));
+    }
+
+    private function parseNode(Node $node) {
+        if ($node instanceof File) {
+            return $this->parseFile($node);
+        }
+        return $this->parseFolder($node);
+    }
+
+    private function parseFile(File $file) {
+        return $this->format($file);
+    }
+
+    private function parseFolder(Folder $folder) {
+        $data = $this->format($folder);
+
+        $data['children'] = [];
+
+        $nodes = $folder->getDirectoryListing();
+        foreach ($nodes as $node) {
+            $data['children'][] = $this->parseNode($node);
+        }
+
+        return $data;
+    }
+
+    private function format(Node $node) {
+        $entry = [];
+
+        $entry['id'] = $node->getId();
+        $entry['parentId'] = $node->getParent()->getId();
+        $entry['mtime'] = $node->getMTime();
+
+        $entry['name'] = $node->getName();
+        $entry['permissions'] = $node->getPermissions();
+        $entry['mimetype'] = $node->getMimetype();
+        $entry['size'] = $node->getSize();
+        $entry['type'] = $node->getType();
+        $entry['etag'] = $node->getEtag();
+
+        return $entry;
+    }
+
+    protected function addROWrapper() {
+        // FIXME: should not add storage wrappers outside of preSetup, need to find a better way
+        $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
+        \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+            return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
+        });
+        \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 	protected function addROWrapper() {
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
 		});
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);

lib/private/Repair/Owncloud/DropAccountTermsTable.php

Indentation +27 added lines, -27 removed lines

@@ -29,32 +29,32 @@
 
 class DropAccountTermsTable implements IRepairStep {
 
-	/** @var IDBConnection */
-	protected $db;
-
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Drop account terms table when migrating from ownCloud';
-	}
-
-	/**
-	 * @param IOutput $output
-	 */
-	public function run(IOutput $output) {
-		if (!$this->db->tableExists('account_terms')) {
-			return;
-		}
-
-		$this->db->dropTable('account_terms');
-	}
+    /** @var IDBConnection */
+    protected $db;
+
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Drop account terms table when migrating from ownCloud';
+    }
+
+    /**
+     * @param IOutput $output
+     */
+    public function run(IOutput $output) {
+        if (!$this->db->tableExists('account_terms')) {
+            return;
+        }
+
+        $this->db->dropTable('account_terms');
+    }
 }
 

apps/files_sharing/lib/ExpireSharesJob.php

Indentation +37 added lines, -37 removed lines

@@ -29,48 +29,48 @@
  */
 class ExpireSharesJob extends TimedJob {
 
-	/**
-	 * sets the correct interval for this timed job
-	 */
-	public function __construct() {
-		// Run once a day
-		$this->setInterval(24 * 60 * 60);
-	}
+    /**
+     * sets the correct interval for this timed job
+     */
+    public function __construct() {
+        // Run once a day
+        $this->setInterval(24 * 60 * 60);
+    }
 
-	/**
-	 * Makes the background job do its work
-	 *
-	 * @param array $argument unused argument
-	 */
-	public function run($argument) {
-		$connection = \OC::$server->getDatabaseConnection();
+    /**
+     * Makes the background job do its work
+     *
+     * @param array $argument unused argument
+     */
+    public function run($argument) {
+        $connection = \OC::$server->getDatabaseConnection();
 
-		//Current time
-		$now = new \DateTime();
-		$now = $now->format('Y-m-d H:i:s');
+        //Current time
+        $now = new \DateTime();
+        $now = $now->format('Y-m-d H:i:s');
 
-		/*
+        /*
 		 * Expire file link shares only (for now)
 		 */
-		$qb = $connection->getQueryBuilder();
-		$qb->select('id', 'file_source', 'uid_owner', 'item_type')
-			->from('share')
-			->where(
-				$qb->expr()->andX(
-					$qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
-					$qb->expr()->lte('expiration', $qb->expr()->literal($now)),
-					$qb->expr()->orX(
-						$qb->expr()->eq('item_type', $qb->expr()->literal('file')),
-						$qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
-					)
-				)
-			);
+        $qb = $connection->getQueryBuilder();
+        $qb->select('id', 'file_source', 'uid_owner', 'item_type')
+            ->from('share')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('share_type', $qb->expr()->literal(\OCP\Share::SHARE_TYPE_LINK)),
+                    $qb->expr()->lte('expiration', $qb->expr()->literal($now)),
+                    $qb->expr()->orX(
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('file')),
+                        $qb->expr()->eq('item_type', $qb->expr()->literal('folder'))
+                    )
+                )
+            );
 
-		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
-			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
-		}
-		$shares->closeCursor();
-	}
+        $shares = $qb->execute();
+        while($share = $shares->fetch()) {
+            \OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
+        }
+        $shares->closeCursor();
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 			);
 
 		$shares = $qb->execute();
-		while($share = $shares->fetch()) {
+		while ($share = $shares->fetch()) {
 			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
 		}
 		$shares->closeCursor();

apps/files_external/lib/Lib/Auth/InvalidAuth.php

Indentation +13 added lines, -13 removed lines

@@ -27,18 +27,18 @@
  */
 class InvalidAuth extends AuthMechanism {
 
-	/**
-	 * Constructs a new InvalidAuth with the id of the invalid auth
-	 * for display purposes
-	 *
-	 * @param string $invalidId invalid id
-	 */
-	public function __construct($invalidId) {
-		$this
-			->setIdentifier($invalidId)
-			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
-		;
-	}
+    /**
+     * Constructs a new InvalidAuth with the id of the invalid auth
+     * for display purposes
+     *
+     * @param string $invalidId invalid id
+     */
+    public function __construct($invalidId) {
+        $this
+            ->setIdentifier($invalidId)
+            ->setScheme(self::SCHEME_NULL)
+            ->setText('Unknown auth mechanism backend ' . $invalidId)
+        ;
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		$this
 			->setIdentifier($invalidId)
 			->setScheme(self::SCHEME_NULL)
-			->setText('Unknown auth mechanism backend ' . $invalidId)
+			->setText('Unknown auth mechanism backend '.$invalidId)
 		;
 	}
 

apps/user_ldap/lib/IGroupLDAP.php

Indentation +13 added lines, -13 removed lines

@@ -26,20 +26,20 @@
 
 interface IGroupLDAP {
 
-	//Used by LDAPProvider
+    //Used by LDAPProvider
 
-	/**
-	 * Return access for LDAP interaction.
-	 * @param string $gid
-	 * @return Access instance of Access for LDAP interaction
-	 */
-	public function getLDAPAccess($gid);
+    /**
+     * Return access for LDAP interaction.
+     * @param string $gid
+     * @return Access instance of Access for LDAP interaction
+     */
+    public function getLDAPAccess($gid);
 
-	/**
-	 * Return a new LDAP connection for the specified group.
-	 * @param string $gid
-	 * @return resource of the LDAP connection
-	 */
-	public function getNewLDAPConnection($gid);
+    /**
+     * Return a new LDAP connection for the specified group.
+     * @param string $gid
+     * @return resource of the LDAP connection
+     */
+    public function getNewLDAPConnection($gid);
 
 }