Completed
Pull Request — master (#551)
by Maxence
02:40
created
lib/Db/FileSharesRequest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@
 block discarded – undo
105 105
 		$expr = $qb->expr();
106 106
 
107 107
 		$this->limitToShareType($qb, self::SHARE_TYPE);
108
-		$qb->andWhere($expr->isNull($this->default_select_alias . '.parent'));
108
+		$qb->andWhere($expr->isNull($this->default_select_alias.'.parent'));
109 109
 
110 110
 		$shares = [];
111 111
 		$cursor = $qb->execute();
Please login to merge, or discard this patch.
lib/Service/FederatedShareService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@
 block discarded – undo
110 110
 		/** @var FederatedShare $share */
111 111
 		$share = $data->gObj('federatedShare', FederatedShare::class);
112 112
 		if ($share->getLockStatus() === ItemLock::STATUS_INSTANCE_LOCKED) {
113
-			throw new FederatedShareAlreadyLockedException('item already locked by ' . $share->getInstance());
113
+			throw new FederatedShareAlreadyLockedException('item already locked by '.$share->getInstance());
114 114
 		}
115 115
 
116 116
 		return $share;
Please login to merge, or discard this patch.
tests/unit/lib/Api/CirclesTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 			} catch (Exception $e) {
332 332
 				$this->assertSame(
333 333
 					true, false,
334
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
334
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
335 335
 				);
336 336
 			}
337 337
 
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
 			} catch (Exception $e) {
346 346
 				$this->assertSame(
347 347
 					true, false,
348
-					'should have returned a MemberIsNotModeratorException - ' . $e->getMessage()
348
+					'should have returned a MemberIsNotModeratorException - '.$e->getMessage()
349 349
 				);
350 350
 			}
351 351
 
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -7,10 +7,10 @@
 block discarded – undo
7 7
 	define('PHPUNIT_RUN', 1);
8 8
 }
9 9
 
10
-require_once __DIR__ . '/../../../lib/base.php';
10
+require_once __DIR__.'/../../../lib/base.php';
11 11
 
12 12
 // Fix for "Autoload path not allowed: .../tests/lib/testcase.php"
13
-\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
13
+\OC::$loader->addValidRoot(OC::$SERVERROOT.'/tests');
14 14
 
15 15
 \OC_App::loadApp(Application::APP_ID);
16 16
 
Please login to merge, or discard this patch.
templates/files/list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@
 block discarded – undo
18 18
 		<tr>
19 19
 			<th id='headerName' class="hidden column-name">
20 20
 				<div id="headerName-container">
21
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
21
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
22 22
 				</div>
23 23
 			</th>
24 24
 			<th id="headerSize" class="hidden column-size">
25 25
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
26 26
 			</th>
27 27
 			<th id="headerDate" class="hidden column-mtime">
28
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
28
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
29 29
 			</th>
30 30
 		</tr>
31 31
 	</thead>
Please login to merge, or discard this patch.
lib/Db/MemberRequest.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
217 217
 		}
218 218
 
219
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
220
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
219
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
220
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
221 221
 
222 222
 		return $this->getItemsFromRequest($qb);
223 223
 	}
@@ -241,8 +241,8 @@  discard block
 block discarded – undo
241 241
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId);
242 242
 
243 243
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
244
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc');
245
-		$qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id');
244
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc');
245
+		$qb->groupBy(CoreQueryBuilder::MEMBER.'.single_id');
246 246
 
247 247
 		return $this->getItemsFromRequest($qb);
248 248
 	}
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 		$qb = $this->getMemberSelectSql();
279 279
 		$qb->limitToCircleId($circleId);
280 280
 
281
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
282
-		$qb->groupBy(CoreQueryBuilder::MEMBER . '.instance');
281
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
282
+		$qb->groupBy(CoreQueryBuilder::MEMBER.'.instance');
283 283
 
