Completed
Pull Request — stable9 (#47)
by Olivier
08:29
created
controller/pagecontroller.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -190,7 +190,7 @@
 block discarded – undo
190 190
 	/**
191 191
 	 * Shows the albums and pictures the token gives access to
192 192
 	 *
193
-	 * @param $token
193
+	 * @param string $token
194 194
 	 *
195 195
 	 * @return TemplateResponse
196 196
 	 */
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 			return $this->showPublicPage($token);
123 123
 		} else {
124 124
 			$url = $this->urlGenerator->linkToRoute(
125
-				$this->appName . '.files_public.download',
125
+				$this->appName.'.files_public.download',
126 126
 				[
127 127
 					'token'    => $token,
128 128
 					'fileId'   => $node->getId(),
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
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		) {
189 189
 			$message =
190 190
 				'Passed token seems to be valid, but it does not contain all necessary information . ("'
191
-				. $token . '")';
191
+				. $token.'")';
192 192
 			throw new CheckException($message, Http::STATUS_NOT_FOUND);
193 193
 		}
194 194
 	}
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	private function checkItemType($linkItem) {
204 204
 		if (!isset($linkItem['item_type'])) {
205
-			$message = 'No item type set for share id: ' . $linkItem['id'];
205
+			$message = 'No item type set for share id: '.$linkItem['id'];
206 206
 			throw new CheckException($message, Http::STATUS_NOT_FOUND);
207 207
 		}
208 208
 	}
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 			$this->checkPassword($linkItem, $password);
255 255
 		} else {
256 256
 			throw new CheckException(
257
-				'Unknown share type ' . $linkItem['share_type'] . ' for share id '
257
+				'Unknown share type '.$linkItem['share_type'].' for share id '
258 258
 				. $linkItem['id'], Http::STATUS_NOT_FOUND
259 259
 			);
260 260
 		}
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/checkexception.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 	 * @param int $code the HTTP status code
30 30
 	 */
31 31
 	public function __construct($msg, $code = 0) {
32
-		Util::writeLog('galleryplus', 'Exception: ' . $msg . ' (' . $code . ')', Util::ERROR);
32
+		Util::writeLog('galleryplus', 'Exception: '.$msg.' ('.$code.')', Util::ERROR);
33 33
 		parent::__construct($msg, $code);
34 34
 	}
35 35
 
Please login to merge, or discard this patch.
controller/pathmanipulation.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
 		$subFolders = explode('/', $relativePath);
43 43
 
44 44
 		if (count($subFolders) > 2) {
45
-			$reducedPath = $currFolderPath . $subFolders[0] . '/' . array_pop($subFolders);
45
+			$reducedPath = $currFolderPath.$subFolders[0].'/'.array_pop($subFolders);
46 46
 		} else {
47 47
 			$reducedPath = $path;
48 48
 		}
Please login to merge, or discard this patch.
controller/httperror.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 
46 46
 		return new JSONResponse(
47 47
 			[
48
-				'message' => $message . ' (' . $code . ')',
48
+				'message' => $message.' ('.$code.')',
49 49
 				'success' => false
50 50
 			],
51 51
 			$code
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 		$message = $exception->getMessage();
64 64
 		$code = $this->getHttpStatusCode($exception);
65 65
 		$url = $urlGenerator->linkToRoute(
66
-			$appName . '.page.error_page', ['code' => $code]
66
+			$appName.'.page.error_page', ['code' => $code]
67 67
 		);
68 68
 
69 69
 		$response = new RedirectResponse($url);
Please login to merge, or discard this patch.
controller/filescontroller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		} catch (ServiceException $exception) {
118 118
 			$code = $this->getHttpStatusCode($exception);
119 119
 			$url = $this->urlGenerator->linkToRoute(
120
-				$this->appName . '.page.error_page', ['code' => $code]
120
+				$this->appName.'.page.error_page', ['code' => $code]
121 121
 			);
122 122
 
123 123
 			$response = new RedirectResponse($url);
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('galleryplus', 'Exception' . $msg, Util::ERROR);
28
+		Util::writeLog('galleryplus', 'Exception'.$msg, Util::ERROR);
29 29
 		parent::__construct($msg);
30 30
 	}
31 31
 }
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
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 * without having to know whether they're private or public
141 141
 	 */
142 142
 	public function setStandardEnv() {
143
-		$this->fromRootToFolder = $this->userFolder->getPath() . '/';
143
+		$this->fromRootToFolder = $this->userFolder->getPath().'/';
144 144
 	}
145 145
 
146 146
 	/**
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 	 */
153 153
 	public function getNodeFromVirtualRoot($subPath) {
154 154
 		$relativePath = $this->getRelativePath($this->fromRootToFolder);
155
-		$path = $relativePath . '/' . $subPath;
155
+		$path = $relativePath.'/'.$subPath;
156 156
 		$node = $this->getNodeFromUserFolder($path);
157 157
 
158 158
 		return $this->getResourceFromId($node->getId());
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 			try {
179 179
 				$node = $folder->get($path);
180 180
 			} catch (NotFoundException $exception) {
181
-				$message = 'Could not find anything at: ' . $exception->getMessage();
181
+				$message = 'Could not find anything at: '.$exception->getMessage();
182 182
 				throw new NotFoundEnvException($message);
183 183
 			}
184 184
 		}
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	public function getResourceFromId($resourceId) {
199 199
 		$resourcesArray = $this->userFolder->getById($resourceId);
200 200
 		if ($resourcesArray[0] === null) {
201
-			throw new NotFoundEnvException('Could not locate file linked to ID: ' . $resourceId);
201
+			throw new NotFoundEnvException('Could not locate file linked to ID: '.$resourceId);
202 202
 		}
203 203
 
204 204
 		return $resourcesArray[0];
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
 			if ($nodeType === 'dir') {
228 228
 				$rootFolder = $node;
229 229
 			} else {
230
-				throw new NotFoundEnvException($node->getPath() . ' is not a folder');
230
+				throw new NotFoundEnvException($node->getPath().' is not a folder');
231 231
 			}
232 232
 		}
233 233
 
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 	 */
341 341
 	private function buildFromRootToFolder($fileSource) {
342 342
 		$resource = $this->getResourceFromId($fileSource);
343
-		$fromRootToFolder = $resource->getPath() . '/';
343
+		$fromRootToFolder = $resource->getPath().'/';
344 344
 
345 345
 		return $fromRootToFolder;
346 346
 	}
@@ -360,7 +360,7 @@  discard block
 block discarded – undo
360 360
 	 * @return string
361 361
 	 */
362 362
 	private function getRelativePath($fullPath) {
363
-		$folderPath = $this->userFolder->getPath() . '/';
363
+		$folderPath = $this->userFolder->getPath().'/';
364 364
 		$origShareRelPath = str_replace($folderPath, '', $fullPath);
365 365
 
366 366
 		return $origShareRelPath;
Please login to merge, or discard this patch.