Completed
Push — stable10 ( e55881...b0ab3b )
by Joas
36:13 queued 35:48
created
lib/private/Memcache/CASTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -41,13 +41,13 @@
 block discarded – undo
41 41
 	 */
42 42
 	public function cas($key, $old, $new) {
43 43
 		//no native cas, emulate with locking
44
-		if ($this->add($key . '_lock', true)) {
44
+		if ($this->add($key.'_lock', true)) {
45 45
 			if ($this->get($key) === $old) {
46 46
 				$this->set($key, $new);
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return true;
49 49
 			} else {
50
-				$this->remove($key . '_lock');
50
+				$this->remove($key.'_lock');
51 51
 				return false;
52 52
 			}
53 53
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/APCu.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	use CADTrait;
38 38
 
39 39
 	public function get($key) {
40
-		$result = apcu_fetch($this->getPrefix() . $key, $success);
40
+		$result = apcu_fetch($this->getPrefix().$key, $success);
41 41
 		if (!$success) {
42 42
 			return null;
43 43
 		}
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	public function set($key, $value, $ttl = 0) {
48
-		return apcu_store($this->getPrefix() . $key, $value, $ttl);
48
+		return apcu_store($this->getPrefix().$key, $value, $ttl);
49 49
 	}
50 50
 
51 51
 	public function hasKey($key) {
52
-		return apcu_exists($this->getPrefix() . $key);
52
+		return apcu_exists($this->getPrefix().$key);
53 53
 	}
54 54
 
55 55
 	public function remove($key) {
56
-		return apcu_delete($this->getPrefix() . $key);
56
+		return apcu_delete($this->getPrefix().$key);
57 57
 	}
58 58
 
59 59
 	public function clear($prefix = '') {
60
-		$ns = $this->getPrefix() . $prefix;
60
+		$ns = $this->getPrefix().$prefix;
61 61
 		$ns = preg_quote($ns, '/');
62
-		if(class_exists('\APCIterator')) {
63
-			$iter = new \APCIterator('user', '/^' . $ns . '/', APC_ITER_KEY);
62
+		if (class_exists('\APCIterator')) {
63
+			$iter = new \APCIterator('user', '/^'.$ns.'/', APC_ITER_KEY);
64 64
 		} else {
65
-			$iter = new \APCUIterator('/^' . $ns . '/', APC_ITER_KEY);
65
+			$iter = new \APCUIterator('/^'.$ns.'/', APC_ITER_KEY);
66 66
 		}
67 67
 		return apcu_delete($iter);
68 68
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return bool
77 77
 	 */
78 78
 	public function add($key, $value, $ttl = 0) {
79
-		return apcu_add($this->getPrefix() . $key, $value, $ttl);
79
+		return apcu_add($this->getPrefix().$key, $value, $ttl);
80 80
 	}
81 81
 
82 82
 	/**
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
101 101
 		 * for details
102 102
 		 */
103
-		return apcu_exists($this->getPrefix() . $key)
104
-			? apcu_inc($this->getPrefix() . $key, $step)
103
+		return apcu_exists($this->getPrefix().$key)
104
+			? apcu_inc($this->getPrefix().$key, $step)
105 105
 			: false;
106 106
 	}
107 107
 
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 		 * see https://github.com/krakjoe/apcu/issues/183#issuecomment-244038221
126 126
 		 * for details
127 127
 		 */
128
-		return apcu_exists($this->getPrefix() . $key)
129
-			? apcu_dec($this->getPrefix() . $key, $step)
128
+		return apcu_exists($this->getPrefix().$key)
129
+			? apcu_dec($this->getPrefix().$key, $step)
130 130
 			: false;
131 131
 	}
132 132
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	public function cas($key, $old, $new) {
142 142
 		// apc only does cas for ints
143 143
 		if (is_int($old) and is_int($new)) {
144
-			return apcu_cas($this->getPrefix() . $key, $old, $new);
144
+			return apcu_cas($this->getPrefix().$key, $old, $new);
145 145
 		} else {
146 146
 			return $this->casEmulated($key, $old, $new);
147 147
 		}
Please login to merge, or discard this patch.
lib/private/Memcache/CADTrait.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -38,13 +38,13 @@
 block discarded – undo
38 38
 	 */
39 39
 	public function cad($key, $old) {
40 40
 		//no native cas, emulate with locking
41
-		if ($this->add($key . '_lock', true)) {
41
+		if ($this->add($key.'_lock', true)) {
42 42
 			if ($this->get($key) === $old) {
43 43
 				$this->remove($key);
44
-				$this->remove($key . '_lock');
44
+				$this->remove($key.'_lock');
45 45
 				return true;
46 46
 			} else {
47
-				$this->remove($key . '_lock');
47
+				$this->remove($key.'_lock');
48 48
 				return false;
49 49
 			}
50 50
 		} else {
Please login to merge, or discard this patch.
lib/private/Memcache/XCache.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -47,28 +47,28 @@  discard block
 block discarded – undo
47 47
 	}
48 48
 
49 49
 	public function get($key) {
50
-		return xcache_get($this->getNamespace() . $key);
50
+		return xcache_get($this->getNamespace().$key);
51 51
 	}
52 52
 
53 53
 	public function set($key, $value, $ttl = 0) {
54 54
 		if ($ttl > 0) {
55
-			return xcache_set($this->getNamespace() . $key, $value, $ttl);
55
+			return xcache_set($this->getNamespace().$key, $value, $ttl);
56 56
 		} else {
57
-			return xcache_set($this->getNamespace() . $key, $value);
57
+			return xcache_set($this->getNamespace().$key, $value);
58 58
 		}
59 59
 	}
60 60
 
61 61
 	public function hasKey($key) {
62
-		return xcache_isset($this->getNamespace() . $key);
62
+		return xcache_isset($this->getNamespace().$key);
63 63
 	}
64 64
 
65 65
 	public function remove($key) {
66
-		return xcache_unset($this->getNamespace() . $key);
66
+		return xcache_unset($this->getNamespace().$key);
67 67
 	}
68 68
 
69 69
 	public function clear($prefix = '') {
70 70
 		if (function_exists('xcache_unset_by_prefix')) {
71
-			return xcache_unset_by_prefix($this->getNamespace() . $prefix);
71
+			return xcache_unset_by_prefix($this->getNamespace().$prefix);
72 72
 		} else {
73 73
 			// Since we can not clear by prefix, we just clear the whole cache.
74 74
 			xcache_clear_cache(\XC_TYPE_VAR, 0);
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 	 * @return int | bool
101 101
 	 */
102 102
 	public function inc($key, $step = 1) {
103
-		return xcache_inc($this->getPrefix() . $key, $step);
103
+		return xcache_inc($this->getPrefix().$key, $step);
104 104
 	}
105 105
 
106 106
 	/**
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @return int | bool
112 112
 	 */
113 113
 	public function dec($key, $step = 1) {
114
-		return xcache_dec($this->getPrefix() . $key, $step);
114
+		return xcache_dec($this->getPrefix().$key, $step);
115 115
 	}
116 116
 
117 117
 	static public function isAvailable() {
Please login to merge, or discard this patch.
lib/private/Memcache/Redis.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	public function get($key) {
52
-		$result = self::$cache->get($this->getNamespace() . $key);
53
-		if ($result === false && !self::$cache->exists($this->getNamespace() . $key)) {
52
+		$result = self::$cache->get($this->getNamespace().$key);
53
+		if ($result === false && !self::$cache->exists($this->getNamespace().$key)) {
54 54
 			return null;
55 55
 		} else {
56 56
 			return json_decode($result, true);
@@ -59,18 +59,18 @@  discard block
 block discarded – undo
59 59
 
60 60
 	public function set($key, $value, $ttl = 0) {
61 61
 		if ($ttl > 0) {
62
-			return self::$cache->setex($this->getNamespace() . $key, $ttl, json_encode($value));
62
+			return self::$cache->setex($this->getNamespace().$key, $ttl, json_encode($value));
63 63
 		} else {
64
-			return self::$cache->set($this->getNamespace() . $key, json_encode($value));
64
+			return self::$cache->set($this->getNamespace().$key, json_encode($value));
65 65
 		}
66 66
 	}
67 67
 
68 68
 	public function hasKey($key) {
69
-		return self::$cache->exists($this->getNamespace() . $key);
69
+		return self::$cache->exists($this->getNamespace().$key);
70 70
 	}
71 71
 
72 72
 	public function remove($key) {
73
-		if (self::$cache->delete($this->getNamespace() . $key)) {
73
+		if (self::$cache->delete($this->getNamespace().$key)) {
74 74
 			return true;
75 75
 		} else {
76 76
 			return false;
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	}
79 79
 
80 80
 	public function clear($prefix = '') {
81
-		$prefix = $this->getNamespace() . $prefix . '*';
81
+		$prefix = $this->getNamespace().$prefix.'*';
82 82
 		$it = null;
83 83
 		self::$cache->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY);
84 84
 		while ($keys = self::$cache->scan($it, $prefix)) {
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 		if (!is_int($value)) {
101 101
 			$value = json_encode($value);
102 102
 		}
103
-		return self::$cache->setnx($this->getPrefix() . $key, $value);
103
+		return self::$cache->setnx($this->getPrefix().$key, $value);
104 104
 	}
105 105
 
106 106
 	/**
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @return int | bool
112 112
 	 */
113 113
 	public function inc($key, $step = 1) {
114
-		return self::$cache->incrBy($this->getNamespace() . $key, $step);
114
+		return self::$cache->incrBy($this->getNamespace().$key, $step);
115 115
 	}
116 116
 
117 117
 	/**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		if (!$this->hasKey($key)) {
126 126
 			return false;
127 127
 		}
128
-		return self::$cache->decrBy($this->getNamespace() . $key, $step);
128
+		return self::$cache->decrBy($this->getNamespace().$key, $step);
129 129
 	}
130 130
 
131 131
 	/**
@@ -140,10 +140,10 @@  discard block
 block discarded – undo
140 140
 		if (!is_int($new)) {
141 141
 			$new = json_encode($new);
142 142
 		}
143
-		self::$cache->watch($this->getNamespace() . $key);
143
+		self::$cache->watch($this->getNamespace().$key);
144 144
 		if ($this->get($key) === $old) {
145 145
 			$result = self::$cache->multi()
146
-				->set($this->getNamespace() . $key, $new)
146
+				->set($this->getNamespace().$key, $new)
147 147
 				->exec();
148 148
 			return ($result === false) ? false : true;
149 149
 		}
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 	 * @return bool
160 160
 	 */
161 161
 	public function cad($key, $old) {
162
-		self::$cache->watch($this->getNamespace() . $key);
162
+		self::$cache->watch($this->getNamespace().$key);
163 163
 		if ($this->get($key) === $old) {
164 164
 			$result = self::$cache->multi()
165
-				->del($this->getNamespace() . $key)
165
+				->del($this->getNamespace().$key)
166 166
 				->exec();
167 167
 			return ($result === false) ? false : true;
168 168
 		}
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	}
172 172
 
173 173
 	public function setTTL($key, $ttl) {
174
-		self::$cache->expire($this->getNamespace() . $key, $ttl);
174
+		self::$cache->expire($this->getNamespace().$key, $ttl);
175 175
 	}
176 176
 
177 177
 	static public function isAvailable() {
Please login to merge, or discard this patch.
lib/private/OCS/Provider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 			],
55 55
 		];
56 56
 
57
-		if($this->appManager->isEnabledForUser('files_sharing')) {
57
+		if ($this->appManager->isEnabledForUser('files_sharing')) {
58 58
 			$services['SHARING'] = [
59 59
 				'version' => 1,
60 60
 				'endpoints' => [
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 			];
71 71
 		}
72 72
 
73
-		if($this->appManager->isEnabledForUser('activity')) {
73
+		if ($this->appManager->isEnabledForUser('activity')) {
74 74
 			$services['ACTIVITY'] = [
75 75
 				'version' => 1,
76 76
 				'endpoints' => [
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 			];
80 80
 		}
81 81
 
82
-		if($this->appManager->isEnabledForUser('provisioning_api')) {
82
+		if ($this->appManager->isEnabledForUser('provisioning_api')) {
83 83
 			$services['PROVISIONING'] = [
84 84
 				'version' => 1,
85 85
 				'endpoints' => [
Please login to merge, or discard this patch.
lib/private/OCS/Result.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -103,10 +103,10 @@  discard block
 block discarded – undo
103 103
 		$meta['status'] = $this->succeeded() ? 'ok' : 'failure';
104 104
 		$meta['statuscode'] = $this->statusCode;
105 105
 		$meta['message'] = $this->message;
106
-		if(isset($this->items)) {
106
+		if (isset($this->items)) {
107 107
 			$meta['totalitems'] = $this->items;
108 108
 		}
109
-		if(isset($this->perPage)) {
109
+		if (isset($this->perPage)) {
110 110
 			$meta['itemsperpage'] = $this->perPage;
111 111
 		}
112 112
 		return $meta;
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
 	 * @return $this
137 137
 	 */
138 138
 	public function addHeader($name, $value) {
139
-		$name = trim($name);  // always remove leading and trailing whitespace
139
+		$name = trim($name); // always remove leading and trailing whitespace
140 140
 		// to be able to reliably check for security
141 141
 		// headers
142 142
 
143
-		if(is_null($value)) {
143
+		if (is_null($value)) {
144 144
 			unset($this->headers[$name]);
145 145
 		} else {
146 146
 			$this->headers[$name] = $value;
Please login to merge, or discard this patch.
lib/private/OCS/PrivateData.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 		$app = addslashes(strip_tags($parameters['app']));
44 44
 		$key = isset($parameters['key']) ? addslashes(strip_tags($parameters['key'])) : null;
45 45
 		
46
-		if(empty($key)) {
46
+		if (empty($key)) {
47 47
 			$query = \OCP\DB::prepare('SELECT `key`, `app`, `value`  FROM `*PREFIX*privatedata` WHERE `user` = ? AND `app` = ? ');
48 48
 			$result = $query->execute(array($user, $app));
49 49
 		} else {
@@ -53,10 +53,10 @@  discard block
 block discarded – undo
53 53
 		
54 54
 		$xml = array();
55 55
 		while ($row = $result->fetchRow()) {
56
-			$data=array();
57
-			$data['key']=$row['key'];
58
-			$data['app']=$row['app'];
59
-			$data['value']=$row['value'];
56
+			$data = array();
57
+			$data['key'] = $row['key'];
58
+			$data['app'] = $row['app'];
59
+			$data['value'] = $row['value'];
60 60
 		 	$xml[] = $data;
61 61
 		}
62 62
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		$user = \OC_User::getUser();
74 74
 		$app = addslashes(strip_tags($parameters['app']));
75 75
 		$key = addslashes(strip_tags($parameters['key']));
76
-		$value = (string)$_POST['value'];
76
+		$value = (string) $_POST['value'];
77 77
 
78 78
 		// update in DB
79 79
 		$query = \OCP\DB::prepare('UPDATE `*PREFIX*privatedata` SET `value` = ?  WHERE `user` = ? AND `app` = ? AND `key` = ?');
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                 
82 82
 		if ($numRows === false || $numRows === 0) {
83 83
 			// store in DB
84
-			$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)' . ' VALUES(?, ?, ?, ?)');
84
+			$query = \OCP\DB::prepare('INSERT INTO `*PREFIX*privatedata` (`user`, `app`, `key`, `value`)'.' VALUES(?, ?, ?, ?)');
85 85
 			$query->execute(array($user, $app, $key, $value));
86 86
 		}
87 87
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
 		// delete in DB
108 108
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*privatedata`  WHERE `user` = ? AND `app` = ? AND `key` = ? ');
109
-		$query->execute(array($user, $app, $key ));
109
+		$query->execute(array($user, $app, $key));
110 110
 
111 111
 		return new Result(null, 100);
112 112
 	}
Please login to merge, or discard this patch.
lib/private/Files/Mount/CacheMountProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -55,13 +55,13 @@
 block discarded – undo
55 55
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
56 56
 		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
57 57
 		if ($cacheBaseDir !== '') {
58
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
58
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
59 59
 			if (!file_exists($cacheDir)) {
60 60
 				mkdir($cacheDir, 0770, true);
61 61
 			}
62 62
 
63 63
 			return [
64
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader])
64
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader])
65 65
 			];
66 66
 		} else {
67 67
 			return [];
Please login to merge, or discard this patch.