Completed
Pull Request — master (#9222)
by Joas
71:57 queued 42:38
created
lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 class PgSqlFunctionBuilder extends FunctionBuilder {
27 27
 	public function concat($x, $y) {
28
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
28
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 class SqliteFunctionBuilder extends FunctionBuilder {
27 27
 	public function concat($x, $y) {
28
-		return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
28
+		return new QueryFunction('('.$this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y).')');
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/Directory.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 				// exit if we can't create a new file and we don't updatable existing file
126 126
 				$chunkInfo = \OC_FileChunking::decodeName($name);
127 127
 				if (!$this->fileView->isCreatable($this->path) &&
128
-					!$this->fileView->isUpdatable($this->path . '/' . $chunkInfo['name'])
128
+					!$this->fileView->isUpdatable($this->path.'/'.$chunkInfo['name'])
129 129
 				) {
130 130
 					throw new \Sabre\DAV\Exception\Forbidden();
131 131
 				}
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
 
140 140
 			$this->fileView->verifyPath($this->path, $name);
141 141
 
142
-			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
142
+			$path = $this->fileView->getAbsolutePath($this->path).'/'.$name;
143 143
 			// in case the file already exists/overwriting
144
-			$info = $this->fileView->getFileInfo($this->path . '/' . $name);
144
+			$info = $this->fileView->getFileInfo($this->path.'/'.$name);
145 145
 			if (!$info) {
146 146
 				// use a dummy FileInfo which is acceptable here since it will be refreshed after the put is complete
147 147
 				$info = new \OC\Files\FileInfo($path, null, null, [], null);
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 			}
177 177
 
178 178
 			$this->fileView->verifyPath($this->path, $name);
179
-			$newPath = $this->path . '/' . $name;
179
+			$newPath = $this->path.'/'.$name;
180 180
 			if (!$this->fileView->mkdir($newPath)) {
181
-				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory ' . $newPath);
181
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
182 182
 			}
183 183
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
184 184
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 			throw new NotFound();
208 208
 		}
209 209
 
210
-		$path = $this->path . '/' . $name;
210
+		$path = $this->path.'/'.$name;
211 211
 		if (is_null($info)) {
212 212
 			try {
213 213
 				$this->fileView->verifyPath($this->path, $name);
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 		}
223 223
 
224 224
 		if (!$info) {
225
-			throw new \Sabre\DAV\Exception\NotFound('File with name ' . $path . ' could not be located');
225
+			throw new \Sabre\DAV\Exception\NotFound('File with name '.$path.' could not be located');
226 226
 		}
227 227
 
228 228
 		if ($info['mimetype'] === 'httpd/unix-directory') {
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
 		// (required old code) instead of "updateFile".
282 282
 		//
283 283
 		// TODO: resolve chunk file name here and implement "updateFile"
284
-		$path = $this->path . '/' . $name;
284
+		$path = $this->path.'/'.$name;
285 285
 		return $this->fileView->file_exists($path);
286 286
 
287 287
 	}
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 			throw new ServiceUnavailable('filesystem not setup');
377 377
 		}
378 378
 
379
-		$destinationPath = $this->getPath() . '/' . $targetName;
379
+		$destinationPath = $this->getPath().'/'.$targetName;
380 380
 
381 381
 
382 382
 		$targetNodeExists = $this->childExists($targetName);
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 		// at getNodeForPath we also check the path for isForbiddenFileOrDir
385 385
 		// with that we have covered both source and destination
386 386
 		if ($sourceNode instanceof Directory && $targetNodeExists) {
387
-			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory ' . $sourceNode->getName() . ', target exists');
387
+			throw new \Sabre\DAV\Exception\Forbidden('Could not copy directory '.$sourceNode->getName().', target exists');
388 388
 		}
389 389
 
390 390
 		list($sourceDir,) = \Sabre\Uri\split($sourceNode->getPath());
Please login to merge, or discard this patch.
core/Command/App/ListApps.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	protected function execute(InputInterface $input, OutputInterface $output) {
64
-		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false'){
64
+		if ($input->getOption('shipped') === 'true' || $input->getOption('shipped') === 'false') {
65 65
 			$shippedFilter = $input->getOption('shipped') === 'true';
66 66
 		} else {
67 67
 			$shippedFilter = null;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 		//sort enabled apps above disabled apps
75 75
 		foreach ($apps as $app) {
76
-			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter){
76
+			if ($shippedFilter !== null && $this->manager->isShipped($app) !== $shippedFilter) {
77 77
 				continue;
78 78
 			}
79 79
 			if ($this->manager->isInstalled($app)) {
Please login to merge, or discard this patch.
apps/federation/lib/DbHandler.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -87,10 +87,10 @@  discard block
 block discarded – undo
87 87
 		$result = $query->execute();
88 88
 
89 89
 		if ($result) {
90
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
90
+			return (int) $this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
91 91
 		}
92 92
 
93
-		$message = 'Internal failure, Could not add trusted server: ' . $url;
93
+		$message = 'Internal failure, Could not add trusted server: '.$url;
94 94
 		$message_t = $this->IL10N->t('Could not add server');
95 95
 		throw new HintException($message, $message_t);
96 96
 	}
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
 		$result = $query->execute()->fetchAll();
125 125
 
126 126
 		if (empty($result)) {
127
-			throw new \Exception('No Server found with ID: ' . $id);
127
+			throw new \Exception('No Server found with ID: '.$id);
128 128
 		}
129 129
 
130 130
 		return $result[0];
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 		$statement->closeCursor();
202 202
 
203 203
 		if (!isset($result['token'])) {
204
-			throw new \Exception('No token found for: ' . $url);
204
+			throw new \Exception('No token found for: '.$url);
205 205
 		}
206 206
 
207 207
 		return $result['token'];
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 		$statement = $query->execute();
279 279
 		$result = $statement->fetch();
280 280
 		$statement->closeCursor();
281
-		return (int)$result['status'];
281
+		return (int) $result['status'];
282 282
 	}
283 283
 
284 284
 	/**
Please login to merge, or discard this patch.
lib/private/Route/Route.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@
 block discarded – undo
150 150
 	public function actionInclude($file) {
151 151
 		$function = function($param) use ($file) {
152 152
 			unset($param["_route"]);
153
-			$_GET=array_merge($_GET, $param);
153
+			$_GET = array_merge($_GET, $param);
154 154
 			unset($param);
155 155
 			require_once "$file";
156 156
 		} ;
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareInfoController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@
 block discarded – undo
122 122
 	protected function addROWrapper() {
123 123
 		// FIXME: should not add storage wrappers outside of preSetup, need to find a better way
124 124
 		$previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false);
125
-		\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
125
+		\OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) {
126 126
 			return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE));
127 127
 		});
128 128
 		\OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog);
Please login to merge, or discard this patch.
apps/files_sharing/lib/ExpireSharesJob.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
 			);
68 68
 
69 69
 		$shares = $qb->execute();
70
-		while($share = $shares->fetch()) {
70
+		while ($share = $shares->fetch()) {
71 71
 			\OC\Share\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
72 72
 		}
73 73
 		$shares->closeCursor();
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/InvalidAuth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 		$this
38 38
 			->setIdentifier($invalidId)
39 39
 			->setScheme(self::SCHEME_NULL)
40
-			->setText('Unknown auth mechanism backend ' . $invalidId)
40
+			->setText('Unknown auth mechanism backend '.$invalidId)
41 41
 		;
42 42
 	}
43 43
 
Please login to merge, or discard this patch.