Completed
Pull Request — master (#1875)
by
unknown
25s
created
lib/Model/ModelManager.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -333,7 +333,7 @@
 block discarded – undo
333 333
 					$invitedBy = new FederatedUser();
334 334
 					$invitedBy->importFromCircle($invitedByCircle);
335 335
 					$member->setInvitedBy($invitedBy);
336
-				} catch (CircleNotFoundException|OwnerNotFoundException $e) {
336
+				} catch (CircleNotFoundException | OwnerNotFoundException $e) {
337 337
 				}
338 338
 				break;
339 339
 
Please login to merge, or discard this patch.
tests/bootstrap.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,10 +5,10 @@
 block discarded – undo
5 5
  */
6 6
 define('PHPUNIT_RUN', 1);
7 7
 
8
-require_once __DIR__ . '/../../../lib/base.php';
9
-require_once __DIR__ . '/../vendor/autoload.php';
8
+require_once __DIR__.'/../../../lib/base.php';
9
+require_once __DIR__.'/../vendor/autoload.php';
10 10
 
11
-\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT . '/tests/unit/', true);
11
+\OC::$composerAutoloader->addPsr4('Tests\\', OC::$SERVERROOT.'/tests/unit/', true);
12 12
 
13 13
 \OC_App::loadApp('circles');
14 14
 
Please login to merge, or discard this patch.
lib/MountManager/CircleMountProvider.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -218,13 +218,13 @@
 block discarded – undo
218 218
 
219 219
 	private function generateIncrementedMountpoint(Folder $fs, Mount $mount, IFederatedUser $federatedUser): void {
220 220
 		$info = pathinfo($mount->getMountPoint());
221
-		$filename = rtrim($this->get('dirname', $info), '/') . '/' . $this->get('filename', $info);
221
+		$filename = rtrim($this->get('dirname', $info), '/').'/'.$this->get('filename', $info);
222 222
 		$extension = $this->get('extension', $info);
223
-		$extension = ($extension === '') ? '' : '.' . $extension;
223
+		$extension = ($extension === '') ? '' : '.'.$extension;
224 224
 
225 225
 		$n = 2;
226 226
 		while (true) {
227
-			$path = $filename . " ($n)" . $extension;
227
+			$path = $filename." ($n)".$extension;
228 228
 			try {
229 229
 				$fs->get($path);
230 230
 			} catch (NotFoundException) {
Please login to merge, or discard this patch.
lib/Model/Mountpoint.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -63,13 +63,13 @@
 block discarded – undo
63 63
 	}
64 64
 
65 65
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
66
-		if ($this->get($prefix . 'mountpoint', $data) === '') {
66
+		if ($this->get($prefix.'mountpoint', $data) === '') {
67 67
 			throw new MountPointNotFoundException();
68 68
 		}
69 69
 
70
-		$this->setMountId($this->get($prefix . 'mount_id', $data));
71
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
72
-		$this->setMountPoint($this->get($prefix . 'mountpoint', $data));
70
+		$this->setMountId($this->get($prefix.'mount_id', $data));
71
+		$this->setSingleId($this->get($prefix.'single_id', $data));
72
+		$this->setMountPoint($this->get($prefix.'mountpoint', $data));
73 73
 
74 74
 		return $this;
75 75
 	}
Please login to merge, or discard this patch.
lib/Model/Mount.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@
 block discarded – undo
116 116
 			return $mountPoint;
117 117
 		}
118 118
 
119
-		return '/' . $this->getInitiator()->getUserId() . '/files/' . ltrim($mountPoint, '/');
119
+		return '/'.$this->getInitiator()->getUserId().'/files/'.ltrim($mountPoint, '/');
120 120
 	}
121 121
 
