nextcloud / server

lib/private/Memcache/CADTrait.php

Indentation +25 added lines, -25 removed lines

@@ -23,32 +23,32 @@
 namespace OC\Memcache;
 
 trait CADTrait {
-	abstract public function get($key);
+    abstract public function get($key);
 
-	abstract public function remove($key);
+    abstract public function remove($key);
 
-	abstract public function add($key, $value, $ttl = 0);
+    abstract public function add($key, $value, $ttl = 0);
 
-	/**
-	 * Compare and delete
-	 *
-	 * @param string $key
-	 * @param mixed $old
-	 * @return bool
-	 */
-	public function cad($key, $old) {
-		//no native cas, emulate with locking
-		if ($this->add($key . '_lock', true)) {
-			if ($this->get($key) === $old) {
-				$this->remove($key);
-				$this->remove($key . '_lock');
-				return true;
-			} else {
-				$this->remove($key . '_lock');
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compare and delete
+     *
+     * @param string $key
+     * @param mixed $old
+     * @return bool
+     */
+    public function cad($key, $old) {
+        //no native cas, emulate with locking
+        if ($this->add($key . '_lock', true)) {
+            if ($this->get($key) === $old) {
+                $this->remove($key);
+                $this->remove($key . '_lock');
+                return true;
+            } else {
+                $this->remove($key . '_lock');
+                return false;
+            }
+        } else {
+            return false;
+        }
+    }
 }

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/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/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']);
+    }
 }

lib/private/Files/Config/CachedMountInfo.php

Indentation +110 added lines, -110 removed lines

@@ -28,114 +28,114 @@
 use OCP\IUser;
 
 class CachedMountInfo implements ICachedMountInfo {
-	/**
-	 * @var IUser
-	 */
-	protected $user;
-
-	/**
-	 * @var int
-	 */
-	protected $storageId;
-
-	/**
-	 * @var int
-	 */
-	protected $rootId;
-
-	/**
-	 * @var string
-	 */
-	protected $mountPoint;
-
-	/**
-	 * @var int|null
-	 */
-	protected $mountId;
-
-	/**
-	 * @var string
-	 */
-	protected $rootInternalPath;
-
-	/**
-	 * CachedMountInfo constructor.
-	 *
-	 * @param IUser $user
-	 * @param int $storageId
-	 * @param int $rootId
-	 * @param string $mountPoint
-	 * @param int|null $mountId
-	 * @param string $rootInternalPath
-	 */
-	public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '') {
-		$this->user = $user;
-		$this->storageId = $storageId;
-		$this->rootId = $rootId;
-		$this->mountPoint = $mountPoint;
-		$this->mountId = $mountId;
-		$this->rootInternalPath = $rootInternalPath;
-	}
-
-	/**
-	 * @return IUser
-	 */
-	public function getUser() {
-		return $this->user;
-	}
-
-	/**
-	 * @return int the numeric storage id of the mount
-	 */
-	public function getStorageId() {
-		return $this->storageId;
-	}
-
-	/**
-	 * @return int the fileid of the root of the mount
-	 */
-	public function getRootId() {
-		return $this->rootId;
-	}
-
-	/**
-	 * @return Node the root node of the mount
-	 */
-	public function getMountPointNode() {
-		// TODO injection etc
-		Filesystem::initMountPoints($this->getUser()->getUID());
-		$userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
-		$nodes = $userNode->getParent()->getById($this->getRootId());
-		if (count($nodes) > 0) {
-			return $nodes[0];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return string the mount point of the mount for the user
-	 */
-	public function getMountPoint() {
-		return $this->mountPoint;
-	}
-
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId() {
-		return $this->mountId;
-	}
-
-	/**
-	 * Get the internal path (within the storage) of the root of the mount
-	 *
-	 * @return string
-	 */
-	public function getRootInternalPath() {
-		return $this->rootInternalPath;
-	}
+    /**
+     * @var IUser
+     */
+    protected $user;
+
+    /**
+     * @var int
+     */
+    protected $storageId;
+
+    /**
+     * @var int
+     */
+    protected $rootId;
+
+    /**
+     * @var string
+     */
+    protected $mountPoint;
+
+    /**
+     * @var int|null
+     */
+    protected $mountId;
+
+    /**
+     * @var string
+     */
+    protected $rootInternalPath;
+
+    /**
+     * CachedMountInfo constructor.
+     *
+     * @param IUser $user
+     * @param int $storageId
+     * @param int $rootId
+     * @param string $mountPoint
+     * @param int|null $mountId
+     * @param string $rootInternalPath
+     */
+    public function __construct(IUser $user, $storageId, $rootId, $mountPoint, $mountId = null, $rootInternalPath = '') {
+        $this->user = $user;
+        $this->storageId = $storageId;
+        $this->rootId = $rootId;
+        $this->mountPoint = $mountPoint;
+        $this->mountId = $mountId;
+        $this->rootInternalPath = $rootInternalPath;
+    }
+
+    /**
+     * @return IUser
+     */
+    public function getUser() {
+        return $this->user;
+    }
+
+    /**
+     * @return int the numeric storage id of the mount
+     */
+    public function getStorageId() {
+        return $this->storageId;
+    }
+
+    /**
+     * @return int the fileid of the root of the mount
+     */
+    public function getRootId() {
+        return $this->rootId;
+    }
+
+    /**
+     * @return Node the root node of the mount
+     */
+    public function getMountPointNode() {
+        // TODO injection etc
+        Filesystem::initMountPoints($this->getUser()->getUID());
+        $userNode = \OC::$server->getUserFolder($this->getUser()->getUID());
+        $nodes = $userNode->getParent()->getById($this->getRootId());
+        if (count($nodes) > 0) {
+            return $nodes[0];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @return string the mount point of the mount for the user
+     */
+    public function getMountPoint() {
+        return $this->mountPoint;
+    }
+
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId() {
+        return $this->mountId;
+    }
+
+    /**
+     * Get the internal path (within the storage) of the root of the mount
+     *
+     * @return string
+     */
+    public function getRootInternalPath() {
+        return $this->rootInternalPath;
+    }
 }

lib/private/Files/ObjectStore/Mapper.php

Indentation +19 added lines, -19 removed lines

@@ -31,25 +31,25 @@
  * Map a user to a bucket.
  */
 class Mapper {
-	/** @var IUser */
-	private $user;
+    /** @var IUser */
+    private $user;
 
-	/**
-	 * Mapper constructor.
-	 *
-	 * @param IUser $user
-	 */
-	public function __construct(IUser $user) {
-		$this->user = $user;
-	}
+    /**
+     * Mapper constructor.
+     *
+     * @param IUser $user
+     */
+    public function __construct(IUser $user) {
+        $this->user = $user;
+    }
 
-	/**
-	 * @param int $numBuckets
-	 * @return string
-	 */
-	public function getBucket($numBuckets = 64) {
-		$hash = md5($this->user->getUID());
-		$num = hexdec(substr($hash, 0, 4));
-		return (string)($num % $numBuckets);
-	}
+    /**
+     * @param int $numBuckets
+     * @return string
+     */
+    public function getBucket($numBuckets = 64) {
+        $hash = md5($this->user->getUID());
+        $num = hexdec(substr($hash, 0, 4));
+        return (string)($num % $numBuckets);
+    }
 }

lib/private/Files/Storage/LocalTempFileTrait.php

Indentation +38 added lines, -38 removed lines

@@ -37,45 +37,45 @@
  */
 trait LocalTempFileTrait {
 
-	/** @var string[] */
-	protected $cachedFiles = [];
+    /** @var string[] */
+    protected $cachedFiles = [];
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function getCachedFile($path) {
-		if (!isset($this->cachedFiles[$path])) {
-			$this->cachedFiles[$path] = $this->toTmpFile($path);
-		}
-		return $this->cachedFiles[$path];
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function getCachedFile($path) {
+        if (!isset($this->cachedFiles[$path])) {
+            $this->cachedFiles[$path] = $this->toTmpFile($path);
+        }
+        return $this->cachedFiles[$path];
+    }
 
-	/**
-	 * @param string $path
-	 */
-	protected function removeCachedFile($path) {
-		unset($this->cachedFiles[$path]);
-	}
+    /**
+     * @param string $path
+     */
+    protected function removeCachedFile($path) {
+        unset($this->cachedFiles[$path]);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function toTmpFile($path) { //no longer in the storage api, still useful here
-		$source = $this->fopen($path, 'r');
-		if (!$source) {
-			return false;
-		}
-		if ($pos = strrpos($path, '.')) {
-			$extension = substr($path, $pos);
-		} else {
-			$extension = '';
-		}
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
-		$target = fopen($tmpFile, 'w');
-		\OC_Helper::streamCopy($source, $target);
-		fclose($target);
-		return $tmpFile;
-	}
+    /**
+     * @param string $path
+     * @return string
+     */
+    protected function toTmpFile($path) { //no longer in the storage api, still useful here
+        $source = $this->fopen($path, 'r');
+        if (!$source) {
+            return false;
+        }
+        if ($pos = strrpos($path, '.')) {
+            $extension = substr($path, $pos);
+        } else {
+            $extension = '';
+        }
+        $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
+        $target = fopen($tmpFile, 'w');
+        \OC_Helper::streamCopy($source, $target);
+        fclose($target);
+        return $tmpFile;
+    }
 }

lib/private/Files/Storage/StorageFactory.php

Indentation +70 added lines, -70 removed lines

@@ -29,80 +29,80 @@
 use OCP\Files\Storage\IStorageFactory;
 
 class StorageFactory implements IStorageFactory {
-	/**
-	 * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers
-	 */
-	private $storageWrappers = [];
+    /**
+     * @var array[] [$name=>['priority'=>$priority, 'wrapper'=>$callable] $storageWrappers
+     */
+    private $storageWrappers = [];
 
-	/**
-	 * allow modifier storage behaviour by adding wrappers around storages
-	 *
-	 * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
-	 *
-	 * @param string $wrapperName name of the wrapper
-	 * @param callable $callback callback
-	 * @param int $priority wrappers with the lower priority are applied last (meaning they get called first)
-	 * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
-	 * @return bool true if the wrapper was added, false if there was already a wrapper with this
-	 * name registered
-	 */
-	public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) {
-		if (isset($this->storageWrappers[$wrapperName])) {
-			return false;
-		}
+    /**
+     * allow modifier storage behaviour by adding wrappers around storages
+     *
+     * $callback should be a function of type (string $mountPoint, Storage $storage) => Storage
+     *
+     * @param string $wrapperName name of the wrapper
+     * @param callable $callback callback
+     * @param int $priority wrappers with the lower priority are applied last (meaning they get called first)
+     * @param \OCP\Files\Mount\IMountPoint[] $existingMounts existing mount points to apply the wrapper to
+     * @return bool true if the wrapper was added, false if there was already a wrapper with this
+     * name registered
+     */
+    public function addStorageWrapper($wrapperName, $callback, $priority = 50, $existingMounts = []) {
+        if (isset($this->storageWrappers[$wrapperName])) {
+            return false;
+        }
 
-		// apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage
-		foreach ($existingMounts as $mount) {
-			$mount->wrapStorage($callback);
-		}
+        // apply to existing mounts before registering it to prevent applying it double in MountPoint::createStorage
+        foreach ($existingMounts as $mount) {
+            $mount->wrapStorage($callback);
+        }
 
-		$this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority];
-		return true;
-	}
+        $this->storageWrappers[$wrapperName] = ['wrapper' => $callback, 'priority' => $priority];
+        return true;
+    }
 
-	/**
-	 * Remove a storage wrapper by name.
-	 * Note: internal method only to be used for cleanup
-	 *
-	 * @param string $wrapperName name of the wrapper
-	 * @internal
-	 */
-	public function removeStorageWrapper($wrapperName) {
-		unset($this->storageWrappers[$wrapperName]);
-	}
+    /**
+     * Remove a storage wrapper by name.
+     * Note: internal method only to be used for cleanup
+     *
+     * @param string $wrapperName name of the wrapper
+     * @internal
+     */
+    public function removeStorageWrapper($wrapperName) {
+        unset($this->storageWrappers[$wrapperName]);
+    }
 
-	/**
-	 * Create an instance of a storage and apply the registered storage wrappers
-	 *
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
-	 * @param string $class
-	 * @param array $arguments
-	 * @return \OCP\Files\Storage
-	 */
-	public function getInstance(IMountPoint $mountPoint, $class, $arguments) {
-		return $this->wrap($mountPoint, new $class($arguments));
-	}
+    /**
+     * Create an instance of a storage and apply the registered storage wrappers
+     *
+     * @param \OCP\Files\Mount\IMountPoint $mountPoint
+     * @param string $class
+     * @param array $arguments
+     * @return \OCP\Files\Storage
+     */
+    public function getInstance(IMountPoint $mountPoint, $class, $arguments) {
+        return $this->wrap($mountPoint, new $class($arguments));
+    }
 
-	/**
-	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
-	 * @param \OCP\Files\Storage $storage
-	 * @return \OCP\Files\Storage
-	 */
-	public function wrap(IMountPoint $mountPoint, $storage) {
-		$wrappers = array_values($this->storageWrappers);
-		usort($wrappers, function ($a, $b) {
-			return $b['priority'] - $a['priority'];
-		});
-		/** @var callable[] $wrappers */
-		$wrappers = array_map(function ($wrapper) {
-			return $wrapper['wrapper'];
-		}, $wrappers);
-		foreach ($wrappers as $wrapper) {
-			$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
-			if (!($storage instanceof \OCP\Files\Storage)) {
-				throw new \Exception('Invalid result from storage wrapper');
-			}
-		}
-		return $storage;
-	}
+    /**
+     * @param \OCP\Files\Mount\IMountPoint $mountPoint
+     * @param \OCP\Files\Storage $storage
+     * @return \OCP\Files\Storage
+     */
+    public function wrap(IMountPoint $mountPoint, $storage) {
+        $wrappers = array_values($this->storageWrappers);
+        usort($wrappers, function ($a, $b) {
+            return $b['priority'] - $a['priority'];
+        });
+        /** @var callable[] $wrappers */
+        $wrappers = array_map(function ($wrapper) {
+            return $wrapper['wrapper'];
+        }, $wrappers);
+        foreach ($wrappers as $wrapper) {
+            $storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
+            if (!($storage instanceof \OCP\Files\Storage)) {
+                throw new \Exception('Invalid result from storage wrapper');
+            }
+        }
+        return $storage;
+    }
 }