Inspection of "Merge pull request #13830 from nextcloud/fix/share..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 7b67eb...076982 )

by Roeland

created 2019-01-30 08:21 UTC

Status

Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -33,86 +33,86 @@
 block discarded – undo
 use OCP\IUserManager;
 
 class LegacyVersionsBackend implements IVersionBackend {
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IUserManager */
+    private $userManager;
 
-	public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		$this->rootFolder = $rootFolder;
-		$this->userManager = $userManager;
-	}
+    public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        $this->rootFolder = $rootFolder;
+        $this->userManager = $userManager;
+    }
 
-	public function getVersionsForFile(IUser $user, FileInfo $file): array {
-		$storage = $file->getStorage();
-		if ($storage->instanceOfStorage(SharedStorage::class)) {
-			$owner = $storage->getOwner('');
-			$user = $this->userManager->get($owner);
-		}
+    public function getVersionsForFile(IUser $user, FileInfo $file): array {
+        $storage = $file->getStorage();
+        if ($storage->instanceOfStorage(SharedStorage::class)) {
+            $owner = $storage->getOwner('');
+            $user = $this->userManager->get($owner);
+        }
 
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById($file->getId());
-		$file2 = array_pop($nodes);
-		$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $nodes = $userFolder->getById($file->getId());
+        $file2 = array_pop($nodes);
+        $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
 
-		return array_map(function (array $data) use ($file, $user) {
-			return new Version(
-				(int)$data['version'],
-				(int)$data['version'],
-				$data['name'],
-				(int)$data['size'],
-				$data['mimetype'],
-				$data['path'],
-				$file,
-				$this,
-				$user
-			);
-		}, $versions);
-	}
+        return array_map(function (array $data) use ($file, $user) {
+            return new Version(
+                (int)$data['version'],
+                (int)$data['version'],
+                $data['name'],
+                (int)$data['size'],
+                $data['mimetype'],
+                $data['path'],
+                $file,
+                $this,
+                $user
+            );
+        }, $versions);
+    }
 
-	public function createVersion(IUser $user, FileInfo $file) {
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$relativePath = $userFolder->getRelativePath($file->getPath());
-		$userView = new View('/' . $user->getUID());
-		// create all parent folders
-		Storage::createMissingDirectories($relativePath, $userView);
+    public function createVersion(IUser $user, FileInfo $file) {
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $relativePath = $userFolder->getRelativePath($file->getPath());
+        $userView = new View('/' . $user->getUID());
+        // create all parent folders
+        Storage::createMissingDirectories($relativePath, $userView);
 
-		Storage::scheduleExpire($user->getUID(), $relativePath);
+        Storage::scheduleExpire($user->getUID(), $relativePath);
 
-		// store a new version of a file
-		$userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
-		// ensure the file is scanned
-		$userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
-	}
+        // store a new version of a file
+        $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
+        // ensure the file is scanned
+        $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
+    }
 
-	public function rollback(IVersion $version) {
-		return Storage::rollback($version->getVersionPath(), $version->getRevisionId());
-	}
+    public function rollback(IVersion $version) {
+        return Storage::rollback($version->getVersionPath(), $version->getRevisionId());
+    }
 
-	private function getVersionFolder(IUser $user): Folder {
-		$userRoot = $this->rootFolder->getUserFolder($user->getUID())
-			->getParent();
-		try {
-			/** @var Folder $folder */
-			$folder = $userRoot->get('files_versions');
-			return $folder;
-		} catch (NotFoundException $e) {
-			return $userRoot->newFolder('files_versions');
-		}
-	}
+    private function getVersionFolder(IUser $user): Folder {
+        $userRoot = $this->rootFolder->getUserFolder($user->getUID())
+            ->getParent();
+        try {
+            /** @var Folder $folder */
+            $folder = $userRoot->get('files_versions');
+            return $folder;
+        } catch (NotFoundException $e) {
+            return $userRoot->newFolder('files_versions');
+        }
+    }
 
-	public function read(IVersion $version) {
-		$versions = $this->getVersionFolder($version->getUser());
-		/** @var File $file */
-		$file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
-		return $file->fopen('r');
-	}
+    public function read(IVersion $version) {
+        $versions = $this->getVersionFolder($version->getUser());
+        /** @var File $file */
+        $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
+        return $file->fopen('r');
+    }
 
-	public function getVersionFile(IUser $user, FileInfo $sourceFile, int $revision): File {
-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$versionFolder = $this->getVersionFolder($user);
-		/** @var File $file */
-		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
-		return $file;
-	}
+    public function getVersionFile(IUser $user, FileInfo $sourceFile, int $revision): File {
+        $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+        $versionFolder = $this->getVersionFolder($user);
+        /** @var File $file */
+        $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
+        return $file;
+    }
 }

Please login to merge, or discard this patch.

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

@@ -55,12 +55,12 @@  discard block
 block discarded – undo
 		$file2 = array_pop($nodes);
 		$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
 
