Completed
Pull Request — master (#7419)
by Robin
15:02
created
lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.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
 	 * @inheritdoc
30 30
 	 */
31 31
 	public function like($x, $y, $type = null) {
32
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
32
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
33 33
 	}
34 34
 
35 35
 	public function iLike($x, $y, $type = null) {
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -41,26 +41,26 @@
 block discarded – undo
41 41
 	}
42 42
 
43 43
 	public function md5($input) {
44
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
44
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
45 45
 	}
46 46
 
47 47
 	public function concat($x, $y) {
48
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
48
+		return new QueryFunction('CONCAT('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
49 49
 	}
50 50
 
51 51
 	public function substring($input, $start, $length = null) {
52 52
 		if ($length) {
53
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
53
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
54 54
 		} else {
55
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
55
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
56 56
 		}
57 57
 	}
58 58
 
59 59
 	public function sum($field) {
60
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
60
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
61 61
 	}
62 62
 
63 63
 	public function lower($field) {
64
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
64
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
65 65
 	}
66 66
 }
Please login to merge, or discard this patch.
lib/private/User/Database.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
 				$query->expr()->eq('configkey', new Literal('email'))
209 209
 			)
210 210
 			// sqlite doesn't like re-using a single named parameter here
211
-			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
212
-			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
213
-			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
211
+			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
212
+			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
213
+			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
214 214
 			->orderBy($query->func()->lower('displayname'), 'ASC')
215 215
 			->orderBy($query->func()->lower('uid'), 'ASC')
216 216
 			->setMaxResults($limit)
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 * @return boolean true if user was found, false otherwise
263 263
 	 */
264 264
 	private function loadUser($uid) {
265
-		$uid = (string)$uid;
265
+		$uid = (string) $uid;
266 266
 		if (!isset($this->cache[$uid])) {
267 267
 			//guests $uid could be NULL or ''
268 268
 			if ($uid === '') {
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
 	 */
329 329
 	public function getHome($uid) {
330 330
 		if ($this->userExists($uid)) {
331
-			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid;
331
+			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT."/data").'/'.$uid;
332 332
 		}
333 333
 
334 334
 		return false;
Please login to merge, or discard this patch.