Completed
Push — federated-circles ( a68948...555f25 )
by Maxence
03:01
created
lib/AppInfo/Application.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	 *
85 85
 	 * @param $container
86 86
 	 */
87
-	private function registerServices(IAppContainer &$container) {
87
+	private function registerServices(IAppContainer & $container) {
88 88
 
89 89
 		$container->registerService(
90 90
 			'MiscService', function(IAppContainer $c) {
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 *
144 144
 	 * @param $container
145 145
 	 */
146
-	private static function registerControllers(IAppContainer &$container) {
146
+	private static function registerControllers(IAppContainer & $container) {
147 147
 
148 148
 		$container->registerService(
149 149
 			'NavigationController', function(IAppContainer $c) {
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 	 *
194 194
 	 * @param IAppContainer $container
195 195
 	 */
196
-	private static function registerDatabaseRequesters(IAppContainer &$container) {
196
+	private static function registerDatabaseRequesters(IAppContainer & $container) {
197 197
 
198 198
 		$container->registerService(
199 199
 			'CirclesRequest', function(IAppContainer $c) {
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 *
212 212
 	 * @param $container
213 213
 	 */
214
-	private static function registerMappers(IAppContainer &$container) {
214
+	private static function registerMappers(IAppContainer & $container) {
215 215
 
216 216
 		$container->registerService(
217 217
 			'CirclesMapper', function(IAppContainer $c) {
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 *
240 240
 	 * @param $container
241 241
 	 */
242
-	private static function registerCores(IAppContainer &$container) {
242
+	private static function registerCores(IAppContainer & $container) {
243 243
 
244 244
 		$container->registerService(
245 245
 			'Logger', function(IAppContainer $c) {
Please login to merge, or discard this patch.
lib/Migration/ImportOwncloudCustomGroups.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
 				continue;
149 149
 			}
150 150
 
151
-			$level = (int) $row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
151
+			$level = (int)$row['role'] === 1 ? Member::LEVEL_OWNER : Member::LEVEL_MEMBER;
152 152
 
153 153
 			if ($level === Member::LEVEL_OWNER) {
154 154
 				if (isset($this->circleHasAdmin[$this->circlesById[$row['group_id']]])) {
Please login to merge, or discard this patch.
lib/Db/CircleProviderRequestBuilder.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		$expr = $qb->expr();
74 74
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
75 75
 
76
-		$qb->andWhere($expr->eq($pf . 'share_with', $qb->createNamedParameter($circleId)));
76
+		$qb->andWhere($expr->eq($pf.'share_with', $qb->createNamedParameter($circleId)));
77 77
 	}
78 78
 
79 79
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 		$expr = $qb->expr();
88 88
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
89 89
 
90
-		$qb->andWhere($expr->eq($pf . 'id', $qb->createNamedParameter($shareId)));
90
+		$qb->andWhere($expr->eq($pf.'id', $qb->createNamedParameter($shareId)));
91 91
 	}
92 92
 
93 93
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
137 137
 		$qb->andWhere(
138 138
 			$expr->orX(
139
-				$expr->eq($pf . 'parent', $qb->createNamedParameter($circleId)),
140
-				$expr->eq($pf . 'id', $qb->createNamedParameter($circleId))
139
+				$expr->eq($pf.'parent', $qb->createNamedParameter($circleId)),
140
+				$expr->eq($pf.'id', $qb->createNamedParameter($circleId))
141 141
 			)
142 142
 		);
143 143
 	}
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
160 160
 		$qb->andWhere(
161 161
 			$expr->in(
162
-				$pf . 'file_source',
162
+				$pf.'file_source',
163 163
 				$qb->createNamedParameter($files, IQueryBuilder::PARAM_INT_ARRAY)
164 164
 			)
165 165
 		);
@@ -191,13 +191,13 @@  discard block
 block discarded – undo
191 191
 		$pf = ($qb->getType() === QueryBuilder::SELECT) ? 's.' : '';
192 192
 
193 193
 		if ($reShares === false) {
194
-			$qb->andWhere($expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId)));
194
+			$qb->andWhere($expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId)));
195 195
 		} else {
196 196
 			/** @noinspection PhpMethodParametersCountMismatchInspection */
197 197
 			$qb->andWhere(
198 198
 				$expr->orX(
199
-					$expr->eq($pf . 'uid_owner', $qb->createNamedParameter($userId)),
200
-					$expr->eq($pf . 'uid_initiator', $qb->createNamedParameter($userId))
199
+					$expr->eq($pf.'uid_owner', $qb->createNamedParameter($userId)),
200
+					$expr->eq($pf.'uid_initiator', $qb->createNamedParameter($userId))
201 201
 				)
202 202
 			);
203 203
 		}
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
 	protected function linkToMember(& $qb, $userId) {
254 254
 		$expr = $qb->expr();
255 255
 
256
-		$qb->leftJoin('s',MembersMapper::TABLENAME, 'm', $expr->andX(
256
+		$qb->leftJoin('s', MembersMapper::TABLENAME, 'm', $expr->andX(
257 257
 		   $expr->eq('s.share_with', 'm.circle_id'),
258 258
 		   $expr->eq('m.user_id', $qb->createNamedParameter($userId)),
259 259
 		   $expr->gte('m.level', $qb->createNamedParameter(Member::LEVEL_MEMBER))
Please login to merge, or discard this patch.
lib/Controller/FederatedController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -227,7 +227,7 @@
 block discarded – undo
227 227
 		ob_start();
228 228
 		echo($result);
229 229
 		$size = ob_get_length();
230
-		header('Content-Length: ' . $size);
230
+		header('Content-Length: '.$size);
231 231
 		ob_end_flush();
232 232
 		flush();
233 233
 	}
Please login to merge, or discard this patch.
lib/Migration/GenerateUniqueIdOnCreatedCircle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 
94 94
 			$update = $this->connection->getQueryBuilder();
95 95
 			$update->update('circles_circles')
96
-				   ->set('unique_id', $update->createNamedParameter('d' . $uniqueId))
96
+				   ->set('unique_id', $update->createNamedParameter('d'.$uniqueId))
97 97
 				   ->where(
98 98
 					   $update->expr()
99 99
 							  ->eq('id', $update->createNamedParameter($itemId))
Please login to merge, or discard this patch.
lib/Model/FederatedLink.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @return FederatedLink
78 78
 	 */
79 79
 	public function setId($id) {
80
-		$this->id = (int) $id;
80
+		$this->id = (int)$id;
81 81
 
82 82
 		return $this;
83 83
 	}
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 	 * @return $this
97 97
 	 */
98 98
 	public function setToken($token) {
99
-		$this->token = (string) $token;
99
+		$this->token = (string)$token;
100 100
 
101 101
 		return $this;
102 102
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @return FederatedLink
126 126
 	 */
127 127
 	public function setAddress($address) {
128
-		$this->address = (string) $address;
128
+		$this->address = (string)$address;
129 129
 
130 130
 		return $this;
131 131
 	}
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 	 * @return FederatedLink
145 145
 	 */
146 146
 	public function setLocalAddress($address) {
147
-		$this->localAddress = (string) $address;
147
+		$this->localAddress = (string)$address;
148 148
 
149 149
 		return $this;
150 150
 	}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 	 * @return FederatedLink
183 183
 	 */
184 184
 	public function setUniqueId($uniqueId) {
185
-		$this->uniqueId = (string) $uniqueId;
185
+		$this->uniqueId = (string)$uniqueId;
186 186
 
187 187
 		return $this;
188 188
 	}
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 	 * @return FederatedLink
202 202
 	 */
203 203
 	public function setRemoteCircleName($circleName) {
204
-		$this->remoteCircleName = (string) $circleName;
204
+		$this->remoteCircleName = (string)$circleName;
205 205
 
206 206
 		return $this;
207 207
 	}
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 	 * @return FederatedLink
221 221
 	 */
222 222
 	public function setCircleName($circleName) {
223
-		$this->localCircleName = (string) $circleName;
223
+		$this->localCircleName = (string)$circleName;
224 224
 
225 225
 		return $this;
226 226
 	}
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @return FederatedLink
240 240
 	 */
241 241
 	public function setStatus($status) {
242
-		$this->status = (int) $status;
242
+		$this->status = (int)$status;
243 243
 
244 244
 		return $this;
245 245
 	}
Please login to merge, or discard this patch.
lib/Model/BaseCircle.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 	 * @return $this
94 94
 	 */
95 95
 	public function setUniqueId($uniqueId) {
96
-		$this->uniqueId = (string) $uniqueId;
96
+		$this->uniqueId = (string)$uniqueId;
97 97
 
98 98
 		return $this;
99 99
 	}
Please login to merge, or discard this patch.
lib/Db/CirclesRequest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	public function getCircle($uniqueId) {
129 129
 		$qb = $this->getCirclesSelectSql();
130
-		$this->limitToUniqueId($qb, (string) $uniqueId);
130
+		$this->limitToUniqueId($qb, (string)$uniqueId);
131 131
 
132 132
 		$cursor = $qb->execute();
133 133
 		$data = $cursor->fetch();
@@ -145,8 +145,8 @@  discard block
 block discarded – undo
145 145
 	 */
146 146
 	public function getFrame($circleId, $uniqueId) {
147 147
 		$qb = $this->getSharesSelectSql();
148
-		$this->limitToUniqueId($qb, (string) $uniqueId);
149
-		$this->limitToCircleId($qb, (int) $circleId);
148
+		$this->limitToUniqueId($qb, (string)$uniqueId);
149
+		$this->limitToCircleId($qb, (int)$circleId);
150 150
 
151 151
 		$cursor = $qb->execute();
152 152
 		$data = $cursor->fetch();
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 	 */
166 166
 	public function getLinkFromToken($token, $uniqueId) {
167 167
 		$qb = $this->getLinksSelectSql();
168
-		$this->limitToUniqueId($qb, (string) $uniqueId);
169
-		$this->limitToToken($qb, (string) $token);
168
+		$this->limitToUniqueId($qb, (string)$uniqueId);
169
+		$this->limitToToken($qb, (string)$token);
170 170
 
171 171
 		$cursor = $qb->execute();
172 172
 		$data = $cursor->fetch();
Please login to merge, or discard this patch.
lib/Db/FederatedLinksRequest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$qb->where(
84 84
 			$expr->andX(
85
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
85
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
86 86
 				$expr->eq('f.status', $qb->createNamedParameter(9))
87 87
 			)
88 88
 		);
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
111 111
 
112 112
 		$qb->where(
113 113
 			$expr->andX(
114
-				$expr->eq('f.circle_id', $qb->createNamedParameter((int) $circleId)),
115
-				$expr->eq('f.unique_id', $qb->createNamedParameter((string) $uniqueId))
114
+				$expr->eq('f.circle_id', $qb->createNamedParameter((int)$circleId)),
115
+				$expr->eq('f.unique_id', $qb->createNamedParameter((string)$uniqueId))
116 116
 			)
117 117
 		);
118 118
 
Please login to merge, or discard this patch.