nextcloud / server

lib/private/OCS/CoreCapabilities.php

Indentation +21 added lines, -21 removed lines

@@ -33,27 +33,27 @@
  */
 class CoreCapabilities implements ICapability {
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'core' => [
-				'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
-				'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'core' => [
+                'pollinterval' => $this->config->getSystemValue('pollinterval', 60),
+                'webdav-root' => $this->config->getSystemValue('webdav-root', 'remote.php/webdav'),
+            ]
+        ];
+    }
 }

lib/private/Files/Node/Root.php

Spacing +4 added lines, -4 removed lines

@@ -372,12 +372,12 @@
 			\OC\Files\Filesystem::initMountPoints($userId);
 
 			try {
-				$folder = $this->get('/' . $userId . '/files');
+				$folder = $this->get('/'.$userId.'/files');
 			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
+				if (!$this->nodeExists('/'.$userId)) {
+					$this->newFolder('/'.$userId);
 				}
-				$folder = $this->newFolder('/' . $userId . '/files');
+				$folder = $this->newFolder('/'.$userId.'/files');
 			}
 
 			$this->userFolderCache->set($userId, $folder);

Indentation +335 added lines, -335 removed lines

@@ -61,339 +61,339 @@
  * @package OC\Files\Node
  */
 class Root extends Folder implements IRootFolder {
-	/** @var Manager */
-	private $mountManager;
-	/** @var PublicEmitter */
-	private $emitter;
-	/** @var null|\OC\User\User */
-	private $user;
-	/** @var CappedMemoryCache */
-	private $userFolderCache;
-	/** @var IUserMountCache */
-	private $userMountCache;
-	/** @var ILogger */
-	private $logger;
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param \OC\Files\Mount\Manager $manager
-	 * @param \OC\Files\View $view
-	 * @param \OC\User\User|null $user
-	 * @param IUserMountCache $userMountCache
-	 * @param ILogger $logger
-	 * @param IUserManager $userManager
-	 */
-	public function __construct($manager,
-								$view,
-								$user,
-								IUserMountCache $userMountCache,
-								ILogger $logger,
-								IUserManager $userManager) {
-		parent::__construct($this, $view, '');
-		$this->mountManager = $manager;
-		$this->user = $user;
-		$this->emitter = new PublicEmitter();
-		$this->userFolderCache = new CappedMemoryCache();
-		$this->userMountCache = $userMountCache;
-		$this->logger = $logger;
-		$this->userManager = $userManager;
-	}
-
-	/**
-	 * Get the user for which the filesystem is setup
-	 *
-	 * @return \OC\User\User
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param callable $callback
-	 */
-	public function listen($scope, $method, callable $callback) {
-		$this->emitter->listen($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope optional
-	 * @param string $method optional
-	 * @param callable $callback optional
-	 */
-	public function removeListener($scope = null, $method = null, callable $callback = null) {
-		$this->emitter->removeListener($scope, $method, $callback);
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param Node[] $arguments
-	 */
-	public function emit($scope, $method, $arguments = array()) {
-		$this->emitter->emit($scope, $method, $arguments);
-	}
-
-	/**
-	 * @param \OC\Files\Storage\Storage $storage
-	 * @param string $mountPoint
-	 * @param array $arguments
-	 */
-	public function mount($storage, $mountPoint, $arguments = array()) {
-		$mount = new MountPoint($storage, $mountPoint, $arguments);
-		$this->mountManager->addMount($mount);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint
-	 */
-	public function getMount($mountPoint) {
-		return $this->mountManager->find($mountPoint);
-	}
-
-	/**
-	 * @param string $mountPoint
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountsIn($mountPoint) {
-		return $this->mountManager->findIn($mountPoint);
-	}
-
-	/**
-	 * @param string $storageId
-	 * @return \OC\Files\Mount\MountPoint[]
-	 */
-	public function getMountByStorageId($storageId) {
-		return $this->mountManager->findByStorageId($storageId);
-	}
-
-	/**
-	 * @param int $numericId
-	 * @return MountPoint[]
-	 */
-	public function getMountByNumericStorageId($numericId) {
-		return $this->mountManager->findByNumericId($numericId);
-	}
-
-	/**
-	 * @param \OC\Files\Mount\MountPoint $mount
-	 */
-	public function unMount($mount) {
-		$this->mountManager->remove($mount);
-	}
-
-	/**
-	 * @param string $path
-	 * @throws \OCP\Files\NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return string
-	 */
-	public function get($path) {
-		$path = $this->normalizePath($path);
-		if ($this->isValidPath($path)) {
-			$fullPath = $this->getFullPath($path);
-			$fileInfo = $this->view->getFileInfo($fullPath);
-			if ($fileInfo) {
-				return $this->createNode($fullPath, $fileInfo);
-			} else {
-				throw new NotFoundException($path);
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	//most operations can't be done on the root
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return \OC\Files\Node\Node
-	 */
-	public function rename($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	public function delete() {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException
-	 * @return \OC\Files\Node\Node
-	 */
-	public function copy($targetPath) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		throw new NotPermittedException();
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return '/';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		return '';
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getId() {
-		return null;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getMTime() {
-		return null;
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int
-	 */
-	public function getSize($includeMounts = true) {
-		return null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEtag() {
-		return null;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPermissions() {
-		return \OCP\Constants::PERMISSION_CREATE;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isReadable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUpdateable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isDeletable() {
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isShareable() {
-		return false;
-	}
-
-	/**
-	 * @return Node
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getParent() {
-		throw new NotFoundException();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return '';
-	}
-
-	/**
-	 * Returns a view to user's files folder
-	 *
-	 * @param string $userId user ID
-	 * @return \OCP\Files\Folder
-	 * @throws \OC\User\NoUserException
-	 */
-	public function getUserFolder($userId) {
-		$userObject = $this->userManager->get($userId);
-
-		if (is_null($userObject)) {
-			$this->logger->error(
-				sprintf(
-					'Backends provided no user object for %s',
-					$userId
-				),
-				[
-					'app' => 'files',
-				]
-			);
-			throw new \OC\User\NoUserException('Backends provided no user object');
-		}
-
-		$userId = $userObject->getUID();
-
-		if (!$this->userFolderCache->hasKey($userId)) {
-			\OC\Files\Filesystem::initMountPoints($userId);
-
-			try {
-				$folder = $this->get('/' . $userId . '/files');
-			} catch (NotFoundException $e) {
-				if (!$this->nodeExists('/' . $userId)) {
-					$this->newFolder('/' . $userId);
-				}
-				$folder = $this->newFolder('/' . $userId . '/files');
-			}
-
-			$this->userFolderCache->set($userId, $folder);
-		}
-
-		return $this->userFolderCache->get($userId);
-	}
-
-	public function clearCache() {
-		$this->userFolderCache = new CappedMemoryCache();
-	}
-
-	public function getUserMountCache() {
-		return $this->userMountCache;
-	}
+    /** @var Manager */
+    private $mountManager;
+    /** @var PublicEmitter */
+    private $emitter;
+    /** @var null|\OC\User\User */
+    private $user;
+    /** @var CappedMemoryCache */
+    private $userFolderCache;
+    /** @var IUserMountCache */
+    private $userMountCache;
+    /** @var ILogger */
+    private $logger;
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param \OC\Files\Mount\Manager $manager
+     * @param \OC\Files\View $view
+     * @param \OC\User\User|null $user
+     * @param IUserMountCache $userMountCache
+     * @param ILogger $logger
+     * @param IUserManager $userManager
+     */
+    public function __construct($manager,
+                                $view,
+                                $user,
+                                IUserMountCache $userMountCache,
+                                ILogger $logger,
+                                IUserManager $userManager) {
+        parent::__construct($this, $view, '');
+        $this->mountManager = $manager;
+        $this->user = $user;
+        $this->emitter = new PublicEmitter();
+        $this->userFolderCache = new CappedMemoryCache();
+        $this->userMountCache = $userMountCache;
+        $this->logger = $logger;
+        $this->userManager = $userManager;
+    }
+
+    /**
+     * Get the user for which the filesystem is setup
+     *
+     * @return \OC\User\User
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param callable $callback
+     */
+    public function listen($scope, $method, callable $callback) {
+        $this->emitter->listen($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope optional
+     * @param string $method optional
+     * @param callable $callback optional
+     */
+    public function removeListener($scope = null, $method = null, callable $callback = null) {
+        $this->emitter->removeListener($scope, $method, $callback);
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param Node[] $arguments
+     */
+    public function emit($scope, $method, $arguments = array()) {
+        $this->emitter->emit($scope, $method, $arguments);
+    }
+
+    /**
+     * @param \OC\Files\Storage\Storage $storage
+     * @param string $mountPoint
+     * @param array $arguments
+     */
+    public function mount($storage, $mountPoint, $arguments = array()) {
+        $mount = new MountPoint($storage, $mountPoint, $arguments);
+        $this->mountManager->addMount($mount);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint
+     */
+    public function getMount($mountPoint) {
+        return $this->mountManager->find($mountPoint);
+    }
+
+    /**
+     * @param string $mountPoint
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountsIn($mountPoint) {
+        return $this->mountManager->findIn($mountPoint);
+    }
+
+    /**
+     * @param string $storageId
+     * @return \OC\Files\Mount\MountPoint[]
+     */
+    public function getMountByStorageId($storageId) {
+        return $this->mountManager->findByStorageId($storageId);
+    }
+
+    /**
+     * @param int $numericId
+     * @return MountPoint[]
+     */
+    public function getMountByNumericStorageId($numericId) {
+        return $this->mountManager->findByNumericId($numericId);
+    }
+
+    /**
+     * @param \OC\Files\Mount\MountPoint $mount
+     */
+    public function unMount($mount) {
+        $this->mountManager->remove($mount);
+    }
+
+    /**
+     * @param string $path
+     * @throws \OCP\Files\NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     * @return string
+     */
+    public function get($path) {
+        $path = $this->normalizePath($path);
+        if ($this->isValidPath($path)) {
+            $fullPath = $this->getFullPath($path);
+            $fileInfo = $this->view->getFileInfo($fullPath);
+            if ($fileInfo) {
+                return $this->createNode($fullPath, $fileInfo);
+            } else {
+                throw new NotFoundException($path);
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    //most operations can't be done on the root
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException
+     * @return \OC\Files\Node\Node
+     */
+    public function rename($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    public function delete() {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException
+     * @return \OC\Files\Node\Node
+     */
+    public function copy($targetPath) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        throw new NotPermittedException();
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return '/';
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        return '';
+    }
+
+    /**
+     * @return int
+     */
+    public function getId() {
+        return null;
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function getMTime() {
+        return null;
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int
+     */
+    public function getSize($includeMounts = true) {
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEtag() {
+        return null;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPermissions() {
+        return \OCP\Constants::PERMISSION_CREATE;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isReadable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpdateable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeletable() {
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShareable() {
+        return false;
+    }
+
+    /**
+     * @return Node
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getParent() {
+        throw new NotFoundException();
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return '';
+    }
+
+    /**
+     * Returns a view to user's files folder
+     *
+     * @param string $userId user ID
+     * @return \OCP\Files\Folder
+     * @throws \OC\User\NoUserException
+     */
+    public function getUserFolder($userId) {
+        $userObject = $this->userManager->get($userId);
+
+        if (is_null($userObject)) {
+            $this->logger->error(
+                sprintf(
+                    'Backends provided no user object for %s',
+                    $userId
+                ),
+                [
+                    'app' => 'files',
+                ]
+            );
+            throw new \OC\User\NoUserException('Backends provided no user object');
+        }
+
+        $userId = $userObject->getUID();
+
+        if (!$this->userFolderCache->hasKey($userId)) {
+            \OC\Files\Filesystem::initMountPoints($userId);
+
+            try {
+                $folder = $this->get('/' . $userId . '/files');
+            } catch (NotFoundException $e) {
+                if (!$this->nodeExists('/' . $userId)) {
+                    $this->newFolder('/' . $userId);
+                }
+                $folder = $this->newFolder('/' . $userId . '/files');
+            }
+
+            $this->userFolderCache->set($userId, $folder);
+        }
+
+        return $this->userFolderCache->get($userId);
+    }
+
+    public function clearCache() {
+        $this->userFolderCache = new CappedMemoryCache();
+    }
+
+    public function getUserMountCache() {
+        return $this->userMountCache;
+    }
 }

lib/private/Files/Node/Node.php

Spacing +6 added lines, -6 removed lines

@@ -288,7 +288,7 @@ 
 		$path = str_replace('\\', '/', $path);
 		//add leading slash
 		if ($path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		//remove duplicate slashes
 		while (strpos($path, '//') !== false) {
@@ -308,7 +308,7 @@ 
 	 */
 	public function isValidPath($path) {
 		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
+			$path = '/'.$path;
 		}
 		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
 			return false;
@@ -389,14 +389,14 @@ 
 			$this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
 			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
 			if (!$this->view->copy($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not copy '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
 			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to copy to path ' . $targetPath);
+			throw new NotPermittedException('No permission to copy to path '.$targetPath);
 		}
 	}
 
@@ -413,7 +413,7 @@ 
 			$this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
 			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
 			if (!$this->view->rename($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
+				throw new NotPermittedException('Could not move '.$this->path.' to '.$targetPath);
 			}
 			$targetNode = $this->root->get($targetPath);
 			$this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
@@ -421,7 +421,7 @@ 
 			$this->path = $targetPath;
 			return $targetNode;
 		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
+			throw new NotPermittedException('No permission to move to path '.$targetPath);
 		}
 	}
 

Indentation +403 added lines, -403 removed lines

@@ -36,408 +36,408 @@
 
 // FIXME: this class really should be abstract
 class Node implements \OCP\Files\Node {
-	/**
-	 * @var \OC\Files\View $view
-	 */
-	protected $view;
-
-	/**
-	 * @var \OC\Files\Node\Root $root
-	 */
-	protected $root;
-
-	/**
-	 * @var string $path
-	 */
-	protected $path;
-
-	/**
-	 * @var \OCP\Files\FileInfo
-	 */
-	protected $fileInfo;
-
-	/**
-	 * @param \OC\Files\View $view
-	 * @param \OCP\Files\IRootFolder $root
-	 * @param string $path
-	 * @param FileInfo $fileInfo
-	 */
-	public function __construct($root, $view, $path, $fileInfo = null) {
-		$this->view = $view;
-		$this->root = $root;
-		$this->path = $path;
-		$this->fileInfo = $fileInfo;
-	}
-
-	/**
-	 * Creates a Node of the same type that represents a non-existing path
-	 *
-	 * @param string $path path
-	 * @return string non-existing node class
-	 */
-	protected function createNonExistingNode($path) {
-		throw new \Exception('Must be implemented by subclasses');
-	}
-
-	/**
-	 * Returns the matching file info
-	 *
-	 * @return FileInfo
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getFileInfo() {
-		if (!Filesystem::isValidPath($this->path)) {
-			throw new InvalidPathException();
-		}
-		if (!$this->fileInfo) {
-			$fileInfo = $this->view->getFileInfo($this->path);
-			if ($fileInfo instanceof FileInfo) {
-				$this->fileInfo = $fileInfo;
-			} else {
-				throw new NotFoundException();
-			}
-		}
-		return $this->fileInfo;
-	}
-
-	/**
-	 * @param string[] $hooks
-	 */
-	protected function sendHooks($hooks) {
-		foreach ($hooks as $hook) {
-			$this->root->emit('\OC\Files', $hook, array($this));
-		}
-	}
-
-	/**
-	 * @param int $permissions
-	 * @return bool
-	 */
-	protected function checkPermissions($permissions) {
-		return ($this->getPermissions() & $permissions) === $permissions;
-	}
-
-	public function delete() {
-	}
-
-	/**
-	 * @param int $mtime
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function touch($mtime = null) {
-		if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
-			$this->sendHooks(array('preTouch'));
-			$this->view->touch($this->path, $mtime);
-			$this->sendHooks(array('postTouch'));
-			if ($this->fileInfo) {
-				if (is_null($mtime)) {
-					$mtime = time();
-				}
-				$this->fileInfo['mtime'] = $mtime;
-			}
-		} else {
-			throw new NotPermittedException();
-		}
-	}
-
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function getStorage() {
-		list($storage,) = $this->view->resolvePath($this->path);
-		return $storage;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		list(, $internalPath) = $this->view->resolvePath($this->path);
-		return $internalPath;
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getId() {
-		return $this->getFileInfo()->getId();
-	}
-
-	/**
-	 * @return array
-	 */
-	public function stat() {
-		return $this->view->stat($this->path);
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getMTime() {
-		return $this->getFileInfo()->getMTime();
-	}
-
-	/**
-	 * @param bool $includeMounts
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getSize($includeMounts = true) {
-		return $this->getFileInfo()->getSize($includeMounts);
-	}
-
-	/**
-	 * @return string
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getEtag() {
-		return $this->getFileInfo()->getEtag();
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getPermissions() {
-		return $this->getFileInfo()->getPermissions();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isReadable() {
-		return $this->getFileInfo()->isReadable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isUpdateable() {
-		return $this->getFileInfo()->isUpdateable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isDeletable() {
-		return $this->getFileInfo()->isDeletable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isShareable() {
-		return $this->getFileInfo()->isShareable();
-	}
-
-	/**
-	 * @return bool
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function isCreatable() {
-		return $this->getFileInfo()->isCreatable();
-	}
-
-	/**
-	 * @return Node
-	 */
-	public function getParent() {
-		$newPath = dirname($this->path);
-		if ($newPath === '' || $newPath === '.' || $newPath === '/') {
-			return $this->root;
-		}
-		return $this->root->get($newPath);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return basename($this->path);
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function normalizePath($path) {
-		if ($path === '' or $path === '/') {
-			return '/';
-		}
-		//no windows style slashes
-		$path = str_replace('\\', '/', $path);
-		//add leading slash
-		if ($path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		//remove duplicate slashes
-		while (strpos($path, '//') !== false) {
-			$path = str_replace('//', '/', $path);
-		}
-		//remove trailing slash
-		$path = rtrim($path, '/');
-
-		return $path;
-	}
-
-	/**
-	 * check if the requested path is valid
-	 *
-	 * @param string $path
-	 * @return bool
-	 */
-	public function isValidPath($path) {
-		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
-			return false;
-		}
-		return true;
-	}
-
-	public function isMounted() {
-		return $this->getFileInfo()->isMounted();
-	}
-
-	public function isShared() {
-		return $this->getFileInfo()->isShared();
-	}
-
-	public function getMimeType() {
-		return $this->getFileInfo()->getMimetype();
-	}
-
-	public function getMimePart() {
-		return $this->getFileInfo()->getMimePart();
-	}
-
-	public function getType() {
-		return $this->getFileInfo()->getType();
-	}
-
-	public function isEncrypted() {
-		return $this->getFileInfo()->isEncrypted();
-	}
-
-	public function getMountPoint() {
-		return $this->getFileInfo()->getMountPoint();
-	}
-
-	public function getOwner() {
-		return $this->getFileInfo()->getOwner();
-	}
-
-	public function getChecksum() {
-	}
-
-	public function getExtension(): string {
-		return $this->getFileInfo()->getExtension();
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function lock($type) {
-		$this->view->lockFile($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function changeLock($type) {
-		$this->view->changeLock($this->path, $type);
-	}
-
-	/**
-	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 */
-	public function unlock($type) {
-		$this->view->unlockFile($this->path, $type);
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException if copy not allowed or failed
-	 * @return \OC\Files\Node\Node
-	 */
-	public function copy($targetPath) {
-		$targetPath = $this->normalizePath($targetPath);
-		$parent = $this->root->get(dirname($targetPath));
-		if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
-			$nonExisting = $this->createNonExistingNode($targetPath);
-			$this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
-			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
-			if (!$this->view->copy($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
-			}
-			$targetNode = $this->root->get($targetPath);
-			$this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
-			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
-			return $targetNode;
-		} else {
-			throw new NotPermittedException('No permission to copy to path ' . $targetPath);
-		}
-	}
-
-	/**
-	 * @param string $targetPath
-	 * @throws \OCP\Files\NotPermittedException if move not allowed or failed
-	 * @return \OC\Files\Node\Node
-	 */
-	public function move($targetPath) {
-		$targetPath = $this->normalizePath($targetPath);
-		$parent = $this->root->get(dirname($targetPath));
-		if (
-			$parent instanceof Folder and
-			$this->isValidPath($targetPath) and
-			(
-				$parent->isCreatable() ||
-				($parent->getInternalPath() === '' && $parent->getMountPoint() instanceof MoveableMount)
-			)
-		) {
-			$nonExisting = $this->createNonExistingNode($targetPath);
-			$this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
-			$this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
-			if (!$this->view->rename($this->path, $targetPath)) {
-				throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
-			}
-			$targetNode = $this->root->get($targetPath);
-			$this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
-			$this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
-			$this->path = $targetPath;
-			return $targetNode;
-		} else {
-			throw new NotPermittedException('No permission to move to path ' . $targetPath);
-		}
-	}
+    /**
+     * @var \OC\Files\View $view
+     */
+    protected $view;
+
+    /**
+     * @var \OC\Files\Node\Root $root
+     */
+    protected $root;
+
+    /**
+     * @var string $path
+     */
+    protected $path;
+
+    /**
+     * @var \OCP\Files\FileInfo
+     */
+    protected $fileInfo;
+
+    /**
+     * @param \OC\Files\View $view
+     * @param \OCP\Files\IRootFolder $root
+     * @param string $path
+     * @param FileInfo $fileInfo
+     */
+    public function __construct($root, $view, $path, $fileInfo = null) {
+        $this->view = $view;
+        $this->root = $root;
+        $this->path = $path;
+        $this->fileInfo = $fileInfo;
+    }
+
+    /**
+     * Creates a Node of the same type that represents a non-existing path
+     *
+     * @param string $path path
+     * @return string non-existing node class
+     */
+    protected function createNonExistingNode($path) {
+        throw new \Exception('Must be implemented by subclasses');
+    }
+
+    /**
+     * Returns the matching file info
+     *
+     * @return FileInfo
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getFileInfo() {
+        if (!Filesystem::isValidPath($this->path)) {
+            throw new InvalidPathException();
+        }
+        if (!$this->fileInfo) {
+            $fileInfo = $this->view->getFileInfo($this->path);
+            if ($fileInfo instanceof FileInfo) {
+                $this->fileInfo = $fileInfo;
+            } else {
+                throw new NotFoundException();
+            }
+        }
+        return $this->fileInfo;
+    }
+
+    /**
+     * @param string[] $hooks
+     */
+    protected function sendHooks($hooks) {
+        foreach ($hooks as $hook) {
+            $this->root->emit('\OC\Files', $hook, array($this));
+        }
+    }
+
+    /**
+     * @param int $permissions
+     * @return bool
+     */
+    protected function checkPermissions($permissions) {
+        return ($this->getPermissions() & $permissions) === $permissions;
+    }
+
+    public function delete() {
+    }
+
+    /**
+     * @param int $mtime
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function touch($mtime = null) {
+        if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
+            $this->sendHooks(array('preTouch'));
+            $this->view->touch($this->path, $mtime);
+            $this->sendHooks(array('postTouch'));
+            if ($this->fileInfo) {
+                if (is_null($mtime)) {
+                    $mtime = time();
+                }
+                $this->fileInfo['mtime'] = $mtime;
+            }
+        } else {
+            throw new NotPermittedException();
+        }
+    }
+
+    /**
+     * @return \OC\Files\Storage\Storage
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function getStorage() {
+        list($storage,) = $this->view->resolvePath($this->path);
+        return $storage;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        list(, $internalPath) = $this->view->resolvePath($this->path);
+        return $internalPath;
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getId() {
+        return $this->getFileInfo()->getId();
+    }
+
+    /**
+     * @return array
+     */
+    public function stat() {
+        return $this->view->stat($this->path);
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getMTime() {
+        return $this->getFileInfo()->getMTime();
+    }
+
+    /**
+     * @param bool $includeMounts
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getSize($includeMounts = true) {
+        return $this->getFileInfo()->getSize($includeMounts);
+    }
+
+    /**
+     * @return string
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getEtag() {
+        return $this->getFileInfo()->getEtag();
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getPermissions() {
+        return $this->getFileInfo()->getPermissions();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isReadable() {
+        return $this->getFileInfo()->isReadable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isUpdateable() {
+        return $this->getFileInfo()->isUpdateable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isDeletable() {
+        return $this->getFileInfo()->isDeletable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isShareable() {
+        return $this->getFileInfo()->isShareable();
+    }
+
+    /**
+     * @return bool
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function isCreatable() {
+        return $this->getFileInfo()->isCreatable();
+    }
+
+    /**
+     * @return Node
+     */
+    public function getParent() {
+        $newPath = dirname($this->path);
+        if ($newPath === '' || $newPath === '.' || $newPath === '/') {
+            return $this->root;
+        }
+        return $this->root->get($newPath);
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return basename($this->path);
+    }
+
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function normalizePath($path) {
+        if ($path === '' or $path === '/') {
+            return '/';
+        }
+        //no windows style slashes
+        $path = str_replace('\\', '/', $path);
+        //add leading slash
+        if ($path[0] !== '/') {
+            $path = '/' . $path;
+        }
+        //remove duplicate slashes
+        while (strpos($path, '//') !== false) {
+            $path = str_replace('//', '/', $path);
+        }
+        //remove trailing slash
+        $path = rtrim($path, '/');
+
+        return $path;
+    }
+
+    /**
+     * check if the requested path is valid
+     *
+     * @param string $path
+     * @return bool
+     */
+    public function isValidPath($path) {
+        if (!$path || $path[0] !== '/') {
+            $path = '/' . $path;
+        }
+        if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
+            return false;
+        }
+        return true;
+    }
+
+    public function isMounted() {
+        return $this->getFileInfo()->isMounted();
+    }
+
+    public function isShared() {
+        return $this->getFileInfo()->isShared();
+    }
+
+    public function getMimeType() {
+        return $this->getFileInfo()->getMimetype();
+    }
+
+    public function getMimePart() {
+        return $this->getFileInfo()->getMimePart();
+    }
+
+    public function getType() {
+        return $this->getFileInfo()->getType();
+    }
+
+    public function isEncrypted() {
+        return $this->getFileInfo()->isEncrypted();
+    }
+
+    public function getMountPoint() {
+        return $this->getFileInfo()->getMountPoint();
+    }
+
+    public function getOwner() {
+        return $this->getFileInfo()->getOwner();
+    }
+
+    public function getChecksum() {
+    }
+
+    public function getExtension(): string {
+        return $this->getFileInfo()->getExtension();
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function lock($type) {
+        $this->view->lockFile($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function changeLock($type) {
+        $this->view->changeLock($this->path, $type);
+    }
+
+    /**
+     * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     */
+    public function unlock($type) {
+        $this->view->unlockFile($this->path, $type);
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException if copy not allowed or failed
+     * @return \OC\Files\Node\Node
+     */
+    public function copy($targetPath) {
+        $targetPath = $this->normalizePath($targetPath);
+        $parent = $this->root->get(dirname($targetPath));
+        if ($parent instanceof Folder and $this->isValidPath($targetPath) and $parent->isCreatable()) {
+            $nonExisting = $this->createNonExistingNode($targetPath);
+            $this->root->emit('\OC\Files', 'preCopy', [$this, $nonExisting]);
+            $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
+            if (!$this->view->copy($this->path, $targetPath)) {
+                throw new NotPermittedException('Could not copy ' . $this->path . ' to ' . $targetPath);
+            }
+            $targetNode = $this->root->get($targetPath);
+            $this->root->emit('\OC\Files', 'postCopy', [$this, $targetNode]);
+            $this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
+            return $targetNode;
+        } else {
+            throw new NotPermittedException('No permission to copy to path ' . $targetPath);
+        }
+    }
+
+    /**
+     * @param string $targetPath
+     * @throws \OCP\Files\NotPermittedException if move not allowed or failed
+     * @return \OC\Files\Node\Node
+     */
+    public function move($targetPath) {
+        $targetPath = $this->normalizePath($targetPath);
+        $parent = $this->root->get(dirname($targetPath));
+        if (
+            $parent instanceof Folder and
+            $this->isValidPath($targetPath) and
+            (
+                $parent->isCreatable() ||
+                ($parent->getInternalPath() === '' && $parent->getMountPoint() instanceof MoveableMount)
+            )
+        ) {
+            $nonExisting = $this->createNonExistingNode($targetPath);
+            $this->root->emit('\OC\Files', 'preRename', [$this, $nonExisting]);
+            $this->root->emit('\OC\Files', 'preWrite', [$nonExisting]);
+            if (!$this->view->rename($this->path, $targetPath)) {
+                throw new NotPermittedException('Could not move ' . $this->path . ' to ' . $targetPath);
+            }
+            $targetNode = $this->root->get($targetPath);
+            $this->root->emit('\OC\Files', 'postRename', [$this, $targetNode]);
+            $this->root->emit('\OC\Files', 'postWrite', [$targetNode]);
+            $this->path = $targetPath;
+            return $targetNode;
+        } else {
+            throw new NotPermittedException('No permission to move to path ' . $targetPath);
+        }
+    }
 
 }

lib/private/Files/Mount/ObjectHomeMountProvider.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 			return null;
 		}
 
-		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
+		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/'.$user->getUID(), $config['arguments'], $loader);
 	}
 
 	/**

Indentation +97 added lines, -97 removed lines

@@ -33,108 +33,108 @@
  * Mount provider for object store home storages
  */
 class ObjectHomeMountProvider implements IHomeMountProvider {
-	/**
-	 * @var IConfig
-	 */
-	private $config;
-
-	/**
-	 * ObjectStoreHomeMountProvider constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
-
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint
-	 */
-	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
-
-		$config = $this->getMultiBucketObjectStoreConfig($user);
-		if ($config === null) {
-			$config = $this->getSingleBucketObjectStoreConfig($user);
-		}
-
-		if ($config === null) {
-			return null;
-		}
-
-		return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array|null
-	 */
-	private function getSingleBucketObjectStoreConfig(IUser $user) {
-		$config = $this->config->getSystemValue('objectstore');
-		if (!is_array($config)) {
-			return null;
-		}
-
-		// sanity checks
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
-
-		$config['arguments']['user'] = $user;
-
-		return $config;
-	}
-
-	/**
-	 * @param IUser $user
-	 * @return array|null
-	 */
-	private function getMultiBucketObjectStoreConfig(IUser $user) {
-		$config = $this->config->getSystemValue('objectstore_multibucket');
-		if (!is_array($config)) {
-			return null;
-		}
-
-		// sanity checks
-		if (empty($config['class'])) {
-			\OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-
-		$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
-
-		if ($bucket === null) {
-			/*
+    /**
+     * @var IConfig
+     */
+    private $config;
+
+    /**
+     * ObjectStoreHomeMountProvider constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
+
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint
+     */
+    public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
+
+        $config = $this->getMultiBucketObjectStoreConfig($user);
+        if ($config === null) {
+            $config = $this->getSingleBucketObjectStoreConfig($user);
+        }
+
+        if ($config === null) {
+            return null;
+        }
+
+        return new MountPoint('\OC\Files\ObjectStore\HomeObjectStoreStorage', '/' . $user->getUID(), $config['arguments'], $loader);
+    }
+
+    /**
+     * @param IUser $user
+     * @return array|null
+     */
+    private function getSingleBucketObjectStoreConfig(IUser $user) {
+        $config = $this->config->getSystemValue('objectstore');
+        if (!is_array($config)) {
+            return null;
+        }
+
+        // sanity checks
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+
+        $config['arguments']['user'] = $user;
+
+        return $config;
+    }
+
+    /**
+     * @param IUser $user
+     * @return array|null
+     */
+    private function getMultiBucketObjectStoreConfig(IUser $user) {
+        $config = $this->config->getSystemValue('objectstore_multibucket');
+        if (!is_array($config)) {
+            return null;
+        }
+
+        // sanity checks
+        if (empty($config['class'])) {
+            \OCP\Util::writeLog('files', 'No class given for objectstore', ILogger::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+
+        $bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
+
+        if ($bucket === null) {
+            /*
 			 * Use any provided bucket argument as prefix
 			 * and add the mapping from username => bucket
 			 */
-			if (!isset($config['arguments']['bucket'])) {
-				$config['arguments']['bucket'] = '';
-			}
-			$mapper = new \OC\Files\ObjectStore\Mapper($user);
-			$numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64;
-			$config['arguments']['bucket'] .= $mapper->getBucket($numBuckets);
+            if (!isset($config['arguments']['bucket'])) {
+                $config['arguments']['bucket'] = '';
+            }
+            $mapper = new \OC\Files\ObjectStore\Mapper($user);
+            $numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64;
+            $config['arguments']['bucket'] .= $mapper->getBucket($numBuckets);
 
-			$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
-		} else {
-			$config['arguments']['bucket'] = $bucket;
-		}
+            $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
+        } else {
+            $config['arguments']['bucket'] = $bucket;
+        }
 
-		// instantiate object store implementation
-		$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
 
-		$config['arguments']['user'] = $user;
+        $config['arguments']['user'] = $user;
 
-		return $config;
-	}
+        return $config;
+    }
 }

lib/private/Files/Mount/LocalHomeMountProvider.php

Indentation +11 added lines, -11 removed lines

@@ -30,15 +30,15 @@
  * Mount provider for regular posix home folders
  */
 class LocalHomeMountProvider implements IHomeMountProvider {
-	/**
-	 * Get the cache mount for a user
-	 *
-	 * @param IUser $user
-	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint[]
-	 */
-	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
-		$arguments = ['user' => $user];
-		return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader);
-	}
+    /**
+     * Get the cache mount for a user
+     *
+     * @param IUser $user
+     * @param IStorageFactory $loader
+     * @return \OCP\Files\Mount\IMountPoint[]
+     */
+    public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
+        $arguments = ['user' => $user];
+        return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -39,6 +39,6 @@
 	 */
 	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
 		$arguments = ['user' => $user];
-		return new MountPoint('\OC\Files\Storage\Home', '/' . $user->getUID(), $arguments, $loader);
+		return new MountPoint('\OC\Files\Storage\Home', '/'.$user->getUID(), $arguments, $loader);
 	}
 }

lib/private/Files/Mount/MoveableMount.php

Indentation +14 added lines, -14 removed lines

@@ -27,19 +27,19 @@
  * Defines the mount point to be (re)moved by the user
  */
 interface MoveableMount {
-	/**
-	 * Move the mount point to $target
-	 *
-	 * @param string $target the target mount point
-	 * @return bool
-	 */
-	public function moveMount($target);
+    /**
+     * Move the mount point to $target
+     *
+     * @param string $target the target mount point
+     * @return bool
+     */
+    public function moveMount($target);
 
-	/**
-	 * Remove the mount points
-	 *
-	 * @return mixed
-	 * @return bool
-	 */
-	public function removeMount();
+    /**
+     * Remove the mount points
+     *
+     * @return mixed
+     * @return bool
+     */
+    public function removeMount();
 }

lib/private/Files/Stream/Quota.php

Indentation +60 added lines, -60 removed lines

@@ -33,71 +33,71 @@
  * usage: resource \OC\Files\Stream\Quota::wrap($stream, $limit)
  */
 class Quota extends Wrapper {
-	/**
-	 * @var int $limit
-	 */
-	private $limit;
+    /**
+     * @var int $limit
+     */
+    private $limit;
 
-	/**
-	 * @param resource $stream
-	 * @param int $limit
-	 * @return resource
-	 */
-	static public function wrap($stream, $limit) {
-		$context = stream_context_create(array(
-			'quota' => array(
-				'source' => $stream,
-				'limit' => $limit
-			)
-		));
-		return Wrapper::wrapSource($stream, $context, 'quota', self::class);
-	}
+    /**
+     * @param resource $stream
+     * @param int $limit
+     * @return resource
+     */
+    static public function wrap($stream, $limit) {
+        $context = stream_context_create(array(
+            'quota' => array(
+                'source' => $stream,
+                'limit' => $limit
+            )
+        ));
+        return Wrapper::wrapSource($stream, $context, 'quota', self::class);
+    }
 
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		$context = $this->loadContext('quota');
-		$this->source = $context['source'];
-		$this->limit = $context['limit'];
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        $context = $this->loadContext('quota');
+        $this->source = $context['source'];
+        $this->limit = $context['limit'];
 
-		return true;
-	}
+        return true;
+    }
 
-	public function dir_opendir($path, $options) {
-		return false;
-	}
+    public function dir_opendir($path, $options) {
+        return false;
+    }
 
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		if ($whence === SEEK_END){
-			// go to the end to find out last position's offset
-			$oldOffset = $this->stream_tell();
-			if (fseek($this->source, 0, $whence) !== 0){
-				return false;
-			}
-			$whence = SEEK_SET;
-			$offset = $this->stream_tell() + $offset;
-			$this->limit += $oldOffset - $offset;
-		}
-		else if ($whence === SEEK_SET) {
-			$this->limit += $this->stream_tell() - $offset;
-		} else {
-			$this->limit -= $offset;
-		}
-		// this wrapper needs to return "true" for success.
-		// the fseek call itself returns 0 on succeess
-		return fseek($this->source, $offset, $whence) === 0;
-	}
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        if ($whence === SEEK_END){
+            // go to the end to find out last position's offset
+            $oldOffset = $this->stream_tell();
+            if (fseek($this->source, 0, $whence) !== 0){
+                return false;
+            }
+            $whence = SEEK_SET;
+            $offset = $this->stream_tell() + $offset;
+            $this->limit += $oldOffset - $offset;
+        }
+        else if ($whence === SEEK_SET) {
+            $this->limit += $this->stream_tell() - $offset;
+        } else {
+            $this->limit -= $offset;
+        }
+        // this wrapper needs to return "true" for success.
+        // the fseek call itself returns 0 on succeess
+        return fseek($this->source, $offset, $whence) === 0;
+    }
 
-	public function stream_read($count) {
-		$this->limit -= $count;
-		return fread($this->source, $count);
-	}
+    public function stream_read($count) {
+        $this->limit -= $count;
+        return fread($this->source, $count);
+    }
 
-	public function stream_write($data) {
-		$size = strlen($data);
-		if ($size > $this->limit) {
-			$data = substr($data, 0, $this->limit);
-			$size = $this->limit;
-		}
-		$this->limit -= $size;
-		return fwrite($this->source, $data);
-	}
+    public function stream_write($data) {
+        $size = strlen($data);
+        if ($size > $this->limit) {
+            $data = substr($data, 0, $this->limit);
+            $size = $this->limit;
+        }
+        $this->limit -= $size;
+        return fwrite($this->source, $data);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -66,10 +66,10 @@
 	}
 
 	public function stream_seek($offset, $whence = SEEK_SET) {
-		if ($whence === SEEK_END){
+		if ($whence === SEEK_END) {
 			// go to the end to find out last position's offset
 			$oldOffset = $this->stream_tell();
-			if (fseek($this->source, 0, $whence) !== 0){
+			if (fseek($this->source, 0, $whence) !== 0) {
 				return false;
 			}
 			$whence = SEEK_SET;

Braces +1 added lines, -2 removed lines

@@ -75,8 +75,7 @@
 			$whence = SEEK_SET;
 			$offset = $this->stream_tell() + $offset;
 			$this->limit += $oldOffset - $offset;
-		}
-		else if ($whence === SEEK_SET) {
+		} else if ($whence === SEEK_SET) {
 			$this->limit += $this->stream_tell() - $offset;
 		} else {
 			$this->limit -= $offset;

lib/private/Files/Config/LazyStorageMountInfo.php

Indentation +50 added lines, -50 removed lines

@@ -29,60 +29,60 @@
 use OCP\IUser;
 
 class LazyStorageMountInfo extends CachedMountInfo {
-	/** @var IMountPoint */
-	private $mount;
+    /** @var IMountPoint */
+    private $mount;
 
-	/**
-	 * CachedMountInfo constructor.
-	 *
-	 * @param IUser $user
-	 * @param IMountPoint $mount
-	 */
-	public function __construct(IUser $user, IMountPoint $mount) {
-		$this->user = $user;
-		$this->mount = $mount;
-	}
+    /**
+     * CachedMountInfo constructor.
+     *
+     * @param IUser $user
+     * @param IMountPoint $mount
+     */
+    public function __construct(IUser $user, IMountPoint $mount) {
+        $this->user = $user;
+        $this->mount = $mount;
+    }
 
-	/**
-	 * @return int the numeric storage id of the mount
-	 */
-	public function getStorageId() {
-		if (!$this->storageId) {
-			$this->storageId = $this->mount->getNumericStorageId();
-		}
-		return parent::getStorageId();
-	}
+    /**
+     * @return int the numeric storage id of the mount
+     */
+    public function getStorageId() {
+        if (!$this->storageId) {
+            $this->storageId = $this->mount->getNumericStorageId();
+        }
+        return parent::getStorageId();
+    }
 
-	/**
-	 * @return int the fileid of the root of the mount
-	 */
-	public function getRootId() {
-		if (!$this->rootId) {
-			$this->rootId = $this->mount->getStorageRootId();
-		}
-		return parent::getRootId();
-	}
+    /**
+     * @return int the fileid of the root of the mount
+     */
+    public function getRootId() {
+        if (!$this->rootId) {
+            $this->rootId = $this->mount->getStorageRootId();
+        }
+        return parent::getRootId();
+    }
 
-	/**
-	 * @return string the mount point of the mount for the user
-	 */
-	public function getMountPoint() {
-		if (!$this->mountPoint) {
-			$this->mountPoint = $this->mount->getMountPoint();
-		}
-		return parent::getMountPoint();
-	}
+    /**
+     * @return string the mount point of the mount for the user
+     */
+    public function getMountPoint() {
+        if (!$this->mountPoint) {
+            $this->mountPoint = $this->mount->getMountPoint();
+        }
+        return parent::getMountPoint();
+    }
 
-	public function getMountId() {
-		return $this->mount->getMountId();
-	}
+    public function getMountId() {
+        return $this->mount->getMountId();
+    }
 
-	/**
-	 * Get the internal path (within the storage) of the root of the mount
-	 *
-	 * @return string
-	 */
-	public function getRootInternalPath() {
-		return $this->mount->getInternalPath($this->mount->getMountPoint());
-	}
+    /**
+     * Get the internal path (within the storage) of the root of the mount
+     *
+     * @return string
+     */
+    public function getRootInternalPath() {
+        return $this->mount->getInternalPath($this->mount->getMountPoint());
+    }
 }

lib/private/Files/Config/UserMountCacheListener.php

Indentation +15 added lines, -15 removed lines

@@ -29,21 +29,21 @@
  * Listen to hooks and update the mount cache as needed
  */
 class UserMountCacheListener {
-	/**
-	 * @var IUserMountCache
-	 */
-	private $userMountCache;
+    /**
+     * @var IUserMountCache
+     */
+    private $userMountCache;
 
-	/**
-	 * UserMountCacheListener constructor.
-	 *
-	 * @param IUserMountCache $userMountCache
-	 */
-	public function __construct(IUserMountCache $userMountCache) {
-		$this->userMountCache = $userMountCache;
-	}
+    /**
+     * UserMountCacheListener constructor.
+     *
+     * @param IUserMountCache $userMountCache
+     */
+    public function __construct(IUserMountCache $userMountCache) {
+        $this->userMountCache = $userMountCache;
+    }
 
-	public function listen(Manager $manager) {
-		$manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
-	}
+    public function listen(Manager $manager) {
+        $manager->listen('\OC\User', 'postDelete', [$this->userMountCache, 'removeUserMounts']);
+    }
 }