nextcloud / server

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 +387 added lines, -387 removed lines

@@ -35,392 +35,392 @@
 
 // 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();
-	}
-
-	/**
-	 * @return int
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 */
-	public function getSize() {
-		return $this->getFileInfo()->getSize();
-	}
-
-	/**
-	 * @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() {
-		return $this->root->get(dirname($this->path));
-	}
-
-	/**
-	 * @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() {
-	}
-
-	/**
-	 * @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()) {
-			$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();
+    }
+
+    /**
+     * @return int
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     */
+    public function getSize() {
+        return $this->getFileInfo()->getSize();
+    }
+
+    /**
+     * @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() {
+        return $this->root->get(dirname($this->path));
+    }
+
+    /**
+     * @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() {
+    }
+
+    /**
+     * @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()) {
+            $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/Node/NonExistingFile.php

Indentation +115 added lines, -115 removed lines

@@ -26,119 +26,119 @@
 use OCP\Files\NotFoundException;
 
 class NonExistingFile extends File {
-	/**
-	 * @param string $newPath
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function rename($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function delete() {
-		throw new NotFoundException();
-	}
-
-	public function copy($newPath) {
-		throw new NotFoundException();
-	}
-
-	public function touch($mtime = null) {
-		throw new NotFoundException();
-	}
-
-	public function getId() {
-		if ($this->fileInfo) {
-			return parent::getId();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function stat() {
-		throw new NotFoundException();
-	}
-
-	public function getMTime() {
-		if ($this->fileInfo) {
-			return parent::getMTime();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getSize() {
-		if ($this->fileInfo) {
-			return parent::getSize();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getEtag() {
-		if ($this->fileInfo) {
-			return parent::getEtag();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getPermissions() {
-		if ($this->fileInfo) {
-			return parent::getPermissions();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isReadable() {
-		if ($this->fileInfo) {
-			return parent::isReadable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isUpdateable() {
-		if ($this->fileInfo) {
-			return parent::isUpdateable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isDeletable() {
-		if ($this->fileInfo) {
-			return parent::isDeletable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function isShareable() {
-		if ($this->fileInfo) {
-			return parent::isShareable();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function getContent() {
-		throw new NotFoundException();
-	}
-
-	public function putContent($data) {
-		throw new NotFoundException();
-	}
-
-	public function getMimeType() {
-		if ($this->fileInfo) {
-			return parent::getMimeType();
-		} else {
-			throw new NotFoundException();
-		}
-	}
-
-	public function fopen($mode) {
-		throw new NotFoundException();
-	}
+    /**
+     * @param string $newPath
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function rename($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function delete() {
+        throw new NotFoundException();
+    }
+
+    public function copy($newPath) {
+        throw new NotFoundException();
+    }
+
+    public function touch($mtime = null) {
+        throw new NotFoundException();
+    }
+
+    public function getId() {
+        if ($this->fileInfo) {
+            return parent::getId();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function stat() {
+        throw new NotFoundException();
+    }
+
+    public function getMTime() {
+        if ($this->fileInfo) {
+            return parent::getMTime();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getSize() {
+        if ($this->fileInfo) {
+            return parent::getSize();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getEtag() {
+        if ($this->fileInfo) {
+            return parent::getEtag();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getPermissions() {
+        if ($this->fileInfo) {
+            return parent::getPermissions();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isReadable() {
+        if ($this->fileInfo) {
+            return parent::isReadable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isUpdateable() {
+        if ($this->fileInfo) {
+            return parent::isUpdateable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isDeletable() {
+        if ($this->fileInfo) {
+            return parent::isDeletable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function isShareable() {
+        if ($this->fileInfo) {
+            return parent::isShareable();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function getContent() {
+        throw new NotFoundException();
+    }
+
+    public function putContent($data) {
+        throw new NotFoundException();
+    }
+
+    public function getMimeType() {
+        if ($this->fileInfo) {
+            return parent::getMimeType();
+        } else {
+            throw new NotFoundException();
+        }
+    }
+
+    public function fopen($mode) {
+        throw new NotFoundException();
+    }
 }

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);
 	}
 
 	/**

Doc Comments +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 	 *
 	 * @param IUser $user
 	 * @param IStorageFactory $loader
-	 * @return \OCP\Files\Mount\IMountPoint
+	 * @return null|MountPoint
 	 */
 	public function getHomeMountForUser(IUser $user, IStorageFactory $loader) {
 
@@ -69,7 +69,7 @@ 
 
 	/**
 	 * @param IUser $user
-	 * @return array|null
+	 * @return IStorageFactory|null
 	 */
 	private function getSingleBucketObjectStoreConfig(IUser $user) {
 		$config = $this->config->getSystemValue('objectstore');
@@ -93,7 +93,7 @@ 
 
 	/**
 	 * @param IUser $user
-	 * @return array|null
+	 * @return IStorageFactory|null
 	 */
 	private function getMultiBucketObjectStoreConfig(IUser $user) {
 		$config = $this->config->getSystemValue('objectstore_multibucket');

Indentation +100 added lines, -100 removed lines

@@ -32,107 +32,107 @@
  * 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', \OCP\Util::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', \OCP\Util::ERROR);
-		}
-		if (!isset($config['arguments'])) {
-			$config['arguments'] = [];
-		}
-		$config['arguments']['user'] = $user;
-
-		$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', \OCP\Util::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', \OCP\Util::ERROR);
+        }
+        if (!isset($config['arguments'])) {
+            $config['arguments'] = [];
+        }
+        $config['arguments']['user'] = $user;
+
+        $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);
-
-			$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']);
-
-		return $config;
-	}
+            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;
+        }
+
+        // instantiate object store implementation
+        $config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+
+        return $config;
+    }
 }