-		return array_map(function (array $data) use ($file, $user) {
+		return array_map(function(array $data) use ($file, $user) {
 			return new Version(
-				(int)$data['version'],
-				(int)$data['version'],
+				(int) $data['version'],
+				(int) $data['version'],
 				$data['name'],
-				(int)$data['size'],
+				(int) $data['size'],
 				$data['mimetype'],
 				$data['path'],
 				$file,
@@ -73,16 +73,16 @@  discard block
 block discarded – undo
 	public function createVersion(IUser $user, FileInfo $file) {
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$relativePath = $userFolder->getRelativePath($file->getPath());
-		$userView = new View('/' . $user->getUID());
+		$userView = new View('/'.$user->getUID());
 		// create all parent folders
 		Storage::createMissingDirectories($relativePath, $userView);
 
 		Storage::scheduleExpire($user->getUID(), $relativePath);
 
 		// store a new version of a file
-		$userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
+		$userView->copy('files/'.$relativePath, 'files_versions/'.$relativePath.'.v'.$file->getMtime());
 		// ensure the file is scanned
-		$userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
+		$userView->getFileInfo('files_versions/'.$relativePath.'.v'.$file->getMtime());
 	}
 
 	public function rollback(IVersion $version) {
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
 	public function read(IVersion $version) {
 		$versions = $this->getVersionFolder($version->getUser());
 		/** @var File $file */
-		$file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
+		$file = $versions->get($version->getVersionPath().'.v'.$version->getRevisionId());
 		return $file->fopen('r');
 	}
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 		$versionFolder = $this->getVersionFolder($user);
 		/** @var File $file */
-		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
+		$file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()).'.v'.$revision);
 		return $file;
 	}
 }

Please login to merge, or discard this patch.

		@@ -55,12 +55,12 @@ discard block
		block discarded – undo
55	55	$file2 = array_pop($nodes);
56	56	$versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
57	57
58		- return array_map(function (array $data) use ($file, $user) {
	58	+ return array_map(function(array $data) use ($file, $user) {
59	59	return new Version(
60		- (int)$data['version'],
61		- (int)$data['version'],
	60	+ (int) $data['version'],
	61	+ (int) $data['version'],
62	62	$data['name'],
63		- (int)$data['size'],
	63	+ (int) $data['size'],
64	64	$data['mimetype'],
65	65	$data['path'],
66	66	$file,
		@@ -73,16 +73,16 @@ discard block
		block discarded – undo
73	73	public function createVersion(IUser $user, FileInfo $file) {
74	74	$userFolder = $this->rootFolder->getUserFolder($user->getUID());
75	75	$relativePath = $userFolder->getRelativePath($file->getPath());
76		- $userView = new View('/' . $user->getUID());
	76	+ $userView = new View('/'.$user->getUID());
77	77	// create all parent folders
78	78	Storage::createMissingDirectories($relativePath, $userView);
79	79
80	80	Storage::scheduleExpire($user->getUID(), $relativePath);
81	81
82	82	// store a new version of a file
83		- $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
	83	+ $userView->copy('files/'.$relativePath, 'files_versions/'.$relativePath.'.v'.$file->getMtime());
84	84	// ensure the file is scanned
85		- $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
	85	+ $userView->getFileInfo('files_versions/'.$relativePath.'.v'.$file->getMtime());
86	86	}
87	87
88	88	public function rollback(IVersion $version) {
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	public function read(IVersion $version) {
105	105	$versions = $this->getVersionFolder($version->getUser());
106	106	/** @var File $file */
107		- $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
	107	+ $file = $versions->get($version->getVersionPath().'.v'.$version->getRevisionId());
108	108	return $file->fopen('r');
109	109	}
110	110
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	$userFolder = $this->rootFolder->getUserFolder($user->getUID());
113	113	$versionFolder = $this->getVersionFolder($user);
114	114	/** @var File $file */
115		- $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
	115	+ $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()).'.v'.$revision);
116	116	return $file;
117	117	}
118	118	}

		@@ -33,86 +33,86 @@
		block discarded – undo
33	33	use OCP\IUserManager;
34	34
35	35	class LegacyVersionsBackend implements IVersionBackend {
36		- /** @var IRootFolder */
37		- private $rootFolder;
38		- /** @var IUserManager */
39		- private $userManager;
	36	+ /** @var IRootFolder */
	37	+ private $rootFolder;
	38	+ /** @var IUserManager */
	39	+ private $userManager;
40	40
41		- public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
42		- $this->rootFolder = $rootFolder;
43		- $this->userManager = $userManager;
44		- }
	41	+ public function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
	42	+ $this->rootFolder = $rootFolder;
	43	+ $this->userManager = $userManager;
	44	+ }
45	45
46		- public function getVersionsForFile(IUser $user, FileInfo $file): array {
47		- $storage = $file->getStorage();
48		- if ($storage->instanceOfStorage(SharedStorage::class)) {
49		- $owner = $storage->getOwner('');
50		- $user = $this->userManager->get($owner);
51		- }
	46	+ public function getVersionsForFile(IUser $user, FileInfo $file): array {
	47	+ $storage = $file->getStorage();
	48	+ if ($storage->instanceOfStorage(SharedStorage::class)) {
	49	+ $owner = $storage->getOwner('');
	50	+ $user = $this->userManager->get($owner);
	51	+ }
52	52
53		- $userFolder = $this->rootFolder->getUserFolder($user->getUID());
54		- $nodes = $userFolder->getById($file->getId());
55		- $file2 = array_pop($nodes);
56		- $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
	53	+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
	54	+ $nodes = $userFolder->getById($file->getId());
	55	+ $file2 = array_pop($nodes);
	56	+ $versions = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
57	57
58		- return array_map(function (array $data) use ($file, $user) {
59		- return new Version(
60		- (int)$data['version'],
61		- (int)$data['version'],
62		- $data['name'],
63		- (int)$data['size'],
64		- $data['mimetype'],
65		- $data['path'],
66		- $file,
67		- $this,
68		- $user
69		- );
70		- }, $versions);
71		- }
	58	+ return array_map(function (array $data) use ($file, $user) {
	59	+ return new Version(
	60	+ (int)$data['version'],
	61	+ (int)$data['version'],
	62	+ $data['name'],
	63	+ (int)$data['size'],
	64	+ $data['mimetype'],
	65	+ $data['path'],
	66	+ $file,
	67	+ $this,
	68	+ $user
	69	+ );
	70	+ }, $versions);
	71	+ }
72	72
73		- public function createVersion(IUser $user, FileInfo $file) {
74		- $userFolder = $this->rootFolder->getUserFolder($user->getUID());
75		- $relativePath = $userFolder->getRelativePath($file->getPath());
76		- $userView = new View('/' . $user->getUID());
77		- // create all parent folders
78		- Storage::createMissingDirectories($relativePath, $userView);
	73	+ public function createVersion(IUser $user, FileInfo $file) {
	74	+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
	75	+ $relativePath = $userFolder->getRelativePath($file->getPath());
	76	+ $userView = new View('/' . $user->getUID());
	77	+ // create all parent folders
	78	+ Storage::createMissingDirectories($relativePath, $userView);
79	79
80		- Storage::scheduleExpire($user->getUID(), $relativePath);
	80	+ Storage::scheduleExpire($user->getUID(), $relativePath);
81	81
82		- // store a new version of a file
83		- $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
84		- // ensure the file is scanned
85		- $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
86		- }
	82	+ // store a new version of a file
	83	+ $userView->copy('files/' . $relativePath, 'files_versions/' . $relativePath . '.v' . $file->getMtime());
	84	+ // ensure the file is scanned
	85	+ $userView->getFileInfo('files_versions/' . $relativePath . '.v' . $file->getMtime());
	86	+ }
87	87
88		- public function rollback(IVersion $version) {
89		- return Storage::rollback($version->getVersionPath(), $version->getRevisionId());
90		- }
	88	+ public function rollback(IVersion $version) {
	89	+ return Storage::rollback($version->getVersionPath(), $version->getRevisionId());
	90	+ }
91	91
92		- private function getVersionFolder(IUser $user): Folder {
93		- $userRoot = $this->rootFolder->getUserFolder($user->getUID())
94		- ->getParent();
95		- try {
96		- /** @var Folder $folder */
97		- $folder = $userRoot->get('files_versions');
98		- return $folder;
99		- } catch (NotFoundException $e) {
100		- return $userRoot->newFolder('files_versions');
101		- }
102		- }
	92	+ private function getVersionFolder(IUser $user): Folder {
	93	+ $userRoot = $this->rootFolder->getUserFolder($user->getUID())
	94	+ ->getParent();
	95	+ try {
	96	+ /** @var Folder $folder */
	97	+ $folder = $userRoot->get('files_versions');
	98	+ return $folder;
	99	+ } catch (NotFoundException $e) {
	100	+ return $userRoot->newFolder('files_versions');
	101	+ }
	102	+ }
103	103
104		- public function read(IVersion $version) {
105		- $versions = $this->getVersionFolder($version->getUser());
106		- /** @var File $file */
107		- $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
108		- return $file->fopen('r');
109		- }
	104	+ public function read(IVersion $version) {
	105	+ $versions = $this->getVersionFolder($version->getUser());
	106	+ /** @var File $file */
	107	+ $file = $versions->get($version->getVersionPath() . '.v' . $version->getRevisionId());
	108	+ return $file->fopen('r');
	109	+ }
110	110
111		- public function getVersionFile(IUser $user, FileInfo $sourceFile, int $revision): File {
112		- $userFolder = $this->rootFolder->getUserFolder($user->getUID());
113		- $versionFolder = $this->getVersionFolder($user);
114		- /** @var File $file */
115		- $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
116		- return $file;
117		- }
	111	+ public function getVersionFile(IUser $user, FileInfo $sourceFile, int $revision): File {
	112	+ $userFolder = $this->rootFolder->getUserFolder($user->getUID());
	113	+ $versionFolder = $this->getVersionFolder($user);
	114	+ /** @var File $file */
	115	+ $file = $versionFolder->get($userFolder->getRelativePath($sourceFile->getPath()) . '.v' . $revision);
	116	+ return $file;
	117	+ }
118	118	}

nextcloud / server

Push — master ( 7b67eb...076982 )

Status

Category

Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

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