122 122
 	/**
Please login to merge, or discard this patch.
tests/unit/CirclesManagerTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -72,12 +72,12 @@
 block discarded – undo
72 72
 
73 73
 		// Created circle returned by probeCircle()
74 74
 		$circles = $this->circlesManager->probeCircles();
75
-		$this->assertCount(1, array_filter($circles, function (Circle $c) { return $c->getName() === $this->circleName; }));
75
+		$this->assertCount(1, array_filter($circles, function(Circle $c) { return $c->getName() === $this->circleName; }));
76 76
 
77 77
 		// Destroyed circle not returned by probeCircle()
78 78
 		$this->circlesManager->destroyCircle($circle->getSingleId());
79 79
 		$circles = $this->circlesManager->probeCircles();
80
-		$this->assertCount(0, array_filter($circles, function (Circle $c) { return $c->getName() === $this->circleName; }));
80
+		$this->assertCount(0, array_filter($circles, function(Circle $c) { return $c->getName() === $this->circleName; }));
81 81
 	}
82 82
 
83 83
 	public function testGetCirclesWithInitiator(): void {
Please login to merge, or discard this patch.
lib/Service/MaintenanceService.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
44 44
 	public const TIMEOUT = 18000;
45 45
 	public static $DELAY =
46 46
 		[
47
-			1 => 60,    // every minute
48
-			2 => 300,   // every 5 minutes
49
-			3 => 3600,  // every hour
47
+			1 => 60, // every minute
48
+			2 => 300, // every 5 minutes
49
+			3 => 3600, // every hour
50 50
 			4 => 75400, // every day
51 51
 			5 => 432000 // evey week
52 52
 		];
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 		$this->federatedUserService->bypassCurrentUserCondition(true);
97 97
 
98 98
 		$this->lockMaintenanceRun();
99
-		$this->debug('running maintenance (' . $level . ')');
99
+		$this->debug('running maintenance ('.$level.')');
100 100
 
101 101
 		switch ($level) {
102 102
 			case 1:
@@ -289,14 +289,14 @@  discard block
 block discarded – undo
289 289
 			->includeSystemCircles();
290 290
 
291 291
 		$circles = array_map(
292
-			function (Circle $circle) {
292
+			function(Circle $circle) {
293 293
 				return $circle->getSingleId();
294 294
 			}, $this->circleRequest->getCircles(null, $probe)
295 295
 		);
296 296
 
297 297
 		$shares = array_unique(
298 298
 			array_map(
299
-				function (ShareWrapper $share) {
299
+				function(ShareWrapper $share) {
300 300
 					return $share->getSharedWith();
301 301
 				}, $this->shareWrapperRequest->getShares()
302 302
 			)
@@ -438,6 +438,6 @@  discard block
 block discarded – undo
438 438
 	 * @param string $message
439 439
 	 */
440 440
 	private function output(string $message): void {
441
-		$this->output?->writeln('- ' . $message);
441
+		$this->output?->writeln('- '.$message);
442 442
 	}
443 443
 }
Please login to merge, or discard this patch.
lib/AppInfo/Capabilities.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -160,7 +160,7 @@
 block discarded – undo
160 160
 			return [];
161 161
 		}
162 162
 		$providerIds = array_map(
163
-			function (ServiceRegistration $registration) {
163
+			function(ServiceRegistration $registration) {
164 164
 				/** @var ITeamResourceProvider $provider */
165 165
 				$provider = $this->container->get($registration->getService());
166 166
 				return $provider->getId();
Please login to merge, or discard this patch.
lib/CirclesQueryHelper.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 			$aliasMembership,
153 153
 			$expr->andX(
154 154
 				$this->queryBuilder->exprLimit('single_id', $federatedUser->getSingleId(), $aliasMembership),
155
-				$expr->eq($aliasMembership . '.circle_id', $alias . '.' . $field)
155
+				$expr->eq($aliasMembership.'.circle_id', $alias.'.'.$field)
156 156
 			)
157 157
 		);
158 158
 	}
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 		$circle = new Circle();
191 191
 		$circle->importFromDatabase(
192 192
 			$data,
193
-			CoreQueryBuilder::HELPER . '_' . CoreQueryBuilder::CIRCLE . '_'
193
+			CoreQueryBuilder::HELPER.'_'.CoreQueryBuilder::CIRCLE.'_'
194 194
 		);
195 195
 
196 196
 		return $circle;
Please login to merge, or discard this patch.