Completed
Pull Request — master (#8474)
by Joas
45:16 queued 27:28
created
lib/private/Files/Storage/Temporary.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 /**
29 29
  * local storage backend in temporary folder for testing purpose
30 30
  */
31
-class Temporary extends Local{
31
+class Temporary extends Local {
32 32
 	public function __construct($arguments = null) {
33 33
 		parent::__construct(array('datadir' => \OC::$server->getTempManager()->getTemporaryFolder()));
34 34
 	}
Please login to merge, or discard this patch.
lib/private/Files/Storage/Common.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 			$this->mkdir($path2);
217 217
 			while ($file = readdir($dir)) {
218 218
 				if (!Filesystem::isIgnoredDir($file)) {
219
-					if (!$this->copy($path1 . '/' . $file, $path2 . '/' . $file)) {
219
+					if (!$this->copy($path1.'/'.$file, $path2.'/'.$file)) {
220 220
 						return false;
221 221
 					}
222 222
 				}
@@ -267,12 +267,12 @@  discard block
 block discarded – undo
267 267
 		if (is_resource($dh)) {
268 268
 			while (($file = readdir($dh)) !== false) {
269 269
 				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
270
-					if ($this->is_dir($path . '/' . $file)) {
271
-						mkdir($target . '/' . $file);
272
-						$this->addLocalFolder($path . '/' . $file, $target . '/' . $file);
270
+					if ($this->is_dir($path.'/'.$file)) {
271
+						mkdir($target.'/'.$file);
272
+						$this->addLocalFolder($path.'/'.$file, $target.'/'.$file);
273 273
 					} else {
274
-						$tmp = $this->toTmpFile($path . '/' . $file);
275
-						rename($tmp, $target . '/' . $file);
274
+						$tmp = $this->toTmpFile($path.'/'.$file);
275
+						rename($tmp, $target.'/'.$file);
276 276
 					}
277 277
 				}
278 278
 			}
@@ -291,10 +291,10 @@  discard block
 block discarded – undo
291 291
 			while (($item = readdir($dh)) !== false) {
292 292
 				if (\OC\Files\Filesystem::isIgnoredDir($item)) continue;
293 293
 				if (strstr(strtolower($item), strtolower($query)) !== false) {
294
-					$files[] = $dir . '/' . $item;
294
+					$files[] = $dir.'/'.$item;
295 295
 				}
296
-				if ($this->is_dir($dir . '/' . $item)) {
297
-					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
296
+				if ($this->is_dir($dir.'/'.$item)) {
297
+					$files = array_merge($files, $this->searchInDir($query, $dir.'/'.$item));
298 298
 				}
299 299
 			}
300 300
 		}
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 		if (!isset($this->watcher)) {
346 346
 			$this->watcher = new Watcher($storage);
347 347
 			$globalPolicy = \OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_NEVER);
348
-			$this->watcher->setPolicy((int)$this->getMountOption('filesystem_check_changes', $globalPolicy));
348
+			$this->watcher->setPolicy((int) $this->getMountOption('filesystem_check_changes', $globalPolicy));
349 349
 		}
350 350
 		return $this->watcher;
351 351
 	}
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	public function cleanPath($path) {
421 421
 		if (strlen($path) == 0 or $path[0] != '/') {
422
-			$path = '/' . $path;
422
+			$path = '/'.$path;
423 423
 		}
424 424
 
425 425
 		$output = array();
@@ -595,7 +595,7 @@  discard block
 block discarded – undo
595 595
 			if (is_resource($dh)) {
596 596
 				while ($result and ($file = readdir($dh)) !== false) {
597 597
 					if (!Filesystem::isIgnoredDir($file)) {
598
-						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath . '/' . $file, $targetInternalPath . '/' . $file);
598
+						$result &= $this->copyFromStorage($sourceStorage, $sourceInternalPath.'/'.$file, $targetInternalPath.'/'.$file);
599 599
 					}
600 600
 				}
601 601
 			}
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 				$this->getCache()->remove($targetInternalPath);
622 622
 			}
623 623
 		}
624
-		return (bool)$result;
624
+		return (bool) $result;
625 625
 	}
626 626
 
627 627
 	/**
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
 			);
702 702
 		}
703 703
 		try {
704
-			$provider->acquireLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
704
+			$provider->acquireLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
705 705
 		} catch (LockedException $e) {
706 706
 			if ($logger) {
707 707
 				$logger->logException($e);
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 			);
734 734
 		}
735 735
 		try {
736
-			$provider->releaseLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
736
+			$provider->releaseLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
737 737
 		} catch (LockedException $e) {
738 738
 			if ($logger) {
739 739
 				$logger->logException($e);
@@ -765,7 +765,7 @@  discard block
 block discarded – undo
765 765
 			);
766 766
 		}
767 767
 		try {
768
-			$provider->changeLock('files/' . md5($this->getId() . '::' . trim($path, '/')), $type);
768
+			$provider->changeLock('files/'.md5($this->getId().'::'.trim($path, '/')), $type);
769 769
 		} catch (LockedException $e) {
770 770
 			if ($logger) {
771 771
 				$logger->logException($e);
Please login to merge, or discard this patch.
lib/private/Files/Storage/StorageFactory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -90,11 +90,11 @@
 block discarded – undo
90 90
 	 */
91 91
 	public function wrap(IMountPoint $mountPoint, $storage) {
92 92
 		$wrappers = array_values($this->storageWrappers);
93
-		usort($wrappers, function ($a, $b) {
93
+		usort($wrappers, function($a, $b) {
94 94
 			return $b['priority'] - $a['priority'];
95 95
 		});
96 96
 		/** @var callable[] $wrappers */
97
-		$wrappers = array_map(function ($wrapper) {
97
+		$wrappers = array_map(function($wrapper) {
98 98
 			return $wrapper['wrapper'];
99 99
 		}, $wrappers);
100 100
 		foreach ($wrappers as $wrapper) {
Please login to merge, or discard this patch.
lib/private/Files/Storage/PolyFill/CopyDirectory.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,11 +89,11 @@
 block discarded – undo
89 89
 		$result = true;
90 90
 		while ($file = readdir($dh)) {
91 91
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
92
-				if ($this->is_dir($source . '/' . $file)) {
93
-					$this->mkdir($target . '/' . $file);
94
-					$result = $this->copyRecursive($source . '/' . $file, $target . '/' . $file);
92
+				if ($this->is_dir($source.'/'.$file)) {
93
+					$this->mkdir($target.'/'.$file);
94
+					$result = $this->copyRecursive($source.'/'.$file, $target.'/'.$file);
95 95
 				} else {
96
-					$result = parent::copy($source . '/' . $file, $target . '/' . $file);
96
+					$result = parent::copy($source.'/'.$file, $target.'/'.$file);
97 97
 				}
98 98
 				if (!$result) {
99 99
 					break;
Please login to merge, or discard this patch.
lib/private/Files/Storage/Flysystem.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	}
57 57
 
58 58
 	protected function buildPath($path) {
59
-		$fullPath = \OC\Files\Filesystem::normalizePath($this->root . '/' . $path);
59
+		$fullPath = \OC\Files\Filesystem::normalizePath($this->root.'/'.$path);
60 60
 		return ltrim($fullPath, '/');
61 61
 	}
62 62
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		} catch (FileNotFoundException $e) {
164 164
 			return false;
165 165
 		}
166
-		$names = array_map(function ($object) {
166
+		$names = array_map(function($object) {
167 167
 			return $object['basename'];
168 168
 		}, $content);
169 169
 		return IteratorDirectory::wrap($names);
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 					$tmpFile = \OCP\Files::tmpFile();
210 210
 				}
211 211
 				$source = fopen($tmpFile, $mode);
212
-				return CallbackWrapper::wrap($source, null, null, function () use ($tmpFile, $fullPath) {
212
+				return CallbackWrapper::wrap($source, null, null, function() use ($tmpFile, $fullPath) {
213 213
 					$this->flysystem->putStream($fullPath, fopen($tmpFile, 'r'));
214 214
 					unlink($tmpFile);
215 215
 				});
Please login to merge, or discard this patch.
lib/private/Files/Storage/CommonTest.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 namespace OC\Files\Storage;
34 34
 
35
-class CommonTest extends \OC\Files\Storage\Common{
35
+class CommonTest extends \OC\Files\Storage\Common {
36 36
 	/**
37 37
 	 * underlying local storage used for missing functions
38 38
 	 * @var \OC\Files\Storage\Local
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 	private $storage;
41 41
 
42 42
 	public function __construct($params) {
43
-		$this->storage=new \OC\Files\Storage\Local($params);
43
+		$this->storage = new \OC\Files\Storage\Local($params);
44 44
 	}
45 45
 
46
-	public function getId(){
46
+	public function getId() {
47 47
 		return 'test::'.$this->storage->getId();
48 48
 	}
49 49
 	public function mkdir($path) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	public function free_space($path) {
80 80
 		return $this->storage->free_space($path);
81 81
 	}
82
-	public function touch($path, $mtime=null) {
82
+	public function touch($path, $mtime = null) {
83 83
 		return $this->storage->touch($path, $mtime);
84 84
 	}
85 85
 }
Please login to merge, or discard this patch.
lib/private/Files/Cache/CacheEntry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 	}
59 59
 
60 60
 	public function getId() {
61
-		return (int)$this->data['fileid'];
61
+		return (int) $this->data['fileid'];
62 62
 	}
63 63
 
64 64
 	public function getStorageId() {
Please login to merge, or discard this patch.
lib/private/Files/Cache/HomeCache.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,8 +51,8 @@
 block discarded – undo
51 51
 		}
52 52
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
53 53
 			$id = $entry['fileid'];
54
-			$sql = 'SELECT SUM(`size`) AS f1 ' .
55
-			   'FROM `*PREFIX*filecache` ' .
54
+			$sql = 'SELECT SUM(`size`) AS f1 '.
55
+			   'FROM `*PREFIX*filecache` '.
56 56
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
57 57
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
58 58
 			if ($row = $result->fetchRow()) {
Please login to merge, or discard this patch.
lib/private/Files/Cache/MoveFromCacheTrait.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 		if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
68 68
 			$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
69 69
 			foreach ($folderContent as $subEntry) {
70
-				$subTargetPath = $targetPath . '/' . $subEntry->getName();
70
+				$subTargetPath = $targetPath.'/'.$subEntry->getName();
71 71
 				$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
72 72
 			}
73 73
 		}
Please login to merge, or discard this patch.