lib/private/Files/Mount/MountPoint.php

Spacing +5 added lines, -5 removed lines

@@ -105,7 +105,7 @@ 
 		} else {
 			// Update old classes to new namespace
 			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
+				$storage = '\OC\Files\Storage\\'.substr($storage, 15);
 			}
 			$this->class = $storage;
 			$this->arguments = $arguments;
@@ -157,7 +157,7 @@ 
 				return;
 			}
 		} else {
-			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'storage backend '.$this->class.' not found', \OCP\Util::ERROR);
 			$this->invalidStorage = true;
 			return;
 		}
@@ -207,13 +207,13 @@ 
 	 */
 	public function getInternalPath($path) {
 		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+		if ($this->mountPoint === $path or $this->mountPoint.'/' === $path) {
 			$internalPath = '';
 		} else {
 			$internalPath = substr($path, strlen($this->mountPoint));
 		}
 		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
+		return (string) $internalPath;
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 */
 	public function getStorageRootId() {
 		if (is_null($this->rootId)) {
-			$this->rootId = (int)$this->getStorage()->getCache()->getId('');
+			$this->rootId = (int) $this->getStorage()->getCache()->getId('');
 		}
 		return $this->rootId;
 	}

Indentation +219 added lines, -219 removed lines

@@ -35,247 +35,247 @@
 use OCP\Files\Mount\IMountPoint;
 
 class MountPoint implements IMountPoint {
-	/**
-	 * @var \OC\Files\Storage\Storage $storage
-	 */
-	protected $storage = null;
-	protected $class;
-	protected $storageId;
-	protected $rootId = null;
+    /**
+     * @var \OC\Files\Storage\Storage $storage
+     */
+    protected $storage = null;
+    protected $class;
+    protected $storageId;
+    protected $rootId = null;
 
-	/**
-	 * Configuration options for the storage backend
-	 *
-	 * @var array
-	 */
-	protected $arguments = array();
-	protected $mountPoint;
+    /**
+     * Configuration options for the storage backend
+     *
+     * @var array
+     */
+    protected $arguments = array();
+    protected $mountPoint;
 
-	/**
-	 * Mount specific options
-	 *
-	 * @var array
-	 */
-	protected $mountOptions = array();
+    /**
+     * Mount specific options
+     *
+     * @var array
+     */
+    protected $mountOptions = array();
 
-	/**
-	 * @var \OC\Files\Storage\StorageFactory $loader
-	 */
-	private $loader;
+    /**
+     * @var \OC\Files\Storage\StorageFactory $loader
+     */
+    private $loader;
 
-	/**
-	 * Specified whether the storage is invalid after failing to
-	 * instantiate it.
-	 *
-	 * @var bool
-	 */
-	private $invalidStorage = false;
+    /**
+     * Specified whether the storage is invalid after failing to
+     * instantiate it.
+     *
+     * @var bool
+     */
+    private $invalidStorage = false;
 
-	/** @var int|null */
-	protected $mountId;
+    /** @var int|null */
+    protected $mountId;
 
-	/**
-	 * @param string|\OC\Files\Storage\Storage $storage
-	 * @param string $mountpoint
-	 * @param array $arguments (optional) configuration for the storage backend
-	 * @param \OCP\Files\Storage\IStorageFactory $loader
-	 * @param array $mountOptions mount specific options
-	 * @param int|null $mountId
-	 * @throws \Exception
-	 */
-	public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null, $mountId = null) {
-		if (is_null($arguments)) {
-			$arguments = array();
-		}
-		if (is_null($loader)) {
-			$this->loader = new StorageFactory();
-		} else {
-			$this->loader = $loader;
-		}
+    /**
+     * @param string|\OC\Files\Storage\Storage $storage
+     * @param string $mountpoint
+     * @param array $arguments (optional) configuration for the storage backend
+     * @param \OCP\Files\Storage\IStorageFactory $loader
+     * @param array $mountOptions mount specific options
+     * @param int|null $mountId
+     * @throws \Exception
+     */
+    public function __construct($storage, $mountpoint, $arguments = null, $loader = null, $mountOptions = null, $mountId = null) {
+        if (is_null($arguments)) {
+            $arguments = array();
+        }
+        if (is_null($loader)) {
+            $this->loader = new StorageFactory();
+        } else {
+            $this->loader = $loader;
+        }
 
-		if (!is_null($mountOptions)) {
-			$this->mountOptions = $mountOptions;
-		}
+        if (!is_null($mountOptions)) {
+            $this->mountOptions = $mountOptions;
+        }
 
-		$mountpoint = $this->formatPath($mountpoint);
-		$this->mountPoint = $mountpoint;
-		if ($storage instanceof Storage) {
-			$this->class = get_class($storage);
-			$this->storage = $this->loader->wrap($this, $storage);
-		} else {
-			// Update old classes to new namespace
-			if (strpos($storage, 'OC_Filestorage_') !== false) {
-				$storage = '\OC\Files\Storage\\' . substr($storage, 15);
-			}
-			$this->class = $storage;
-			$this->arguments = $arguments;
-		}
-		$this->mountId = $mountId;
-	}
+        $mountpoint = $this->formatPath($mountpoint);
+        $this->mountPoint = $mountpoint;
+        if ($storage instanceof Storage) {
+            $this->class = get_class($storage);
+            $this->storage = $this->loader->wrap($this, $storage);
+        } else {
+            // Update old classes to new namespace
+            if (strpos($storage, 'OC_Filestorage_') !== false) {
+                $storage = '\OC\Files\Storage\\' . substr($storage, 15);
+            }
+            $this->class = $storage;
+            $this->arguments = $arguments;
+        }
+        $this->mountId = $mountId;
+    }
 
-	/**
-	 * get complete path to the mount point, relative to data/
-	 *
-	 * @return string
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
+    /**
+     * get complete path to the mount point, relative to data/
+     *
+     * @return string
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
 
-	/**
-	 * Sets the mount point path, relative to data/
-	 *
-	 * @param string $mountPoint new mount point
-	 */
-	public function setMountPoint($mountPoint) {
-		$this->mountPoint = $this->formatPath($mountPoint);
-	}
+    /**
+     * Sets the mount point path, relative to data/
+     *
+     * @param string $mountPoint new mount point
+     */
+    public function setMountPoint($mountPoint) {
+        $this->mountPoint = $this->formatPath($mountPoint);
+    }
 
-	/**
-	 * create the storage that is mounted
-	 */
-	private function createStorage() {
-		if ($this->invalidStorage) {
-			return;
-		}
+    /**
+     * create the storage that is mounted
+     */
+    private function createStorage() {
+        if ($this->invalidStorage) {
+            return;
+        }
 
-		if (class_exists($this->class)) {
-			try {
-				$class = $this->class;
-				// prevent recursion by setting the storage before applying wrappers
-				$this->storage = new $class($this->arguments);
-				$this->storage = $this->loader->wrap($this, $this->storage);
-			} catch (\Exception $exception) {
-				$this->storage = null;
-				$this->invalidStorage = true;
-				if ($this->mountPoint === '/') {
-					// the root storage could not be initialized, show the user!
-					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
-				} else {
-					\OC::$server->getLogger()->logException($exception, ['level' => \OCP\Util::ERROR]);
-				}
-				return;
-			}
-		} else {
-			\OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
-			$this->invalidStorage = true;
-			return;
-		}
-	}
+        if (class_exists($this->class)) {
+            try {
+                $class = $this->class;
+                // prevent recursion by setting the storage before applying wrappers
+                $this->storage = new $class($this->arguments);
+                $this->storage = $this->loader->wrap($this, $this->storage);
+            } catch (\Exception $exception) {
+                $this->storage = null;
+                $this->invalidStorage = true;
+                if ($this->mountPoint === '/') {
+                    // the root storage could not be initialized, show the user!
+                    throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
+                } else {
+                    \OC::$server->getLogger()->logException($exception, ['level' => \OCP\Util::ERROR]);
+                }
+                return;
+            }
+        } else {
+            \OCP\Util::writeLog('core', 'storage backend ' . $this->class . ' not found', \OCP\Util::ERROR);
+            $this->invalidStorage = true;
+            return;
+        }
+    }
 
-	/**
-	 * @return \OC\Files\Storage\Storage
-	 */
-	public function getStorage() {
-		if (is_null($this->storage)) {
-			$this->createStorage();
-		}
-		return $this->storage;
-	}
+    /**
+     * @return \OC\Files\Storage\Storage
+     */
+    public function getStorage() {
+        if (is_null($this->storage)) {
+            $this->createStorage();
+        }
+        return $this->storage;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getStorageId() {
-		if (!$this->storageId) {
-			if (is_null($this->storage)) {
-				$storage = $this->createStorage(); //FIXME: start using exceptions
-				if (is_null($storage)) {
-					return null;
-				}
+    /**
+     * @return string
+     */
+    public function getStorageId() {
+        if (!$this->storageId) {
+            if (is_null($this->storage)) {
+                $storage = $this->createStorage(); //FIXME: start using exceptions
+                if (is_null($storage)) {
+                    return null;
+                }
 
-				$this->storage = $storage;
-			}
-			$this->storageId = $this->storage->getId();
-			if (strlen($this->storageId) > 64) {
-				$this->storageId = md5($this->storageId);
-			}
-		}
-		return $this->storageId;
-	}
+                $this->storage = $storage;
+            }
+            $this->storageId = $this->storage->getId();
+            if (strlen($this->storageId) > 64) {
+                $this->storageId = md5($this->storageId);
+            }
+        }
+        return $this->storageId;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getNumericStorageId() {
-		return $this->getStorage()->getStorageCache()->getNumericId();
-	}
+    /**
+     * @return int
+     */
+    public function getNumericStorageId() {
+        return $this->getStorage()->getStorageCache()->getNumericId();
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	public function getInternalPath($path) {
-		$path = Filesystem::normalizePath($path, true, false, true);
-		if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
-			$internalPath = '';
-		} else {
-			$internalPath = substr($path, strlen($this->mountPoint));
-		}
-		// substr returns false instead of an empty string, we always want a string
-		return (string)$internalPath;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    public function getInternalPath($path) {
+        $path = Filesystem::normalizePath($path, true, false, true);
+        if ($this->mountPoint === $path or $this->mountPoint . '/' === $path) {
+            $internalPath = '';
+        } else {
+            $internalPath = substr($path, strlen($this->mountPoint));
+        }
+        // substr returns false instead of an empty string, we always want a string
+        return (string)$internalPath;
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	private function formatPath($path) {
-		$path = Filesystem::normalizePath($path);
-		if (strlen($path) > 1) {
-			$path .= '/';
-		}
-		return $path;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    private function formatPath($path) {
+        $path = Filesystem::normalizePath($path);
+        if (strlen($path) > 1) {
+            $path .= '/';
+        }
+        return $path;
+    }
 
-	/**
-	 * @param callable $wrapper
-	 */
-	public function wrapStorage($wrapper) {
-		$storage = $this->getStorage();
-		// storage can be null if it couldn't be initialized
-		if ($storage != null) {
-			$this->storage = $wrapper($this->mountPoint, $storage, $this);
-		}
-	}
+    /**
+     * @param callable $wrapper
+     */
+    public function wrapStorage($wrapper) {
+        $storage = $this->getStorage();
+        // storage can be null if it couldn't be initialized
+        if ($storage != null) {
+            $this->storage = $wrapper($this->mountPoint, $storage, $this);
+        }
+    }
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 */
-	public function getOption($name, $default) {
-		return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
-	}
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     */
+    public function getOption($name, $default) {
+        return isset($this->mountOptions[$name]) ? $this->mountOptions[$name] : $default;
+    }
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 */
-	public function getOptions() {
-		return $this->mountOptions;
-	}
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     */
+    public function getOptions() {
+        return $this->mountOptions;
+    }
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 */
-	public function getStorageRootId() {
-		if (is_null($this->rootId)) {
-			$this->rootId = (int)$this->getStorage()->getCache()->getId('');
-		}
-		return $this->rootId;
-	}
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     */
+    public function getStorageRootId() {
+        if (is_null($this->rootId)) {
+            $this->rootId = (int)$this->getStorage()->getCache()->getId('');
+        }
+        return $this->rootId;
+    }
 
-	public function getMountId() {
-		return $this->mountId;
-	}
+    public function getMountId() {
+        return $this->mountId;
+    }
 
-	public function getMountType() {
-		return '';
-	}
+    public function getMountType() {
+        return '';
+    }
 }

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/AppData/Factory.php

Indentation +16 added lines, -16 removed lines

@@ -27,24 +27,24 @@
 
 class Factory {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var SystemConfig */
-	private $config;
+    /** @var SystemConfig */
+    private $config;
 
-	public function __construct(IRootFolder $rootFolder,
-								SystemConfig $systemConfig) {
+    public function __construct(IRootFolder $rootFolder,
+                                SystemConfig $systemConfig) {
 
-		$this->rootFolder = $rootFolder;
-		$this->config = $systemConfig;
-	}
+        $this->rootFolder = $rootFolder;
+        $this->config = $systemConfig;
+    }
 
-	/**
-	 * @param string $appId
-	 * @return AppData
-	 */
-	public function get($appId) {
-		return new AppData($this->rootFolder, $this->config, $appId);
-	}
+    /**
+     * @param string $appId
+     * @return AppData
+     */
+    public function get($appId) {
+        return new AppData($this->rootFolder, $this->config, $appId);
+    }
 }

lib/private/Files/AppData/AppData.php

Indentation +94 added lines, -94 removed lines

@@ -34,98 +34,98 @@
 
 class AppData implements IAppData {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var SystemConfig */
-	private $config;
-
-	/** @var string */
-	private $appId;
-
-	/** @var Folder */
-	private $folder;
-
-	/**
-	 * AppData constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param SystemConfig $systemConfig
-	 * @param string $appId
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								SystemConfig $systemConfig,
-								$appId) {
-
-		$this->rootFolder = $rootFolder;
-		$this->config = $systemConfig;
-		$this->appId = $appId;
-	}
-
-	/**
-	 * @return Folder
-	 * @throws \RuntimeException
-	 */
-	private function getAppDataFolder() {
-		if ($this->folder === null) {
-			$instanceId = $this->config->getValue('instanceid', null);
-			if ($instanceId === null) {
-				throw new \RuntimeException('no instance id!');
-			}
-
-			$name = 'appdata_' . $instanceId;
-
-			try {
-				$appDataFolder = $this->rootFolder->get($name);
-			} catch (NotFoundException $e) {
-				try {
-					$appDataFolder = $this->rootFolder->newFolder($name);
-				} catch (NotPermittedException $e) {
-					throw new \RuntimeException('Could not get appdata folder');
-				}
-			}
-
-			try {
-				$appDataFolder = $appDataFolder->get($this->appId);
-			} catch (NotFoundException $e) {
-				try {
-					$appDataFolder = $appDataFolder->newFolder($this->appId);
-				} catch (NotPermittedException $e) {
-					throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
-				}
-			}
-
-			$this->folder = $appDataFolder;
-		}
-
-		return $this->folder;
-	}
-
-	public function getFolder($name) {
-		$node = $this->getAppDataFolder()->get($name);
-
-		/** @var Folder $node */
-		return new SimpleFolder($node);
-	}
-
-	public function newFolder($name) {
-		$folder = $this->getAppDataFolder()->newFolder($name);
-
-		return new SimpleFolder($folder);
-	}
-
-	public function getDirectoryListing() {
-		$listing = $this->getAppDataFolder()->getDirectoryListing();
-
-		$fileListing = array_map(function(Node $folder) {
-			if ($folder instanceof Folder) {
-				return new SimpleFolder($folder);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var SystemConfig */
+    private $config;
+
+    /** @var string */
+    private $appId;
+
+    /** @var Folder */
+    private $folder;
+
+    /**
+     * AppData constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param SystemConfig $systemConfig
+     * @param string $appId
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                SystemConfig $systemConfig,
+                                $appId) {
+
+        $this->rootFolder = $rootFolder;
+        $this->config = $systemConfig;
+        $this->appId = $appId;
+    }
+
+    /**
+     * @return Folder
+     * @throws \RuntimeException
+     */
+    private function getAppDataFolder() {
+        if ($this->folder === null) {
+            $instanceId = $this->config->getValue('instanceid', null);
+            if ($instanceId === null) {
+                throw new \RuntimeException('no instance id!');
+            }
+
+            $name = 'appdata_' . $instanceId;
+
+            try {
+                $appDataFolder = $this->rootFolder->get($name);
+            } catch (NotFoundException $e) {
+                try {
+                    $appDataFolder = $this->rootFolder->newFolder($name);
+                } catch (NotPermittedException $e) {
+                    throw new \RuntimeException('Could not get appdata folder');
+                }
+            }
+
+            try {
+                $appDataFolder = $appDataFolder->get($this->appId);
+            } catch (NotFoundException $e) {
+                try {
+                    $appDataFolder = $appDataFolder->newFolder($this->appId);
+                } catch (NotPermittedException $e) {
+                    throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+                }
+            }
+
+            $this->folder = $appDataFolder;
+        }
+
+        return $this->folder;
+    }
+
+    public function getFolder($name) {
+        $node = $this->getAppDataFolder()->get($name);
+
+        /** @var Folder $node */
+        return new SimpleFolder($node);
+    }
+
+    public function newFolder($name) {
+        $folder = $this->getAppDataFolder()->newFolder($name);
+
+        return new SimpleFolder($folder);
+    }
+
+    public function getDirectoryListing() {
+        $listing = $this->getAppDataFolder()->getDirectoryListing();
+
+        $fileListing = array_map(function(Node $folder) {
+            if ($folder instanceof Folder) {
+                return new SimpleFolder($folder);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 				throw new \RuntimeException('no instance id!');
 			}
 
-			$name = 'appdata_' . $instanceId;
+			$name = 'appdata_'.$instanceId;
 
 			try {
 				$appDataFolder = $this->rootFolder->get($name);
@@ -91,7 +91,7 @@ 
 				try {
 					$appDataFolder = $appDataFolder->newFolder($this->appId);
 				} catch (NotPermittedException $e) {
-					throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+					throw new \RuntimeException('Could not get appdata folder for '.$this->appId);
 				}
 			}
 

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;