284 284
 		return array_map(
285 285
 			function(Member $member): string {
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
334 334
 	 */
335 335
 	public function searchFederatedUsers(string $needle): array {
336 336
 		$qb = $this->getMemberSelectSql();
337
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
337
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
338 338
 		$qb->groupBy('single_id');
339 339
 
340 340
 		return $this->getItemsFromRequest($qb, true);
Please login to merge, or discard this patch.
lib/Db/RemoteRequestBuilder.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -78,13 +78,13 @@
 block discarded – undo
78 78
 	protected function getRemoteSelectSql(string $alias = CoreQueryBuilder::REMOTE): CoreQueryBuilder {
79 79
 		$qb = $this->getQueryBuilder();
80 80
 		$qb->select(
81
-			$alias . '.id',
82
-			$alias . '.type',
83
-			$alias . '.uid',
84
-			$alias . '.instance',
85
-			$alias . '.href',
86
-			$alias . '.item',
87
-			$alias . '.creation'
81
+			$alias.'.id',
82
+			$alias.'.type',
83
+			$alias.'.uid',
84
+			$alias.'.instance',
85
+			$alias.'.href',
86
+			$alias.'.item',
87
+			$alias.'.creation'
88 88
 		)
89 89
 		   ->from(self::TABLE_REMOTE, $alias)
90 90
 		   ->setDefaultSelectAlias($alias);
Please login to merge, or discard this patch.
lib/Db/MembershipRequestBuilder.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -73,13 +73,13 @@
 block discarded – undo
73 73
 	protected function getMembershipSelectSql(): CoreQueryBuilder {
74 74
 		$qb = $this->getQueryBuilder();
75 75
 		$qb->select(
76
-			CoreQueryBuilder::MEMBER . '.single_id',
77
-			CoreQueryBuilder::MEMBER . '.circle_id',
78
-			CoreQueryBuilder::MEMBER . '.level',
79
-			CoreQueryBuilder::MEMBER . '.inheritance_first',
80
-			CoreQueryBuilder::MEMBER . '.inheritance_last',
81
-			CoreQueryBuilder::MEMBER . '.inheritance_path',
82
-			CoreQueryBuilder::MEMBER . '.inheritance_depth'
76
+			CoreQueryBuilder::MEMBER.'.single_id',
77
+			CoreQueryBuilder::MEMBER.'.circle_id',
78
+			CoreQueryBuilder::MEMBER.'.level',
79
+			CoreQueryBuilder::MEMBER.'.inheritance_first',
80
+			CoreQueryBuilder::MEMBER.'.inheritance_last',
81
+			CoreQueryBuilder::MEMBER.'.inheritance_path',
82
+			CoreQueryBuilder::MEMBER.'.inheritance_depth'
83 83
 		)
84 84
 		   ->from(self::TABLE_MEMBERSHIP, CoreQueryBuilder::MEMBER)
85 85
 		   ->setDefaultSelectAlias(CoreQueryBuilder::MEMBER);
Please login to merge, or discard this patch.
lib/Db/CircleRequestBuilder.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -75,21 +75,21 @@
 block discarded – undo
75 75
 	 */
76 76
 	protected function getCircleSelectSql(string $alias = CoreQueryBuilder::CIRCLE): CoreQueryBuilder {
77 77
 		$qb = $this->getQueryBuilder();
78
-		$qb->selectDistinct($alias . '.unique_id')
78
+		$qb->selectDistinct($alias.'.unique_id')
79 79
 		   ->addSelect(
80
-			   $alias . '.name',
81
-			   $alias . '.display_name',
82
-			   $alias . '.source',
83
-			   $alias . '.description',
84
-			   $alias . '.settings',
85
-			   $alias . '.config',
86
-			   $alias . '.contact_addressbook',
87
-			   $alias . '.contact_groupname',
88
-			   $alias . '.creation'
80
+			   $alias.'.name',
81
+			   $alias.'.display_name',
82
+			   $alias.'.source',
83
+			   $alias.'.description',
84
+			   $alias.'.settings',
85
+			   $alias.'.config',
86
+			   $alias.'.contact_addressbook',
87
+			   $alias.'.contact_groupname',
88
+			   $alias.'.creation'
89 89
 		   )
90 90
 		   ->from(self::TABLE_CIRCLE, $alias)
91
-		   ->groupBy($alias . '.unique_id')
92
-		   ->orderBy($alias . '.creation', 'asc')
91
+		   ->groupBy($alias.'.unique_id')
92
+		   ->orderBy($alias.'.creation', 'asc')
93 93
 		   ->setDefaultSelectAlias($alias);
94 94
 
95 95
 		return $qb;
Please login to merge, or discard this patch.