View GitHub Repository server

Schedule Inspection
Subscribe
Passed
Push — master ( 9d4e71...60ae0a )
by Roeland
10:19
created
Status
Category
Toggle Patches
apps/files_trashbin/lib/Trash/LegacyTrashBackend.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -52,8 +52,8 @@  discard block
 
 block discarded – undo
52 52 
 	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
53 53 
 		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
54 54 
 		$isRoot = $parent === null;
55 
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
56 
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
55 
+		return array_map(function(FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
56 
+			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation().'/'.$file->getName();
57 57 
 			if (!$originalLocation) {
58 58 
 				$originalLocation = $file->getName();
59 59 
 			}
 
@@ -61,7 +61,7 @@  discard block
 
 block discarded – undo
61 61 
 				$this,
62 62 
 				$originalLocation,
63 63 
 				$file->getMTime(),
64 
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
64 
+				$parentTrashPath.'/'.$file->getName().($isRoot ? '.d'.$file->getMtime() : ''),
65 65 
 				$file,
66 66 
 				$user
67 67 
 			);
 
@@ -76,7 +76,7 @@  discard block
 
 block discarded – undo
76 76 
 	public function listTrashFolder(ITrashItem $folder): array {
77 77 
 		$user = $folder->getUser();
78 78 
 		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
79 
-		return $this->mapTrashItems($entries, $user ,$folder);
79 
+		return $this->mapTrashItems($entries, $user, $folder);
80 80 
 	}
81 81
82 82 
 	public function restoreItem(ITrashItem $item) {
 
@@ -86,7 +86,7 @@  discard block
 
 block discarded – undo
86 86 
 	public function removeItem(ITrashItem $item) {
87 87 
 		$user = $item->getUser();
88 88 
 		if ($item->isRootItem()) {
89 
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
89 
+			$path = substr($item->getTrashPath(), 0, -strlen('.d'.$item->getDeletedTime()));
90 90 
 			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
91 91 
 		} else {
92 92 
 			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
 
@@ -98,7 +98,7 @@  discard block
 
 block discarded – undo
98 98 
 		if (!$storage instanceof Storage) {
99 99 
 			return false;
100 100 
 		}
101 
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
101 
+		$normalized = Filesystem::normalizePath($storage->getMountPoint().'/'.$internalPath, true, false, true);
102 102 
 		$view = Filesystem::getView();
103 103 
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
104 104 
 			$this->deletedFiles[$normalized] = $normalized;
Please login to merge, or discard this patch.