Inspection of "Merge pull request #11037 from nextcloud/trash-web..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a23d52...d867f9 )

by Morris

created 2018-09-28 14:03 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -58,14 +58,14 @@  discard block
 block discarded – undo
 	}
 
 	public function getChild($name): ITrash {
-		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
 
 		foreach ($entries as $entry) {
 			if ($entry->getName() === $name) {
 				if ($entry->getType() === FileInfo::TYPE_FOLDER) {
-					return new TrashFolderFolder($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation());
+					return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
 				}
-				return new TrashFolderFile($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation());
+				return new TrashFolderFile($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
 			}
 		}
 
@@ -73,9 +73,9 @@  discard block
 block discarded – undo
 	}
 
 	public function getChildren(): array {
-		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
 
-		$children = array_map(function (FileInfo $entry) {
+		$children = array_map(function(FileInfo $entry) {
 			if ($entry->getType() === FileInfo::TYPE_FOLDER) {
 				return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
 			}
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
 	}
 
 	public function childExists($name): bool {
-		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
+		$entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
 
 		foreach ($entries as $entry) {
 			if ($entry->getName() === $name) {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
 	}
 
 	public function delete() {
-		\OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
+		\OCA\Files_Trashbin\Trashbin::delete($this->root.'/'.$this->getName(), $this->userId, null);
 	}
 
 	public function setName($name) {
@@ -106,10 +106,10 @@  discard block
 block discarded – undo
 	}
 
 	public function restore(): bool {
-		return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
+		return \OCA\Files_Trashbin\Trashbin::restore($this->root.'/'.$this->getName(), $this->data->getName(), null);
 	}
 
 	public function getOriginalLocation(): string {
-		return $this->location . '/' . $this->getFilename();
+		return $this->location.'/'.$this->getFilename();
 	}
 }

Please login to merge, or discard this patch.

apps/files_trashbin/lib/Sabre/TrashFolderFile.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
 	}
 
 	public function delete() {
-		\OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
+		\OCA\Files_Trashbin\Trashbin::delete($this->root.'/'.$this->getName(), $this->userId, null);
 	}
 
 	public function setName($name) {
@@ -64,10 +64,10 @@  discard block
 block discarded – undo
 	}
 
 	public function restore(): bool {
-		return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
+		return \OCA\Files_Trashbin\Trashbin::restore($this->root.'/'.$this->getName(), $this->data->getName(), null);
 	}
 
 	public function getOriginalLocation(): string {
-		return $this->location . '/' . $this->getFilename();
+		return $this->location.'/'.$this->getFilename();
 	}
 }

Please login to merge, or discard this patch.

apps/files_trashbin/lib/Sabre/PropfindPlugin.php 1 patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -62,45 +62,45 @@
 block discarded – undo
 			return;
 		}
 
-		$propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_FILENAME, function() use ($node) {
 			return $node->getFilename();
 		});
 
-		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function() use ($node) {
 			return $node->getOriginalLocation();
 		});
 
-		$propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
+		$propFind->handle(self::TRASHBIN_DELETION_TIME, function() use ($node) {
 			return $node->getDeletionTime();
 		});
 
-		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function() use ($node) {
 			return $node->getSize();
 		});
 
-		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function() use ($node) {
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function() {
 			return 'GD'; // read + delete
 		});
 
-		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getLastModified();
 		});
 
-		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
 			// add fake etag, it is only needed to identify the preview image
 			return $node->getFileId();
 		});
 
-		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
+		$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
 			return $this->previewManager->isAvailable($node->getFileInfo());
 		});
 
-		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
+		$propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function() {
 			return '';
 		});
 	}

Please login to merge, or discard this patch.

apps/files_trashbin/composer/composer/autoload_static.php 1 patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

