nextcloud / server

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,51 +28,51 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+    public function run(IOutput $output) {
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if (!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if (!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if (file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if (file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if (file_exists($previousStepFile)) {
-				if (\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if (file_exists($previousStepFile)) {
+                if (\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if (rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if (rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -43,19 +43,19 @@
 	}
 
 	public function run(IOutput $output) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
 		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$stepFile = $updaterFolderPath.'/.step';
 		if (file_exists($stepFile)) {
 			$output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+			$previousStepFile = $updaterFolderPath.'/.step-previous-update';
 
 			// cleanup
 			if (file_exists($previousStepFile)) {

lib/private/Share/SearchResultSorter.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 	public function sort($a, $b) {
 		if (!isset($a[$this->key]) || !isset($b[$this->key])) {
 			if (!is_null($this->log)) {
-				$this->log->error('Sharing dialogue: cannot sort due to ' .
+				$this->log->error('Sharing dialogue: cannot sort due to '.
 								  'missing array key', ['app' => 'core']);
 			}
 			return 0;

Indentation +43 added lines, -43 removed lines

@@ -29,50 +29,50 @@
 use OCP\ILogger;
 
 class SearchResultSorter {
-	private $search;
-	private $encoding;
-	private $key;
-	private $log;
+    private $search;
+    private $encoding;
+    private $key;
+    private $log;
 
-	/**
-	 * @param string $search the search term as was given by the user
-	 * @param string $key the array key containing the value that should be compared
-	 * against
-	 * @param string $encoding optional, encoding to use, defaults to UTF-8
-	 * @param ILogger $log optional
-	 */
-	public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
-		$this->encoding = $encoding;
-		$this->key = $key;
-		$this->log = $log;
-		$this->search = mb_strtolower($search, $this->encoding);
-	}
+    /**
+     * @param string $search the search term as was given by the user
+     * @param string $key the array key containing the value that should be compared
+     * against
+     * @param string $encoding optional, encoding to use, defaults to UTF-8
+     * @param ILogger $log optional
+     */
+    public function __construct($search, $key, ILogger $log = null, $encoding = 'UTF-8') {
+        $this->encoding = $encoding;
+        $this->key = $key;
+        $this->log = $log;
+        $this->search = mb_strtolower($search, $this->encoding);
+    }
 
-	/**
-	 * User and Group names matching the search term at the beginning shall appear
-	 * on top of the share dialog. Following entries in alphabetical order.
-	 * Callback function for usort. http://php.net/usort
-	 */
-	public function sort($a, $b) {
-		if (!isset($a[$this->key]) || !isset($b[$this->key])) {
-			if (!is_null($this->log)) {
-				$this->log->error('Sharing dialogue: cannot sort due to ' .
-								  'missing array key', ['app' => 'core']);
-			}
-			return 0;
-		}
-		$nameA = mb_strtolower($a[$this->key], $this->encoding);
-		$nameB = mb_strtolower($b[$this->key], $this->encoding);
-		$i = mb_strpos($nameA, $this->search, 0, $this->encoding);
-		$j = mb_strpos($nameB, $this->search, 0, $this->encoding);
+    /**
+     * User and Group names matching the search term at the beginning shall appear
+     * on top of the share dialog. Following entries in alphabetical order.
+     * Callback function for usort. http://php.net/usort
+     */
+    public function sort($a, $b) {
+        if (!isset($a[$this->key]) || !isset($b[$this->key])) {
+            if (!is_null($this->log)) {
+                $this->log->error('Sharing dialogue: cannot sort due to ' .
+                                    'missing array key', ['app' => 'core']);
+            }
+            return 0;
+        }
+        $nameA = mb_strtolower($a[$this->key], $this->encoding);
+        $nameB = mb_strtolower($b[$this->key], $this->encoding);
+        $i = mb_strpos($nameA, $this->search, 0, $this->encoding);
+        $j = mb_strpos($nameB, $this->search, 0, $this->encoding);
 
-		if ($i === $j || $i > 0 && $j > 0) {
-			return strcmp(mb_strtolower($nameA, $this->encoding),
-						  mb_strtolower($nameB, $this->encoding));
-		} elseif ($i === 0) {
-			return -1;
-		} else {
-			return 1;
-		}
-	}
+        if ($i === $j || $i > 0 && $j > 0) {
+            return strcmp(mb_strtolower($nameA, $this->encoding),
+                            mb_strtolower($nameB, $this->encoding));
+        } elseif ($i === 0) {
+            return -1;
+        } else {
+            return 1;
+        }
+    }
 }

lib/private/CapabilitiesManager.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
 				}
 			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+				throw new \InvalidArgumentException('The given Capability ('.get_class($c).') does not implement the ICapability interface');
 			}
 		}
 

Indentation +48 added lines, -48 removed lines

@@ -36,58 +36,58 @@
 
 class CapabilitiesManager {
 
-	/** @var \Closure[] */
-	private $capabilities = [];
+    /** @var \Closure[] */
+    private $capabilities = [];
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	public function __construct(ILogger $logger) {
-		$this->logger = $logger;
-	}
+    public function __construct(ILogger $logger) {
+        $this->logger = $logger;
+    }
 
-	/**
-	 * Get an array of al the capabilities that are registered at this manager
-	 *
-	 * @param bool $public get public capabilities only
-	 * @throws \InvalidArgumentException
-	 * @return array
-	 */
-	public function getCapabilities(bool $public = false) : array {
-		$capabilities = [];
-		foreach ($this->capabilities as $capability) {
-			try {
-				$c = $capability();
-			} catch (QueryException $e) {
-				$this->logger->logException($e, [
-					'message' => 'CapabilitiesManager',
-					'level' => ILogger::ERROR,
-					'app' => 'core',
-				]);
-				continue;
-			}
+    /**
+     * Get an array of al the capabilities that are registered at this manager
+     *
+     * @param bool $public get public capabilities only
+     * @throws \InvalidArgumentException
+     * @return array
+     */
+    public function getCapabilities(bool $public = false) : array {
+        $capabilities = [];
+        foreach ($this->capabilities as $capability) {
+            try {
+                $c = $capability();
+            } catch (QueryException $e) {
+                $this->logger->logException($e, [
+                    'message' => 'CapabilitiesManager',
+                    'level' => ILogger::ERROR,
+                    'app' => 'core',
+                ]);
+                continue;
+            }
 
-			if ($c instanceof ICapability) {
-				if (!$public || $c instanceof IPublicCapability) {
-					$capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
-				}
-			} else {
-				throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
-			}
-		}
+            if ($c instanceof ICapability) {
+                if (!$public || $c instanceof IPublicCapability) {
+                    $capabilities = array_replace_recursive($capabilities, $c->getCapabilities());
+                }
+            } else {
+                throw new \InvalidArgumentException('The given Capability (' . get_class($c) . ') does not implement the ICapability interface');
+            }
+        }
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be called in case
-	 * capabilities are actually requested
-	 *
-	 * $callable has to return an instance of OCP\Capabilities\ICapability
-	 *
-	 * @param \Closure $callable
-	 */
-	public function registerCapability(\Closure $callable) {
-		$this->capabilities[] = $callable;
-	}
+    /**
+     * In order to improve lazy loading a closure can be registered which will be called in case
+     * capabilities are actually requested
+     *
+     * $callable has to return an instance of OCP\Capabilities\ICapability
+     *
+     * @param \Closure $callable
+     */
+    public function registerCapability(\Closure $callable) {
+        $this->capabilities[] = $callable;
+    }
 }

lib/private/OCS/Result.php

Indentation +123 added lines, -123 removed lines

@@ -32,127 +32,127 @@
 
 class Result {
 
-	/** @var array  */
-	protected $data;
-
-	/** @var null|string */
-	protected $message;
-
-	/** @var int */
-	protected $statusCode;
-
-	/** @var integer */
-	protected $items;
-
-	/** @var integer */
-	protected $perPage;
-
-	/** @var array */
-	private $headers = [];
-
-	/**
-	 * create the OCS_Result object
-	 * @param mixed $data the data to return
-	 * @param int $code
-	 * @param null|string $message
-	 * @param array $headers
-	 */
-	public function __construct($data = null, $code = 100, $message = null, $headers = []) {
-		if ($data === null) {
-			$this->data = [];
-		} elseif (!is_array($data)) {
-			$this->data = [$this->data];
-		} else {
-			$this->data = $data;
-		}
-		$this->statusCode = $code;
-		$this->message = $message;
-		$this->headers = $headers;
-	}
-
-	/**
-	 * optionally set the total number of items available
-	 * @param int $items
-	 */
-	public function setTotalItems($items) {
-		$this->items = $items;
-	}
-
-	/**
-	 * optionally set the the number of items per page
-	 * @param int $items
-	 */
-	public function setItemsPerPage($items) {
-		$this->perPage = $items;
-	}
-
-	/**
-	 * get the status code
-	 * @return int
-	 */
-	public function getStatusCode() {
-		return $this->statusCode;
-	}
-
-	/**
-	 * get the meta data for the result
-	 * @return array
-	 */
-	public function getMeta() {
-		$meta = [];
-		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
-		$meta['statuscode'] = $this->statusCode;
-		$meta['message'] = $this->message;
-		if (isset($this->items)) {
-			$meta['totalitems'] = $this->items;
-		}
-		if (isset($this->perPage)) {
-			$meta['itemsperpage'] = $this->perPage;
-		}
-		return $meta;
-	}
-
-	/**
-	 * get the result data
-	 * @return array
-	 */
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * return bool Whether the method succeeded
-	 * @return bool
-	 */
-	public function succeeded() {
-		return ($this->statusCode == 100);
-	}
-
-	/**
-	 * Adds a new header to the response
-	 * @param string $name The name of the HTTP header
-	 * @param string $value The value, null will delete it
-	 * @return $this
-	 */
-	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
-		// to be able to reliably check for security
-		// headers
-
-		if (is_null($value)) {
-			unset($this->headers[$name]);
-		} else {
-			$this->headers[$name] = $value;
-		}
-
-		return $this;
-	}
-
-	/**
-	 * Returns the set headers
-	 * @return array the headers
-	 */
-	public function getHeaders() {
-		return $this->headers;
-	}
+    /** @var array  */
+    protected $data;
+
+    /** @var null|string */
+    protected $message;
+
+    /** @var int */
+    protected $statusCode;
+
+    /** @var integer */
+    protected $items;
+
+    /** @var integer */
+    protected $perPage;
+
+    /** @var array */
+    private $headers = [];
+
+    /**
+     * create the OCS_Result object
+     * @param mixed $data the data to return
+     * @param int $code
+     * @param null|string $message
+     * @param array $headers
+     */
+    public function __construct($data = null, $code = 100, $message = null, $headers = []) {
+        if ($data === null) {
+            $this->data = [];
+        } elseif (!is_array($data)) {
+            $this->data = [$this->data];
+        } else {
+            $this->data = $data;
+        }
+        $this->statusCode = $code;
+        $this->message = $message;
+        $this->headers = $headers;
+    }
+
+    /**
+     * optionally set the total number of items available
+     * @param int $items
+     */
+    public function setTotalItems($items) {
+        $this->items = $items;
+    }
+
+    /**
+     * optionally set the the number of items per page
+     * @param int $items
+     */
+    public function setItemsPerPage($items) {
+        $this->perPage = $items;
+    }
+
+    /**
+     * get the status code
+     * @return int
+     */
+    public function getStatusCode() {
+        return $this->statusCode;
+    }
+
+    /**
+     * get the meta data for the result
+     * @return array
+     */
+    public function getMeta() {
+        $meta = [];
+        $meta['status'] = $this->succeeded() ? 'ok' : 'failure';
+        $meta['statuscode'] = $this->statusCode;
+        $meta['message'] = $this->message;
+        if (isset($this->items)) {
+            $meta['totalitems'] = $this->items;
+        }
+        if (isset($this->perPage)) {
+            $meta['itemsperpage'] = $this->perPage;
+        }
+        return $meta;
+    }
+
+    /**
+     * get the result data
+     * @return array
+     */
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * return bool Whether the method succeeded
+     * @return bool
+     */
+    public function succeeded() {
+        return ($this->statusCode == 100);
+    }
+
+    /**
+     * Adds a new header to the response
+     * @param string $name The name of the HTTP header
+     * @param string $value The value, null will delete it
+     * @return $this
+     */
+    public function addHeader($name, $value) {
+        $name = trim($name);  // always remove leading and trailing whitespace
+        // to be able to reliably check for security
+        // headers
+
+        if (is_null($value)) {
+            unset($this->headers[$name]);
+        } else {
+            $this->headers[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns the set headers
+     * @return array the headers
+     */
+    public function getHeaders() {
+        return $this->headers;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 	 * @return $this
 	 */
 	public function addHeader($name, $value) {
-		$name = trim($name);  // always remove leading and trailing whitespace
+		$name = trim($name); // always remove leading and trailing whitespace
 		// to be able to reliably check for security
 		// headers
 

lib/private/Files/FileInfo.php

Spacing +3 added lines, -3 removed lines

@@ -151,7 +151,7 @@ 
 	 * @return int|null
 	 */
 	public function getId() {
-		return isset($this->data['fileid']) ? (int)  $this->data['fileid'] : null;
+		return isset($this->data['fileid']) ? (int) $this->data['fileid'] : null;
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	public function getEtag() {
 		$this->updateEntryfromSubMounts();
 		if (count($this->childEtags) > 0) {
-			$combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
+			$combinedEtag = $this->data['etag'].'::'.implode('::', $this->childEtags);
 			return md5($combinedEtag);
 		} else {
 			return $this->data['etag'];
@@ -377,7 +377,7 @@ 
 			$relativeEntryPath = substr($entryPath, strlen($this->getPath()));
 			// attach the permissions to propagate etag on permision changes of submounts
 			$permissions = isset($data['permissions']) ? $data['permissions'] : 0;
-			$this->childEtags[] = $relativeEntryPath . '/' . $data['etag'] . $permissions;
+			$this->childEtags[] = $relativeEntryPath.'/'.$data['etag'].$permissions;
 		}
 	}
 

Indentation +376 added lines, -376 removed lines

@@ -38,380 +38,380 @@
 use OCP\IUser;
 
 class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
-	/**
-	 * @var array $data
-	 */
-	private $data;
-
-	/**
-	 * @var string $path
-	 */
-	private $path;
-
-	/**
-	 * @var \OC\Files\Storage\Storage $storage
-	 */
-	private $storage;
-
-	/**
-	 * @var string $internalPath
-	 */
-	private $internalPath;
-
-	/**
-	 * @var \OCP\Files\Mount\IMountPoint
-	 */
-	private $mount;
-
-	/**
-	 * @var IUser
-	 */
-	private $owner;
-
-	/**
-	 * @var string[]
-	 */
-	private $childEtags = [];
-
-	/**
-	 * @var IMountPoint[]
-	 */
-	private $subMounts = [];
-
-	private $subMountsUsed = false;
-
-	/**
-	 * The size of the file/folder without any sub mount
-	 *
-	 * @var int
-	 */
-	private $rawSize = 0;
-
-	/**
-	 * @param string|boolean $path
-	 * @param Storage\Storage $storage
-	 * @param string $internalPath
-	 * @param array|ICacheEntry $data
-	 * @param \OCP\Files\Mount\IMountPoint $mount
-	 * @param \OCP\IUser|null $owner
-	 */
-	public function __construct($path, $storage, $internalPath, $data, $mount, $owner = null) {
-		$this->path = $path;
-		$this->storage = $storage;
-		$this->internalPath = $internalPath;
-		$this->data = $data;
-		$this->mount = $mount;
-		$this->owner = $owner;
-		$this->rawSize = $this->data['size'] ?? 0;
-	}
-
-	public function offsetSet($offset, $value) {
-		$this->data[$offset] = $value;
-	}
-
-	public function offsetExists($offset) {
-		return isset($this->data[$offset]);
-	}
-
-	public function offsetUnset($offset) {
-		unset($this->data[$offset]);
-	}
-
-	public function offsetGet($offset) {
-		if ($offset === 'type') {
-			return $this->getType();
-		} elseif ($offset === 'etag') {
-			return $this->getEtag();
-		} elseif ($offset === 'size') {
-			return $this->getSize();
-		} elseif ($offset === 'mtime') {
-			return $this->getMTime();
-		} elseif ($offset === 'permissions') {
-			return $this->getPermissions();
-		} elseif (isset($this->data[$offset])) {
-			return $this->data[$offset];
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPath() {
-		return $this->path;
-	}
-
-	/**
-	 * @return \OCP\Files\Storage
-	 */
-	public function getStorage() {
-		return $this->storage;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getInternalPath() {
-		return $this->internalPath;
-	}
-
-	/**
-	 * Get FileInfo ID or null in case of part file
-	 *
-	 * @return int|null
-	 */
-	public function getId() {
-		return isset($this->data['fileid']) ? (int)  $this->data['fileid'] : null;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMimetype() {
-		return $this->data['mimetype'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getMimePart() {
-		return $this->data['mimepart'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return isset($this->data['name']) ? $this->data['name'] : basename($this->getPath());
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEtag() {
-		$this->updateEntryfromSubMounts();
-		if (count($this->childEtags) > 0) {
-			$combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
-			return md5($combinedEtag);
-		} else {
-			return $this->data['etag'];
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getSize($includeMounts = true) {
-		if ($includeMounts) {
-			$this->updateEntryfromSubMounts();
-			return isset($this->data['size']) ? 0 + $this->data['size'] : 0;
-		} else {
-			return $this->rawSize;
-		}
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getMTime() {
-		$this->updateEntryfromSubMounts();
-		return (int) $this->data['mtime'];
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isEncrypted() {
-		return $this->data['encrypted'];
-	}
-
-	/**
-	 * Return the currently version used for the HMAC in the encryption app
-	 *
-	 * @return int
-	 */
-	public function getEncryptedVersion() {
-		return isset($this->data['encryptedVersion']) ? (int) $this->data['encryptedVersion'] : 1;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPermissions() {
-		$perms = (int) $this->data['permissions'];
-		if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) {
-			$perms = $perms & ~\OCP\Constants::PERMISSION_SHARE;
-		}
-		return (int) $perms;
-	}
-
-	/**
-	 * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
-	 */
-	public function getType() {
-		if (!isset($this->data['type'])) {
-			$this->data['type'] = ($this->getMimetype() === 'httpd/unix-directory') ? self::TYPE_FOLDER : self::TYPE_FILE;
-		}
-		return $this->data['type'];
-	}
-
-	public function getData() {
-		return $this->data;
-	}
-
-	/**
-	 * @param int $permissions
-	 * @return bool
-	 */
-	protected function checkPermissions($permissions) {
-		return ($this->getPermissions() & $permissions) === $permissions;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isReadable() {
-		return $this->checkPermissions(\OCP\Constants::PERMISSION_READ);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isUpdateable() {
-		return $this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE);
-	}
-
-	/**
-	 * Check whether new files or folders can be created inside this folder
-	 *
-	 * @return bool
-	 */
-	public function isCreatable() {
-		return $this->checkPermissions(\OCP\Constants::PERMISSION_CREATE);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isDeletable() {
-		return $this->checkPermissions(\OCP\Constants::PERMISSION_DELETE);
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isShareable() {
-		return $this->checkPermissions(\OCP\Constants::PERMISSION_SHARE);
-	}
-
-	/**
-	 * Check if a file or folder is shared
-	 *
-	 * @return bool
-	 */
-	public function isShared() {
-		$sid = $this->getStorage()->getId();
-		if (!is_null($sid)) {
-			$sid = explode(':', $sid);
-			return ($sid[0] === 'shared');
-		}
-
-		return false;
-	}
-
-	public function isMounted() {
-		$storage = $this->getStorage();
-		if ($storage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
-			return false;
-		}
-		$sid = $storage->getId();
-		if (!is_null($sid)) {
-			$sid = explode(':', $sid);
-			return ($sid[0] !== 'home' and $sid[0] !== 'shared');
-		}
-
-		return false;
-	}
-
-	/**
-	 * Get the mountpoint the file belongs to
-	 *
-	 * @return \OCP\Files\Mount\IMountPoint
-	 */
-	public function getMountPoint() {
-		return $this->mount;
-	}
-
-	/**
-	 * Get the owner of the file
-	 *
-	 * @return \OCP\IUser
-	 */
-	public function getOwner() {
-		return $this->owner;
-	}
-
-	/**
-	 * @param IMountPoint[] $mounts
-	 */
-	public function setSubMounts(array $mounts) {
-		$this->subMounts = $mounts;
-	}
-
-	private function updateEntryfromSubMounts() {
-		if ($this->subMountsUsed) {
-			return;
-		}
-		$this->subMountsUsed = true;
-		foreach ($this->subMounts as $mount) {
-			$subStorage = $mount->getStorage();
-			if ($subStorage) {
-				$subCache = $subStorage->getCache('');
-				$rootEntry = $subCache->get('');
-				$this->addSubEntry($rootEntry, $mount->getMountPoint());
-			}
-		}
-	}
-
-	/**
-	 * Add a cache entry which is the child of this folder
-	 *
-	 * Sets the size, etag and size to for cross-storage childs
-	 *
-	 * @param array|ICacheEntry $data cache entry for the child
-	 * @param string $entryPath full path of the child entry
-	 */
-	public function addSubEntry($data, $entryPath) {
-		$this->data['size'] += isset($data['size']) ? $data['size'] : 0;
-		if (isset($data['mtime'])) {
-			$this->data['mtime'] = max($this->data['mtime'], $data['mtime']);
-		}
-		if (isset($data['etag'])) {
-			// prefix the etag with the relative path of the subentry to propagate etag on mount moves
-			$relativeEntryPath = substr($entryPath, strlen($this->getPath()));
-			// attach the permissions to propagate etag on permision changes of submounts
-			$permissions = isset($data['permissions']) ? $data['permissions'] : 0;
-			$this->childEtags[] = $relativeEntryPath . '/' . $data['etag'] . $permissions;
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getChecksum() {
-		return $this->data['checksum'];
-	}
-
-	public function getExtension(): string {
-		return pathinfo($this->getName(), PATHINFO_EXTENSION);
-	}
-
-	public function getCreationTime(): int {
-		return (int) $this->data['creation_time'];
-	}
-
-	public function getUploadTime(): int {
-		return (int) $this->data['upload_time'];
-	}
+    /**
+     * @var array $data
+     */
+    private $data;
+
+    /**
+     * @var string $path
+     */
+    private $path;
+
+    /**
+     * @var \OC\Files\Storage\Storage $storage
+     */
+    private $storage;
+
+    /**
+     * @var string $internalPath
+     */
+    private $internalPath;
+
+    /**
+     * @var \OCP\Files\Mount\IMountPoint
+     */
+    private $mount;
+
+    /**
+     * @var IUser
+     */
+    private $owner;
+
+    /**
+     * @var string[]
+     */
+    private $childEtags = [];
+
+    /**
+     * @var IMountPoint[]
+     */
+    private $subMounts = [];
+
+    private $subMountsUsed = false;
+
+    /**
+     * The size of the file/folder without any sub mount
+     *
+     * @var int
+     */
+    private $rawSize = 0;
+
+    /**
+     * @param string|boolean $path
+     * @param Storage\Storage $storage
+     * @param string $internalPath
+     * @param array|ICacheEntry $data
+     * @param \OCP\Files\Mount\IMountPoint $mount
+     * @param \OCP\IUser|null $owner
+     */
+    public function __construct($path, $storage, $internalPath, $data, $mount, $owner = null) {
+        $this->path = $path;
+        $this->storage = $storage;
+        $this->internalPath = $internalPath;
+        $this->data = $data;
+        $this->mount = $mount;
+        $this->owner = $owner;
+        $this->rawSize = $this->data['size'] ?? 0;
+    }
+
+    public function offsetSet($offset, $value) {
+        $this->data[$offset] = $value;
+    }
+
+    public function offsetExists($offset) {
+        return isset($this->data[$offset]);
+    }
+
+    public function offsetUnset($offset) {
+        unset($this->data[$offset]);
+    }
+
+    public function offsetGet($offset) {
+        if ($offset === 'type') {
+            return $this->getType();
+        } elseif ($offset === 'etag') {
+            return $this->getEtag();
+        } elseif ($offset === 'size') {
+            return $this->getSize();
+        } elseif ($offset === 'mtime') {
+            return $this->getMTime();
+        } elseif ($offset === 'permissions') {
+            return $this->getPermissions();
+        } elseif (isset($this->data[$offset])) {
+            return $this->data[$offset];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getPath() {
+        return $this->path;
+    }
+
+    /**
+     * @return \OCP\Files\Storage
+     */
+    public function getStorage() {
+        return $this->storage;
+    }
+
+    /**
+     * @return string
+     */
+    public function getInternalPath() {
+        return $this->internalPath;
+    }
+
+    /**
+     * Get FileInfo ID or null in case of part file
+     *
+     * @return int|null
+     */
+    public function getId() {
+        return isset($this->data['fileid']) ? (int)  $this->data['fileid'] : null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getMimetype() {
+        return $this->data['mimetype'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getMimePart() {
+        return $this->data['mimepart'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getName() {
+        return isset($this->data['name']) ? $this->data['name'] : basename($this->getPath());
+    }
+
+    /**
+     * @return string
+     */
+    public function getEtag() {
+        $this->updateEntryfromSubMounts();
+        if (count($this->childEtags) > 0) {
+            $combinedEtag = $this->data['etag'] . '::' . implode('::', $this->childEtags);
+            return md5($combinedEtag);
+        } else {
+            return $this->data['etag'];
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getSize($includeMounts = true) {
+        if ($includeMounts) {
+            $this->updateEntryfromSubMounts();
+            return isset($this->data['size']) ? 0 + $this->data['size'] : 0;
+        } else {
+            return $this->rawSize;
+        }
+    }
+
+    /**
+     * @return int
+     */
+    public function getMTime() {
+        $this->updateEntryfromSubMounts();
+        return (int) $this->data['mtime'];
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEncrypted() {
+        return $this->data['encrypted'];
+    }
+
+    /**
+     * Return the currently version used for the HMAC in the encryption app
+     *
+     * @return int
+     */
+    public function getEncryptedVersion() {
+        return isset($this->data['encryptedVersion']) ? (int) $this->data['encryptedVersion'] : 1;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPermissions() {
+        $perms = (int) $this->data['permissions'];
+        if (\OCP\Util::isSharingDisabledForUser() || ($this->isShared() && !\OC\Share\Share::isResharingAllowed())) {
+            $perms = $perms & ~\OCP\Constants::PERMISSION_SHARE;
+        }
+        return (int) $perms;
+    }
+
+    /**
+     * @return string \OCP\Files\FileInfo::TYPE_FILE|\OCP\Files\FileInfo::TYPE_FOLDER
+     */
+    public function getType() {
+        if (!isset($this->data['type'])) {
+            $this->data['type'] = ($this->getMimetype() === 'httpd/unix-directory') ? self::TYPE_FOLDER : self::TYPE_FILE;
+        }
+        return $this->data['type'];
+    }
+
+    public function getData() {
+        return $this->data;
+    }
+
+    /**
+     * @param int $permissions
+     * @return bool
+     */
+    protected function checkPermissions($permissions) {
+        return ($this->getPermissions() & $permissions) === $permissions;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isReadable() {
+        return $this->checkPermissions(\OCP\Constants::PERMISSION_READ);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isUpdateable() {
+        return $this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE);
+    }
+
+    /**
+     * Check whether new files or folders can be created inside this folder
+     *
+     * @return bool
+     */
+    public function isCreatable() {
+        return $this->checkPermissions(\OCP\Constants::PERMISSION_CREATE);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isDeletable() {
+        return $this->checkPermissions(\OCP\Constants::PERMISSION_DELETE);
+    }
+
+    /**
+     * @return bool
+     */
+    public function isShareable() {
+        return $this->checkPermissions(\OCP\Constants::PERMISSION_SHARE);
+    }
+
+    /**
+     * Check if a file or folder is shared
+     *
+     * @return bool
+     */
+    public function isShared() {
+        $sid = $this->getStorage()->getId();
+        if (!is_null($sid)) {
+            $sid = explode(':', $sid);
+            return ($sid[0] === 'shared');
+        }
+
+        return false;
+    }
+
+    public function isMounted() {
+        $storage = $this->getStorage();
+        if ($storage->instanceOfStorage('\OCP\Files\IHomeStorage')) {
+            return false;
+        }
+        $sid = $storage->getId();
+        if (!is_null($sid)) {
+            $sid = explode(':', $sid);
+            return ($sid[0] !== 'home' and $sid[0] !== 'shared');
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the mountpoint the file belongs to
+     *
+     * @return \OCP\Files\Mount\IMountPoint
+     */
+    public function getMountPoint() {
+        return $this->mount;
+    }
+
+    /**
+     * Get the owner of the file
+     *
+     * @return \OCP\IUser
+     */
+    public function getOwner() {
+        return $this->owner;
+    }
+
+    /**
+     * @param IMountPoint[] $mounts
+     */
+    public function setSubMounts(array $mounts) {
+        $this->subMounts = $mounts;
+    }
+
+    private function updateEntryfromSubMounts() {
+        if ($this->subMountsUsed) {
+            return;
+        }
+        $this->subMountsUsed = true;
+        foreach ($this->subMounts as $mount) {
+            $subStorage = $mount->getStorage();
+            if ($subStorage) {
+                $subCache = $subStorage->getCache('');
+                $rootEntry = $subCache->get('');
+                $this->addSubEntry($rootEntry, $mount->getMountPoint());
+            }
+        }
+    }
+
+    /**
+     * Add a cache entry which is the child of this folder
+     *
+     * Sets the size, etag and size to for cross-storage childs
+     *
+     * @param array|ICacheEntry $data cache entry for the child
+     * @param string $entryPath full path of the child entry
+     */
+    public function addSubEntry($data, $entryPath) {
+        $this->data['size'] += isset($data['size']) ? $data['size'] : 0;
+        if (isset($data['mtime'])) {
+            $this->data['mtime'] = max($this->data['mtime'], $data['mtime']);
+        }
+        if (isset($data['etag'])) {
+            // prefix the etag with the relative path of the subentry to propagate etag on mount moves
+            $relativeEntryPath = substr($entryPath, strlen($this->getPath()));
+            // attach the permissions to propagate etag on permision changes of submounts
+            $permissions = isset($data['permissions']) ? $data['permissions'] : 0;
+            $this->childEtags[] = $relativeEntryPath . '/' . $data['etag'] . $permissions;
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getChecksum() {
+        return $this->data['checksum'];
+    }
+
+    public function getExtension(): string {
+        return pathinfo($this->getName(), PATHINFO_EXTENSION);
+    }
+
+    public function getCreationTime(): int {
+        return (int) $this->data['creation_time'];
+    }
+
+    public function getUploadTime(): int {
+        return (int) $this->data['upload_time'];
+    }
 }

lib/private/Files/Storage/CommonTest.php

Indentation +47 added lines, -47 removed lines

@@ -33,53 +33,53 @@
 namespace OC\Files\Storage;
 
 class CommonTest extends \OC\Files\Storage\Common {
-	/**
-	 * underlying local storage used for missing functions
-	 * @var \OC\Files\Storage\Local
-	 */
-	private $storage;
+    /**
+     * underlying local storage used for missing functions
+     * @var \OC\Files\Storage\Local
+     */
+    private $storage;
 
-	public function __construct($params) {
-		$this->storage = new \OC\Files\Storage\Local($params);
-	}
+    public function __construct($params) {
+        $this->storage = new \OC\Files\Storage\Local($params);
+    }
 
-	public function getId() {
-		return 'test::'.$this->storage->getId();
-	}
-	public function mkdir($path) {
-		return $this->storage->mkdir($path);
-	}
-	public function rmdir($path) {
-		return $this->storage->rmdir($path);
-	}
-	public function opendir($path) {
-		return $this->storage->opendir($path);
-	}
-	public function stat($path) {
-		return $this->storage->stat($path);
-	}
-	public function filetype($path) {
-		return @$this->storage->filetype($path);
-	}
-	public function isReadable($path) {
-		return $this->storage->isReadable($path);
-	}
-	public function isUpdatable($path) {
-		return $this->storage->isUpdatable($path);
-	}
-	public function file_exists($path) {
-		return $this->storage->file_exists($path);
-	}
-	public function unlink($path) {
-		return $this->storage->unlink($path);
-	}
-	public function fopen($path, $mode) {
-		return $this->storage->fopen($path, $mode);
-	}
-	public function free_space($path) {
-		return $this->storage->free_space($path);
-	}
-	public function touch($path, $mtime = null) {
-		return $this->storage->touch($path, $mtime);
-	}
+    public function getId() {
+        return 'test::'.$this->storage->getId();
+    }
+    public function mkdir($path) {
+        return $this->storage->mkdir($path);
+    }
+    public function rmdir($path) {
+        return $this->storage->rmdir($path);
+    }
+    public function opendir($path) {
+        return $this->storage->opendir($path);
+    }
+    public function stat($path) {
+        return $this->storage->stat($path);
+    }
+    public function filetype($path) {
+        return @$this->storage->filetype($path);
+    }
+    public function isReadable($path) {
+        return $this->storage->isReadable($path);
+    }
+    public function isUpdatable($path) {
+        return $this->storage->isUpdatable($path);
+    }
+    public function file_exists($path) {
+        return $this->storage->file_exists($path);
+    }
+    public function unlink($path) {
+        return $this->storage->unlink($path);
+    }
+    public function fopen($path, $mode) {
+        return $this->storage->fopen($path, $mode);
+    }
+    public function free_space($path) {
+        return $this->storage->free_space($path);
+    }
+    public function touch($path, $mtime = null) {
+        return $this->storage->touch($path, $mtime);
+    }
 }

lib/private/Files/Storage/Temporary.php

Indentation +13 added lines, -13 removed lines

@@ -29,20 +29,20 @@
  * local storage backend in temporary folder for testing purpose
  */
 class Temporary extends Local {
-	public function __construct($arguments = null) {
-		parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
-	}
+    public function __construct($arguments = null) {
+        parent::__construct(['datadir' => \OC::$server->getTempManager()->getTemporaryFolder()]);
+    }
 
-	public function cleanUp() {
-		\OC_Helper::rmdirr($this->datadir);
-	}
+    public function cleanUp() {
+        \OC_Helper::rmdirr($this->datadir);
+    }
 
-	public function __destruct() {
-		parent::__destruct();
-		$this->cleanUp();
-	}
+    public function __destruct() {
+        parent::__destruct();
+        $this->cleanUp();
+    }
 
-	public function getDataDir() {
-		return $this->datadir;
-	}
+    public function getDataDir() {
+        return $this->datadir;
+    }
 }

lib/private/Files/Storage/Home.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	public function __construct($arguments) {
 		$this->user = $arguments['user'];
 		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+		$this->id = 'home::'.$this->user->getUID();
 
 		parent::__construct(['datadir' => $datadir]);
 	}

Indentation +67 added lines, -67 removed lines

@@ -33,80 +33,80 @@
  * Specialized version of Local storage for home directory usage
  */
 class Home extends Local implements \OCP\Files\IHomeStorage {
-	/**
-	 * @var string
-	 */
-	protected $id;
+    /**
+     * @var string
+     */
+    protected $id;
 
-	/**
-	 * @var \OC\User\User $user
-	 */
-	protected $user;
+    /**
+     * @var \OC\User\User $user
+     */
+    protected $user;
 
-	/**
-	 * Construct a Home storage instance
-	 *
-	 * @param array $arguments array with "user" containing the
-	 * storage owner
-	 */
-	public function __construct($arguments) {
-		$this->user = $arguments['user'];
-		$datadir = $this->user->getHome();
-		$this->id = 'home::' . $this->user->getUID();
+    /**
+     * Construct a Home storage instance
+     *
+     * @param array $arguments array with "user" containing the
+     * storage owner
+     */
+    public function __construct($arguments) {
+        $this->user = $arguments['user'];
+        $datadir = $this->user->getHome();
+        $this->id = 'home::' . $this->user->getUID();
 
-		parent::__construct(['datadir' => $datadir]);
-	}
+        parent::__construct(['datadir' => $datadir]);
+    }
 
-	public function getId() {
-		return $this->id;
-	}
+    public function getId() {
+        return $this->id;
+    }
 
-	/**
-	 * @return \OC\Files\Cache\HomeCache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->cache)) {
-			$this->cache = new \OC\Files\Cache\HomeCache($storage);
-		}
-		return $this->cache;
-	}
+    /**
+     * @return \OC\Files\Cache\HomeCache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->cache)) {
+            $this->cache = new \OC\Files\Cache\HomeCache($storage);
+        }
+        return $this->cache;
+    }
 
-	/**
-	 * get a propagator instance for the cache
-	 *
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
-	 * @return \OC\Files\Cache\Propagator
-	 */
-	public function getPropagator($storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		if (!isset($this->propagator)) {
-			$this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
-		}
-		return $this->propagator;
-	}
+    /**
+     * get a propagator instance for the cache
+     *
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+     * @return \OC\Files\Cache\Propagator
+     */
+    public function getPropagator($storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        if (!isset($this->propagator)) {
+            $this->propagator = new HomePropagator($storage, \OC::$server->getDatabaseConnection());
+        }
+        return $this->propagator;
+    }
 
 
-	/**
-	 * Returns the owner of this home storage
-	 *
-	 * @return \OC\User\User owner of this home storage
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * Returns the owner of this home storage
+     *
+     * @return \OC\User\User owner of this home storage
+     */
+    public function getUser() {
+        return $this->user;
+    }
 
-	/**
-	 * get the owner of a path
-	 *
-	 * @param string $path The path to get the owner
-	 * @return string uid or false
-	 */
-	public function getOwner($path) {
-		return $this->user->getUID();
-	}
+    /**
+     * get the owner of a path
+     *
+     * @param string $path The path to get the owner
+     * @return string uid or false
+     */
+    public function getOwner($path) {
+        return $this->user->getUID();
+    }
 }

lib/private/Files/SimpleFS/SimpleFolder.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	public function getDirectoryListing() {
 		$listing = $this->folder->getDirectoryListing();
 
-		$fileListing = array_map(function (Node $file) {
+		$fileListing = array_map(function(Node $file) {
 			if ($file instanceof File) {
 				return new SimpleFile($file);
 			}

Indentation +58 added lines, -58 removed lines

@@ -32,62 +32,62 @@
 
 class SimpleFolder implements ISimpleFolder {
 
-	/** @var Folder */
-	private $folder;
-
-	/**
-	 * Folder constructor.
-	 *
-	 * @param Folder $folder
-	 */
-	public function __construct(Folder $folder) {
-		$this->folder = $folder;
-	}
-
-	public function getName() {
-		return $this->folder->getName();
-	}
-
-	public function getDirectoryListing() {
-		$listing = $this->folder->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $file) {
-			if ($file instanceof File) {
-				return new SimpleFile($file);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function delete() {
-		$this->folder->delete();
-	}
-
-	public function fileExists($name) {
-		return $this->folder->nodeExists($name);
-	}
-
-	public function getFile($name) {
-		$file = $this->folder->get($name);
-
-		if (!($file instanceof File)) {
-			throw new NotFoundException();
-		}
-
-		return new SimpleFile($file);
-	}
-
-	public function newFile($name, $content = null) {
-		if ($content === null) {
-			// delay creating the file until it's written to
-			return new NewSimpleFile($this->folder, $name);
-		} else {
-			$file = $this->folder->newFile($name, $content);
-			return new SimpleFile($file);
-		}
-	}
+    /** @var Folder */
+    private $folder;
+
+    /**
+     * Folder constructor.
+     *
+     * @param Folder $folder
+     */
+    public function __construct(Folder $folder) {
+        $this->folder = $folder;
+    }
+
+    public function getName() {
+        return $this->folder->getName();
+    }
+
+    public function getDirectoryListing() {
+        $listing = $this->folder->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $file) {
+            if ($file instanceof File) {
+                return new SimpleFile($file);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function delete() {
+        $this->folder->delete();
+    }
+
+    public function fileExists($name) {
+        return $this->folder->nodeExists($name);
+    }
+
+    public function getFile($name) {
+        $file = $this->folder->get($name);
+
+        if (!($file instanceof File)) {
+            throw new NotFoundException();
+        }
+
+        return new SimpleFile($file);
+    }
+
+    public function newFile($name, $content = null) {
+        if ($content === null) {
+            // delay creating the file until it's written to
+            return new NewSimpleFile($this->folder, $name);
+        } else {
+            $file = $this->folder->newFile($name, $content);
+            return new SimpleFile($file);
+        }
+    }
 }