Completed
Pull Request — master (#7858)
by Robin
40:27 queued 22:40
created
lib/private/Files/Storage/Home.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 	public function __construct($arguments) {
53 53
 		$this->user = $arguments['user'];
54 54
 		$datadir = $this->user->getHome();
55
-		$this->id = 'home::' . $this->user->getUID();
55
+		$this->id = 'home::'.$this->user->getUID();
56 56
 
57 57
 		try {
58 58
 			parent::__construct(array('datadir' => $datadir));
Please login to merge, or discard this patch.
lib/private/Files/Storage/Local.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
 		} else {
68 68
 			$realPath = realpath($this->datadir);
69 69
 			if (!$realPath) {
70
-				throw new NotFoundException('Data directory not found: ' . $this->datadir);
70
+				throw new NotFoundException('Data directory not found: '.$this->datadir);
71 71
 			}
72
-			$this->realDataDir = rtrim($realPath, '/') . '/';
72
+			$this->realDataDir = rtrim($realPath, '/').'/';
73 73
 		}
74 74
 		if (substr($this->datadir, -1) !== '/') {
75 75
 			$this->datadir .= '/';
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	}
82 82
 
83 83
 	public function getId() {
84
-		return 'local::' . $this->datadir;
84
+		return 'local::'.$this->datadir;
85 85
 	}
86 86
 
87 87
 	public function mkdir($path) {
@@ -239,17 +239,17 @@  discard block
 block discarded – undo
239 239
 		$dstParent = dirname($path2);
240 240
 
241 241
 		if (!$this->isUpdatable($srcParent)) {
242
-			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : ' . $srcParent, \OCP\Util::ERROR);
242
+			\OCP\Util::writeLog('core', 'unable to rename, source directory is not writable : '.$srcParent, \OCP\Util::ERROR);
243 243
 			return false;
244 244
 		}
245 245
 
246 246
 		if (!$this->isUpdatable($dstParent)) {
247
-			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : ' . $dstParent, \OCP\Util::ERROR);
247
+			\OCP\Util::writeLog('core', 'unable to rename, destination directory is not writable : '.$dstParent, \OCP\Util::ERROR);
248 248
 			return false;
249 249
 		}
250 250
 
251 251
 		if (!$this->file_exists($path1)) {
252
-			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : ' . $path1, \OCP\Util::ERROR);
252
+			\OCP\Util::writeLog('core', 'unable to rename, file does not exists : '.$path1, \OCP\Util::ERROR);
253 253
 			return false;
254 254
 		}
255 255
 
@@ -330,13 +330,13 @@  discard block
 block discarded – undo
330 330
 		foreach (scandir($physicalDir) as $item) {
331 331
 			if (\OC\Files\Filesystem::isIgnoredDir($item))
332 332
 				continue;
333
-			$physicalItem = $physicalDir . '/' . $item;
333
+			$physicalItem = $physicalDir.'/'.$item;
334 334
 
335 335
 			if (strstr(strtolower($item), strtolower($query)) !== false) {
336
-				$files[] = $dir . '/' . $item;
336
+				$files[] = $dir.'/'.$item;
337 337
 			}
338 338
 			if (is_dir($physicalItem)) {
339
-				$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
339
+				$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
340 340
 			}
341 341
 		}
342 342
 		return $files;
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 	 * @throws ForbiddenException
366 366
 	 */
367 367
 	public function getSourcePath($path) {
368
-		$fullPath = $this->datadir . $path;
368
+		$fullPath = $this->datadir.$path;
369 369
 		$currentPath = $path;
370 370
 		if ($this->allowSymlinks || $currentPath === '') {
371 371
 			return $fullPath;
@@ -377,10 +377,10 @@  discard block
 block discarded – undo
377 377
 			if ($realPath === '' || $realPath === '.') {
378 378
 				return $fullPath;
379 379
 			}
380
-			$realPath = realpath($this->datadir . $currentPath);
380
+			$realPath = realpath($this->datadir.$currentPath);
381 381
 		}
382 382
 		if ($realPath) {
383
-			$realPath = $realPath . '/';
383
+			$realPath = $realPath.'/';
384 384
 		}
385 385
 		if (substr($realPath, 0, $this->dataDirLength) === $this->realDataDir) {
386 386
 			return $fullPath;
@@ -407,9 +407,9 @@  discard block
 block discarded – undo
407 407
 		if ($this->is_file($path)) {
408 408
 			$stat = $this->stat($path);
409 409
 			return md5(
410
-				$stat['mtime'] .
411
-				$stat['ino'] .
412
-				$stat['dev'] .
410
+				$stat['mtime'].
411
+				$stat['ino'].
412
+				$stat['dev'].
413 413
 				$stat['size']
414 414
 			);
415 415
 		} else {
Please login to merge, or discard this patch.