@@ -6,51 +6,51 @@
 block discarded – undo
 
 class ComposerStaticInitFiles_Trashbin
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Files_Trashbin\\' => 19,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Files_Trashbin\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\Files_Trashbin\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => __DIR__ . '/..' . '/../lib/BackgroundJob/ExpireTrash.php',
-        'OCA\\Files_Trashbin\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
-        'OCA\\Files_Trashbin\\Command\\CleanUp' => __DIR__ . '/..' . '/../lib/Command/CleanUp.php',
-        'OCA\\Files_Trashbin\\Command\\Expire' => __DIR__ . '/..' . '/../lib/Command/Expire.php',
-        'OCA\\Files_Trashbin\\Command\\ExpireTrash' => __DIR__ . '/..' . '/../lib/Command/ExpireTrash.php',
-        'OCA\\Files_Trashbin\\Controller\\PreviewController' => __DIR__ . '/..' . '/../lib/Controller/PreviewController.php',
-        'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/MoveToTrashEvent.php',
-        'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => __DIR__ . '/..' . '/../lib/Exceptions/CopyRecursiveException.php',
-        'OCA\\Files_Trashbin\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
-        'OCA\\Files_Trashbin\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
-        'OCA\\Files_Trashbin\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
-        'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => __DIR__ . '/..' . '/../lib/Sabre/AbstractTrash.php',
-        'OCA\\Files_Trashbin\\Sabre\\ITrash' => __DIR__ . '/..' . '/../lib/Sabre/ITrash.php',
-        'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => __DIR__ . '/..' . '/../lib/Sabre/PropfindPlugin.php',
-        'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
-        'OCA\\Files_Trashbin\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashFile' => __DIR__ . '/..' . '/../lib/Sabre/TrashFile.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolder.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolderFile.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolderFolder.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashHome' => __DIR__ . '/..' . '/../lib/Sabre/TrashHome.php',
-        'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => __DIR__ . '/..' . '/../lib/Sabre/TrashRoot.php',
-        'OCA\\Files_Trashbin\\Storage' => __DIR__ . '/..' . '/../lib/Storage.php',
-        'OCA\\Files_Trashbin\\Trashbin' => __DIR__ . '/..' . '/../lib/Trashbin.php',
+    public static $classMap = array(
+        'OCA\\Files_Trashbin\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => __DIR__.'/..'.'/../lib/BackgroundJob/ExpireTrash.php',
+        'OCA\\Files_Trashbin\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
+        'OCA\\Files_Trashbin\\Command\\CleanUp' => __DIR__.'/..'.'/../lib/Command/CleanUp.php',
+        'OCA\\Files_Trashbin\\Command\\Expire' => __DIR__.'/..'.'/../lib/Command/Expire.php',
+        'OCA\\Files_Trashbin\\Command\\ExpireTrash' => __DIR__.'/..'.'/../lib/Command/ExpireTrash.php',
+        'OCA\\Files_Trashbin\\Controller\\PreviewController' => __DIR__.'/..'.'/../lib/Controller/PreviewController.php',
+        'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => __DIR__.'/..'.'/../lib/Events/MoveToTrashEvent.php',
+        'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => __DIR__.'/..'.'/../lib/Exceptions/CopyRecursiveException.php',
+        'OCA\\Files_Trashbin\\Expiration' => __DIR__.'/..'.'/../lib/Expiration.php',
+        'OCA\\Files_Trashbin\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
+        'OCA\\Files_Trashbin\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
+        'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => __DIR__.'/..'.'/../lib/Sabre/AbstractTrash.php',
+        'OCA\\Files_Trashbin\\Sabre\\ITrash' => __DIR__.'/..'.'/../lib/Sabre/ITrash.php',
+        'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => __DIR__.'/..'.'/../lib/Sabre/PropfindPlugin.php',
+        'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => __DIR__.'/..'.'/../lib/Sabre/RestoreFolder.php',
+        'OCA\\Files_Trashbin\\Sabre\\RootCollection' => __DIR__.'/..'.'/../lib/Sabre/RootCollection.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashFile' => __DIR__.'/..'.'/../lib/Sabre/TrashFile.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => __DIR__.'/..'.'/../lib/Sabre/TrashFolder.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => __DIR__.'/..'.'/../lib/Sabre/TrashFolderFile.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => __DIR__.'/..'.'/../lib/Sabre/TrashFolderFolder.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashHome' => __DIR__.'/..'.'/../lib/Sabre/TrashHome.php',
+        'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => __DIR__.'/..'.'/../lib/Sabre/TrashRoot.php',
+        'OCA\\Files_Trashbin\\Storage' => __DIR__.'/..'.'/../lib/Storage.php',
+        'OCA\\Files_Trashbin\\Trashbin' => __DIR__.'/..'.'/../lib/Trashbin.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Trashbin::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFiles_Trashbin::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFiles_Trashbin::$classMap;

Please login to merge, or discard this patch.

apps/files_trashbin/composer/composer/autoload_classmap.php 1 patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch

@@ -6,29 +6,29 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files_Trashbin\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => $baseDir . '/../lib/BackgroundJob/ExpireTrash.php',
-    'OCA\\Files_Trashbin\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
-    'OCA\\Files_Trashbin\\Command\\CleanUp' => $baseDir . '/../lib/Command/CleanUp.php',
-    'OCA\\Files_Trashbin\\Command\\Expire' => $baseDir . '/../lib/Command/Expire.php',
-    'OCA\\Files_Trashbin\\Command\\ExpireTrash' => $baseDir . '/../lib/Command/ExpireTrash.php',
-    'OCA\\Files_Trashbin\\Controller\\PreviewController' => $baseDir . '/../lib/Controller/PreviewController.php',
-    'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => $baseDir . '/../lib/Events/MoveToTrashEvent.php',
-    'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => $baseDir . '/../lib/Exceptions/CopyRecursiveException.php',
-    'OCA\\Files_Trashbin\\Expiration' => $baseDir . '/../lib/Expiration.php',
-    'OCA\\Files_Trashbin\\Helper' => $baseDir . '/../lib/Helper.php',
-    'OCA\\Files_Trashbin\\Hooks' => $baseDir . '/../lib/Hooks.php',
-    'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => $baseDir . '/../lib/Sabre/AbstractTrash.php',
-    'OCA\\Files_Trashbin\\Sabre\\ITrash' => $baseDir . '/../lib/Sabre/ITrash.php',
-    'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => $baseDir . '/../lib/Sabre/PropfindPlugin.php',
-    'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
-    'OCA\\Files_Trashbin\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashFile' => $baseDir . '/../lib/Sabre/TrashFile.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => $baseDir . '/../lib/Sabre/TrashFolder.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => $baseDir . '/../lib/Sabre/TrashFolderFile.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => $baseDir . '/../lib/Sabre/TrashFolderFolder.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashHome' => $baseDir . '/../lib/Sabre/TrashHome.php',
-    'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => $baseDir . '/../lib/Sabre/TrashRoot.php',
-    'OCA\\Files_Trashbin\\Storage' => $baseDir . '/../lib/Storage.php',
-    'OCA\\Files_Trashbin\\Trashbin' => $baseDir . '/../lib/Trashbin.php',
+    'OCA\\Files_Trashbin\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => $baseDir.'/../lib/BackgroundJob/ExpireTrash.php',
+    'OCA\\Files_Trashbin\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
+    'OCA\\Files_Trashbin\\Command\\CleanUp' => $baseDir.'/../lib/Command/CleanUp.php',
+    'OCA\\Files_Trashbin\\Command\\Expire' => $baseDir.'/../lib/Command/Expire.php',
+    'OCA\\Files_Trashbin\\Command\\ExpireTrash' => $baseDir.'/../lib/Command/ExpireTrash.php',
+    'OCA\\Files_Trashbin\\Controller\\PreviewController' => $baseDir.'/../lib/Controller/PreviewController.php',
+    'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => $baseDir.'/../lib/Events/MoveToTrashEvent.php',
+    'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => $baseDir.'/../lib/Exceptions/CopyRecursiveException.php',
+    'OCA\\Files_Trashbin\\Expiration' => $baseDir.'/../lib/Expiration.php',
+    'OCA\\Files_Trashbin\\Helper' => $baseDir.'/../lib/Helper.php',
+    'OCA\\Files_Trashbin\\Hooks' => $baseDir.'/../lib/Hooks.php',
+    'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => $baseDir.'/../lib/Sabre/AbstractTrash.php',
+    'OCA\\Files_Trashbin\\Sabre\\ITrash' => $baseDir.'/../lib/Sabre/ITrash.php',
+    'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => $baseDir.'/../lib/Sabre/PropfindPlugin.php',
+    'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => $baseDir.'/../lib/Sabre/RestoreFolder.php',
+    'OCA\\Files_Trashbin\\Sabre\\RootCollection' => $baseDir.'/../lib/Sabre/RootCollection.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashFile' => $baseDir.'/../lib/Sabre/TrashFile.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => $baseDir.'/../lib/Sabre/TrashFolder.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => $baseDir.'/../lib/Sabre/TrashFolderFile.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => $baseDir.'/../lib/Sabre/TrashFolderFolder.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashHome' => $baseDir.'/../lib/Sabre/TrashHome.php',
+    'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => $baseDir.'/../lib/Sabre/TrashRoot.php',
+    'OCA\\Files_Trashbin\\Storage' => $baseDir.'/../lib/Storage.php',
+    'OCA\\Files_Trashbin\\Trashbin' => $baseDir.'/../lib/Trashbin.php',
 );

