Completed
Pull Request — master (#246)
by Roeland
16:34
created
controller/pagecontroller.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@
 block discarded – undo
204 204
 	/**
205 205
 	 * Shows the albums and pictures the token gives access to
206 206
 	 *
207
-	 * @param $token
207
+	 * @param string $token
208 208
 	 *
209 209
 	 * @return TemplateResponse
210 210
 	 */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -108,7 +108,7 @@
 block discarded – undo
108 108
 			return $this->showPublicPage($token);
109 109
 		} else {
110 110
 			$url = $this->urlGenerator->linkToRoute(
111
-				$this->appName . '.files_public.download',
111
+				$this->appName.'.files_public.download',
112 112
 				[
113 113
 					'token'    => $token,
114 114
 					'fileId'   => $node->getId(),
Please login to merge, or discard this patch.
environment/environment.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * without having to know whether they're private or public
144 144
 	 */
145 145
 	public function setStandardEnv() {
146
-		$this->fromRootToFolder = $this->userFolder->getPath() . '/';
146
+		$this->fromRootToFolder = $this->userFolder->getPath().'/';
147 147
 	}
148 148
 
149 149
 	/**
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	public function getNodeFromVirtualRoot($subPath) {
166 166
 		$relativePath = $this->getRelativePath($this->fromRootToFolder);
167
-		$path = $relativePath . '/' . $subPath;
167
+		$path = $relativePath.'/'.$subPath;
168 168
 		$node = $this->getNodeFromUserFolder($path);
169 169
 
170 170
 		return $this->getResourceFromId($node->getId());
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 			try {
191 191
 				$node = $folder->get($path);
192 192
 			} catch (NotFoundException $exception) {
193
-				$message = 'Could not find anything at: ' . $exception->getMessage();
193
+				$message = 'Could not find anything at: '.$exception->getMessage();
194 194
 				throw new NotFoundEnvException($message);
195 195
 			}
196 196
 		}
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 			if ($nodeType === 'dir') {
245 245
 				$rootFolder = $node;
246 246
 			} else {
247
-				throw new NotFoundEnvException($node->getPath() . ' is not a folder');
247
+				throw new NotFoundEnvException($node->getPath().' is not a folder');
248 248
 			}
249 249
 		}
250 250
 
@@ -358,7 +358,7 @@  discard block
 block discarded – undo
358 358
 		$resourcesArray = $folder->getById($resourceId);
359 359
 
360 360
 		if ($resourcesArray[0] === null) {
361
-			throw new NotFoundEnvException('Could not locate node linked to ID: ' . $resourceId);
361
+			throw new NotFoundEnvException('Could not locate node linked to ID: '.$resourceId);
362 362
 		}
363 363
 
364 364
 		return $resourcesArray[0];
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 	 */
377 377
 	private function buildFromRootToFolder($fileSource) {
378 378
 		$resource = $this->getResourceFromId($fileSource);
379
-		$fromRootToFolder = $resource->getPath() . '/';
379
+		$fromRootToFolder = $resource->getPath().'/';
380 380
 
381 381
 		return $fromRootToFolder;
382 382
 	}
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 	 * @return string
397 397
 	 */
398 398
 	private function getRelativePath($fullPath) {
399
-		$folderPath = $this->userFolder->getPath() . '/';
399
+		$folderPath = $this->userFolder->getPath().'/';
400 400
 		$origShareRelPath = str_replace($folderPath, '', $fullPath);
401 401
 
402 402
 		return $origShareRelPath;
Please login to merge, or discard this patch.
environment/environmentexception.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 	 * @param string $msg the message contained in the exception
26 26
 	 */
27 27
 	public function __construct($msg) {
28
-		Util::writeLog('gallery', 'Exception' . $msg, Util::ERROR);
28
+		Util::writeLog('gallery', 'Exception'.$msg, Util::ERROR);
29 29
 		parent::__construct($msg);
30 30
 	}
31 31
 }
Please login to merge, or discard this patch.
service/previewservice.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -218,7 +218,7 @@
 block discarded – undo
218 218
 			}
219 219
 		} catch (\Exception $exception) {
220 220
 			throw new InternalServerErrorServiceException(
221
-				'Something went wrong when trying to read' . $file->getPath()
221
+				'Something went wrong when trying to read'.$file->getPath()
222 222
 			);
223 223
 		}
224 224
 
Please login to merge, or discard this patch.
service/configservice.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -299,7 +299,7 @@
 block discarded – undo
299 299
 	 */
300 300
 	private function buildErrorMessage($exception, $folder) {
301 301
 		$configPath = $this->environment->getPathFromVirtualRoot($folder);
302
-		$errorMessage = $exception->getMessage() . ". Config location: /$configPath";
302
+		$errorMessage = $exception->getMessage().". Config location: /$configPath";
303 303
 		$this->logger->error($errorMessage);
304 304
 		$config = ['error' => ['message' => $errorMessage]];
305 305
 
Please login to merge, or discard this patch.
service/filesservice.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
 		try {
68 68
 			return $node && $this->isAllowed($node) && $this->isAvailable($node);
69 69
 		} catch (\Exception $exception) {
70
-			$message = 'The folder is not available: ' . $exception->getMessage();
70
+			$message = 'The folder is not available: '.$exception->getMessage();
71 71
 			$this->logger->error($message);
72 72
 
73 73
 			return false;
Please login to merge, or discard this patch.
service/serviceexception.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
 	 * @param string $msg the message contained in the exception
26 26
 	 */
27 27
 	public function __construct($msg) {
28
-		Util::writeLog('gallery', 'Exception: ' . $msg, Util::ERROR);
28
+		Util::writeLog('gallery', 'Exception: '.$msg, Util::ERROR);
29 29
 		parent::__construct($msg);
30 30
 	}
31 31
 }
Please login to merge, or discard this patch.
middleware/checkmiddleware.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 	 */
150 150
 	private function redirectToErrorPage($message, $code) {
151 151
 		$url = $this->urlGenerator->linkToRoute(
152
-			$this->appName . '.page.error_page', ['code' => $code]
152
+			$this->appName.'.page.error_page', ['code' => $code]
153 153
 		);
154 154
 
155 155
 		$response = new RedirectResponse($url);
Please login to merge, or discard this patch.
middleware/envcheckmiddleware.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
 		) {
181 181
 			$message =
182 182
 				'Passed token seems to be valid, but it does not contain all necessary information . ("'
183
-				. $token . '")';
183
+				. $token.'")';
184 184
 			throw new CheckException($message, Http::STATUS_NOT_FOUND);
185 185
 		}
186 186
 	}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 	 */
195 195
 	private function checkItemType($share) {
196 196
 		if ($share->getNodeType() === null) {
197
-			$message = 'No item type set for share id: ' . $share->getId();
197
+			$message = 'No item type set for share id: '.$share->getId();
198 198
 			throw new CheckException($message, Http::STATUS_NOT_FOUND);
199 199
 		}
200 200
 	}
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 			$this->checkPassword($share, $password);
237 237
 		} else {
238 238
 			throw new CheckException(
239
-				'Unknown share type ' . $share->getShareType() . ' for share id '
239
+				'Unknown share type '.$share->getShareType().' for share id '
240 240
 				. $share->getId(), Http::STATUS_NOT_FOUND
241 241
 			);
242 242
 		}
Please login to merge, or discard this patch.