Please login to merge, or discard this patch.

		@@ -58,14 +58,14 @@ discard block
		block discarded – undo
58	58	}
59	59
60	60	public function getChild($name): ITrash {
61		- $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
	61	+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
62	62
63	63	foreach ($entries as $entry) {
64	64	if ($entry->getName() === $name) {
65	65	if ($entry->getType() === FileInfo::TYPE_FOLDER) {
66		- return new TrashFolderFolder($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation());
	66	+ return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
67	67	}
68		- return new TrashFolderFile($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation());
	68	+ return new TrashFolderFile($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
69	69	}
70	70	}
71	71
		@@ -73,9 +73,9 @@ discard block
		block discarded – undo
73	73	}
74	74
75	75	public function getChildren(): array {
76		- $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
	76	+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
77	77
78		- $children = array_map(function (FileInfo $entry) {
	78	+ $children = array_map(function(FileInfo $entry) {
79	79	if ($entry->getType() === FileInfo::TYPE_FOLDER) {
80	80	return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation());
81	81	}
		@@ -86,7 +86,7 @@ discard block
		block discarded – undo
86	86	}
87	87
88	88	public function childExists($name): bool {
89		- $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId);
	89	+ $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root.'/'.$this->getName(), $this->userId);
90	90
91	91	foreach ($entries as $entry) {
92	92	if ($entry->getName() === $name) {
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	}
99	99
100	100	public function delete() {
101		- \OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
	101	+ \OCA\Files_Trashbin\Trashbin::delete($this->root.'/'.$this->getName(), $this->userId, null);
102	102	}
103	103
104	104	public function setName($name) {
		@@ -106,10 +106,10 @@ discard block
		block discarded – undo
106	106	}
107	107
108	108	public function restore(): bool {
109		- return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
	109	+ return \OCA\Files_Trashbin\Trashbin::restore($this->root.'/'.$this->getName(), $this->data->getName(), null);
110	110	}
111	111
112	112	public function getOriginalLocation(): string {
113		- return $this->location . '/' . $this->getFilename();
	113	+ return $this->location.'/'.$this->getFilename();
114	114	}
115	115	}

		@@ -62,45 +62,45 @@
		block discarded – undo
62	62	return;
63	63	}
64	64
65		- $propFind->handle(self::TRASHBIN_FILENAME, function () use ($node) {
	65	+ $propFind->handle(self::TRASHBIN_FILENAME, function() use ($node) {
66	66	return $node->getFilename();
67	67	});
68	68
69		- $propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function () use ($node) {
	69	+ $propFind->handle(self::TRASHBIN_ORIGINAL_LOCATION, function() use ($node) {
70	70	return $node->getOriginalLocation();
71	71	});
72	72
73		- $propFind->handle(self::TRASHBIN_DELETION_TIME, function () use ($node) {
	73	+ $propFind->handle(self::TRASHBIN_DELETION_TIME, function() use ($node) {
74	74	return $node->getDeletionTime();
75	75	});
76	76
77		- $propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function () use ($node) {
	77	+ $propFind->handle(FilesPlugin::SIZE_PROPERTYNAME, function() use ($node) {
78	78	return $node->getSize();
79	79	});
80	80
81		- $propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function () use ($node) {
	81	+ $propFind->handle(FilesPlugin::FILEID_PROPERTYNAME, function() use ($node) {
82	82	return $node->getFileId();
83	83	});
84	84
85		- $propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function () {
	85	+ $propFind->handle(FilesPlugin::PERMISSIONS_PROPERTYNAME, function() {
86	86	return 'GD'; // read + delete
87	87	});
88	88
89		- $propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function () use ($node) {
	89	+ $propFind->handle(FilesPlugin::GETETAG_PROPERTYNAME, function() use ($node) {
90	90	// add fake etag, it is only needed to identify the preview image
91	91	return $node->getLastModified();
92	92	});
93	93
94		- $propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function () use ($node) {
	94	+ $propFind->handle(FilesPlugin::INTERNAL_FILEID_PROPERTYNAME, function() use ($node) {
95	95	// add fake etag, it is only needed to identify the preview image
96	96	return $node->getFileId();
97	97	});
98	98
99		- $propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
	99	+ $propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, function() use ($node) {
100	100	return $this->previewManager->isAvailable($node->getFileInfo());
101	101	});
102	102
103		- $propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function () {
	103	+ $propFind->handle(FilesPlugin::MOUNT_TYPE_PROPERTYNAME, function() {
104	104	return '';
105	105	});
106	106	}

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	}
57	57
58	58	public function delete() {
59		- \OCA\Files_Trashbin\Trashbin::delete($this->root . '/' . $this->getName(), $this->userId, null);
	59	+ \OCA\Files_Trashbin\Trashbin::delete($this->root.'/'.$this->getName(), $this->userId, null);
60	60	}
61	61
62	62	public function setName($name) {
		@@ -64,10 +64,10 @@ discard block
		block discarded – undo
64	64	}
65	65
66	66	public function restore(): bool {
67		- return \OCA\Files_Trashbin\Trashbin::restore($this->root . '/' . $this->getName(), $this->data->getName(), null);
	67	+ return \OCA\Files_Trashbin\Trashbin::restore($this->root.'/'.$this->getName(), $this->data->getName(), null);
68	68	}
69	69
70	70	public function getOriginalLocation(): string {
71		- return $this->location . '/' . $this->getFilename();
	71	+ return $this->location.'/'.$this->getFilename();
72	72	}
73	73	}

		@@ -6,51 +6,51 @@
		block discarded – undo
6	6
7	7	class ComposerStaticInitFiles_Trashbin
8	8	{
9		- public static $prefixLengthsPsr4 = array (
	9	+ public static $prefixLengthsPsr4 = array(
10	10	'O' =>
11		- array (
	11	+ array(
12	12	'OCA\\Files_Trashbin\\' => 19,
13	13	),
14	14	);
15	15
16		- public static $prefixDirsPsr4 = array (
	16	+ public static $prefixDirsPsr4 = array(
17	17	'OCA\\Files_Trashbin\\' =>
18		- array (
19		- 0 => __DIR__ . '/..' . '/../lib',
	18	+ array(
	19	+ 0 => __DIR__.'/..'.'/../lib',
20	20	),
21	21	);
22	22
23		- public static $classMap = array (
24		- 'OCA\\Files_Trashbin\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
25		- 'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => __DIR__ . '/..' . '/../lib/BackgroundJob/ExpireTrash.php',
26		- 'OCA\\Files_Trashbin\\Capabilities' => __DIR__ . '/..' . '/../lib/Capabilities.php',
27		- 'OCA\\Files_Trashbin\\Command\\CleanUp' => __DIR__ . '/..' . '/../lib/Command/CleanUp.php',
28		- 'OCA\\Files_Trashbin\\Command\\Expire' => __DIR__ . '/..' . '/../lib/Command/Expire.php',
29		- 'OCA\\Files_Trashbin\\Command\\ExpireTrash' => __DIR__ . '/..' . '/../lib/Command/ExpireTrash.php',
30		- 'OCA\\Files_Trashbin\\Controller\\PreviewController' => __DIR__ . '/..' . '/../lib/Controller/PreviewController.php',
31		- 'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/MoveToTrashEvent.php',
32		- 'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => __DIR__ . '/..' . '/../lib/Exceptions/CopyRecursiveException.php',
33		- 'OCA\\Files_Trashbin\\Expiration' => __DIR__ . '/..' . '/../lib/Expiration.php',
34		- 'OCA\\Files_Trashbin\\Helper' => __DIR__ . '/..' . '/../lib/Helper.php',
35		- 'OCA\\Files_Trashbin\\Hooks' => __DIR__ . '/..' . '/../lib/Hooks.php',
36		- 'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => __DIR__ . '/..' . '/../lib/Sabre/AbstractTrash.php',
37		- 'OCA\\Files_Trashbin\\Sabre\\ITrash' => __DIR__ . '/..' . '/../lib/Sabre/ITrash.php',
38		- 'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => __DIR__ . '/..' . '/../lib/Sabre/PropfindPlugin.php',
39		- 'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => __DIR__ . '/..' . '/../lib/Sabre/RestoreFolder.php',
40		- 'OCA\\Files_Trashbin\\Sabre\\RootCollection' => __DIR__ . '/..' . '/../lib/Sabre/RootCollection.php',
41		- 'OCA\\Files_Trashbin\\Sabre\\TrashFile' => __DIR__ . '/..' . '/../lib/Sabre/TrashFile.php',
42		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolder.php',
43		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolderFile.php',
44		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => __DIR__ . '/..' . '/../lib/Sabre/TrashFolderFolder.php',
45		- 'OCA\\Files_Trashbin\\Sabre\\TrashHome' => __DIR__ . '/..' . '/../lib/Sabre/TrashHome.php',
46		- 'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => __DIR__ . '/..' . '/../lib/Sabre/TrashRoot.php',
47		- 'OCA\\Files_Trashbin\\Storage' => __DIR__ . '/..' . '/../lib/Storage.php',
48		- 'OCA\\Files_Trashbin\\Trashbin' => __DIR__ . '/..' . '/../lib/Trashbin.php',
	23	+ public static $classMap = array(
	24	+ 'OCA\\Files_Trashbin\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
	25	+ 'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => __DIR__.'/..'.'/../lib/BackgroundJob/ExpireTrash.php',
	26	+ 'OCA\\Files_Trashbin\\Capabilities' => __DIR__.'/..'.'/../lib/Capabilities.php',
	27	+ 'OCA\\Files_Trashbin\\Command\\CleanUp' => __DIR__.'/..'.'/../lib/Command/CleanUp.php',
	28	+ 'OCA\\Files_Trashbin\\Command\\Expire' => __DIR__.'/..'.'/../lib/Command/Expire.php',
	29	+ 'OCA\\Files_Trashbin\\Command\\ExpireTrash' => __DIR__.'/..'.'/../lib/Command/ExpireTrash.php',
	30	+ 'OCA\\Files_Trashbin\\Controller\\PreviewController' => __DIR__.'/..'.'/../lib/Controller/PreviewController.php',
	31	+ 'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => __DIR__.'/..'.'/../lib/Events/MoveToTrashEvent.php',
	32	+ 'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => __DIR__.'/..'.'/../lib/Exceptions/CopyRecursiveException.php',
	33	+ 'OCA\\Files_Trashbin\\Expiration' => __DIR__.'/..'.'/../lib/Expiration.php',
	34	+ 'OCA\\Files_Trashbin\\Helper' => __DIR__.'/..'.'/../lib/Helper.php',
	35	+ 'OCA\\Files_Trashbin\\Hooks' => __DIR__.'/..'.'/../lib/Hooks.php',
	36	+ 'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => __DIR__.'/..'.'/../lib/Sabre/AbstractTrash.php',
	37	+ 'OCA\\Files_Trashbin\\Sabre\\ITrash' => __DIR__.'/..'.'/../lib/Sabre/ITrash.php',
	38	+ 'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => __DIR__.'/..'.'/../lib/Sabre/PropfindPlugin.php',
	39	+ 'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => __DIR__.'/..'.'/../lib/Sabre/RestoreFolder.php',
	40	+ 'OCA\\Files_Trashbin\\Sabre\\RootCollection' => __DIR__.'/..'.'/../lib/Sabre/RootCollection.php',
	41	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFile' => __DIR__.'/..'.'/../lib/Sabre/TrashFile.php',
	42	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => __DIR__.'/..'.'/../lib/Sabre/TrashFolder.php',
	43	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => __DIR__.'/..'.'/../lib/Sabre/TrashFolderFile.php',
	44	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => __DIR__.'/..'.'/../lib/Sabre/TrashFolderFolder.php',
	45	+ 'OCA\\Files_Trashbin\\Sabre\\TrashHome' => __DIR__.'/..'.'/../lib/Sabre/TrashHome.php',
	46	+ 'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => __DIR__.'/..'.'/../lib/Sabre/TrashRoot.php',
	47	+ 'OCA\\Files_Trashbin\\Storage' => __DIR__.'/..'.'/../lib/Storage.php',
	48	+ 'OCA\\Files_Trashbin\\Trashbin' => __DIR__.'/..'.'/../lib/Trashbin.php',
49	49	);
50	50
51	51	public static function getInitializer(ClassLoader $loader)
52	52	{
53		- return \Closure::bind(function () use ($loader) {
	53	+ return \Closure::bind(function() use ($loader) {
54	54	$loader->prefixLengthsPsr4 = ComposerStaticInitFiles_Trashbin::$prefixLengthsPsr4;
55	55	$loader->prefixDirsPsr4 = ComposerStaticInitFiles_Trashbin::$prefixDirsPsr4;
56	56	$loader->classMap = ComposerStaticInitFiles_Trashbin::$classMap;

		@@ -6,29 +6,29 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Files_Trashbin\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
10		- 'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => $baseDir . '/../lib/BackgroundJob/ExpireTrash.php',
11		- 'OCA\\Files_Trashbin\\Capabilities' => $baseDir . '/../lib/Capabilities.php',
12		- 'OCA\\Files_Trashbin\\Command\\CleanUp' => $baseDir . '/../lib/Command/CleanUp.php',
13		- 'OCA\\Files_Trashbin\\Command\\Expire' => $baseDir . '/../lib/Command/Expire.php',
14		- 'OCA\\Files_Trashbin\\Command\\ExpireTrash' => $baseDir . '/../lib/Command/ExpireTrash.php',
15		- 'OCA\\Files_Trashbin\\Controller\\PreviewController' => $baseDir . '/../lib/Controller/PreviewController.php',
16		- 'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => $baseDir . '/../lib/Events/MoveToTrashEvent.php',
17		- 'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => $baseDir . '/../lib/Exceptions/CopyRecursiveException.php',
18		- 'OCA\\Files_Trashbin\\Expiration' => $baseDir . '/../lib/Expiration.php',
19		- 'OCA\\Files_Trashbin\\Helper' => $baseDir . '/../lib/Helper.php',
20		- 'OCA\\Files_Trashbin\\Hooks' => $baseDir . '/../lib/Hooks.php',
21		- 'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => $baseDir . '/../lib/Sabre/AbstractTrash.php',
22		- 'OCA\\Files_Trashbin\\Sabre\\ITrash' => $baseDir . '/../lib/Sabre/ITrash.php',
23		- 'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => $baseDir . '/../lib/Sabre/PropfindPlugin.php',
24		- 'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => $baseDir . '/../lib/Sabre/RestoreFolder.php',
25		- 'OCA\\Files_Trashbin\\Sabre\\RootCollection' => $baseDir . '/../lib/Sabre/RootCollection.php',
26		- 'OCA\\Files_Trashbin\\Sabre\\TrashFile' => $baseDir . '/../lib/Sabre/TrashFile.php',
27		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => $baseDir . '/../lib/Sabre/TrashFolder.php',
28		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => $baseDir . '/../lib/Sabre/TrashFolderFile.php',
29		- 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => $baseDir . '/../lib/Sabre/TrashFolderFolder.php',
30		- 'OCA\\Files_Trashbin\\Sabre\\TrashHome' => $baseDir . '/../lib/Sabre/TrashHome.php',
31		- 'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => $baseDir . '/../lib/Sabre/TrashRoot.php',
32		- 'OCA\\Files_Trashbin\\Storage' => $baseDir . '/../lib/Storage.php',
33		- 'OCA\\Files_Trashbin\\Trashbin' => $baseDir . '/../lib/Trashbin.php',
	9	+ 'OCA\\Files_Trashbin\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
	10	+ 'OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash' => $baseDir.'/../lib/BackgroundJob/ExpireTrash.php',
	11	+ 'OCA\\Files_Trashbin\\Capabilities' => $baseDir.'/../lib/Capabilities.php',
	12	+ 'OCA\\Files_Trashbin\\Command\\CleanUp' => $baseDir.'/../lib/Command/CleanUp.php',
	13	+ 'OCA\\Files_Trashbin\\Command\\Expire' => $baseDir.'/../lib/Command/Expire.php',
	14	+ 'OCA\\Files_Trashbin\\Command\\ExpireTrash' => $baseDir.'/../lib/Command/ExpireTrash.php',
	15	+ 'OCA\\Files_Trashbin\\Controller\\PreviewController' => $baseDir.'/../lib/Controller/PreviewController.php',
	16	+ 'OCA\\Files_Trashbin\\Events\\MoveToTrashEvent' => $baseDir.'/../lib/Events/MoveToTrashEvent.php',
	17	+ 'OCA\\Files_Trashbin\\Exceptions\\CopyRecursiveException' => $baseDir.'/../lib/Exceptions/CopyRecursiveException.php',
	18	+ 'OCA\\Files_Trashbin\\Expiration' => $baseDir.'/../lib/Expiration.php',
	19	+ 'OCA\\Files_Trashbin\\Helper' => $baseDir.'/../lib/Helper.php',
	20	+ 'OCA\\Files_Trashbin\\Hooks' => $baseDir.'/../lib/Hooks.php',
	21	+ 'OCA\\Files_Trashbin\\Sabre\\AbstractTrash' => $baseDir.'/../lib/Sabre/AbstractTrash.php',
	22	+ 'OCA\\Files_Trashbin\\Sabre\\ITrash' => $baseDir.'/../lib/Sabre/ITrash.php',
	23	+ 'OCA\\Files_Trashbin\\Sabre\\PropfindPlugin' => $baseDir.'/../lib/Sabre/PropfindPlugin.php',
	24	+ 'OCA\\Files_Trashbin\\Sabre\\RestoreFolder' => $baseDir.'/../lib/Sabre/RestoreFolder.php',
	25	+ 'OCA\\Files_Trashbin\\Sabre\\RootCollection' => $baseDir.'/../lib/Sabre/RootCollection.php',
	26	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFile' => $baseDir.'/../lib/Sabre/TrashFile.php',
	27	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolder' => $baseDir.'/../lib/Sabre/TrashFolder.php',
	28	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFile' => $baseDir.'/../lib/Sabre/TrashFolderFile.php',
	29	+ 'OCA\\Files_Trashbin\\Sabre\\TrashFolderFolder' => $baseDir.'/../lib/Sabre/TrashFolderFolder.php',
	30	+ 'OCA\\Files_Trashbin\\Sabre\\TrashHome' => $baseDir.'/../lib/Sabre/TrashHome.php',
	31	+ 'OCA\\Files_Trashbin\\Sabre\\TrashRoot' => $baseDir.'/../lib/Sabre/TrashRoot.php',
	32	+ 'OCA\\Files_Trashbin\\Storage' => $baseDir.'/../lib/Storage.php',
	33	+ 'OCA\\Files_Trashbin\\Trashbin' => $baseDir.'/../lib/Trashbin.php',
34	34	);

nextcloud / server

Push — master ( a23d52...d867f9 )

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +32 added lines, -32 removed lines patch added patch discarded remove patch

Spacing +25 added lines, -25 removed lines patch added patch discarded remove patch