Completed
Push — master ( 6c7631...0663df )
by Maxence
05:07 queued 02:33
created
lib/Service/ShareService.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,6 @@
 block discarded – undo
33 33
 
34 34
 
35 35
 use OCA\Circles\Model\Circle;
36
-use OCA\Circles\Model\Federated\FederatedEvent;
37 36
 
38 37
 /**
39 38
  * Class ShareService
Please login to merge, or discard this patch.
lib/ShareByCircleProviderDeprecated.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -438,8 +438,8 @@
 block discarded – undo
438 438
 
439 439
 	/**
440 440
 	 * @param string $userId
441
-	 * @param $shareType
442
-	 * @param Node $node
441
+	 * @param integer $shareType
442
+	 * @param Node|null $node
443 443
 	 * @param int $limit
444 444
 	 * @param int $offset
445 445
 	 *
Please login to merge, or discard this patch.
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -494,7 +494,6 @@
 block discarded – undo
494 494
 
495 495
 	/**
496 496
 	 * Get shares for a given path
497
-
498 497
 	 * @param Node $path
499 498
 	 *
500 499
 	 * @return IShare[]|null
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -331,19 +331,19 @@  discard block
 block discarded – undo
331 331
 	 */
332 332
 	private function createShare($share) {
333 333
 		$this->miscService->log(
334
-			'Creating share (1/4) - type: ' . $share->getShareType() . ' - token: '
335
-			. $share->getToken() . ' - type: ' . $share->getShareType() . ' - with: '
336
-			. $share->getSharedWith() . ' - permissions: ' . $share->getPermissions(), 0
334
+			'Creating share (1/4) - type: '.$share->getShareType().' - token: '
335
+			. $share->getToken().' - type: '.$share->getShareType().' - with: '
336
+			. $share->getSharedWith().' - permissions: '.$share->getPermissions(), 0
337 337
 		);
338 338
 
339 339
 		$qb = $this->getBaseInsertSql($share);
340
-		$this->miscService->log('Share creation (2/4) : ' . json_encode($qb->getSQL()), 0);
340
+		$this->miscService->log('Share creation (2/4) : '.json_encode($qb->getSQL()), 0);
341 341
 
342 342
 		$result = $qb->execute();
343
-		$this->miscService->log('Share creation result (3/4) : ' . json_encode($result), 0);
343
+		$this->miscService->log('Share creation result (3/4) : '.json_encode($result), 0);
344 344
 
345 345
 		$id = $qb->getLastInsertId();
346
-		$this->miscService->log('Share created ID (4/4) : ' . $id, 0);
346
+		$this->miscService->log('Share created ID (4/4) : '.$id, 0);
347 347
 
348 348
 		try {
349 349
 			$share->setId($id);
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
 		\OC::$server->getLogger()->log(3, 'deprecated>getShareByToken');
591 591
 		$qb = $this->dbConnection->getQueryBuilder();
592 592
 
593
-		$this->miscService->log("Opening share by token '#" . $token . "'", 0);
593
+		$this->miscService->log("Opening share by token '#".$token."'", 0);
594 594
 
595 595
 		$cursor = $qb->select('*')
596 596
 					 ->from('share')
@@ -614,7 +614,7 @@  discard block
 block discarded – undo
614 614
 			try {
615 615
 				$data = $this->getShareByPersonalToken($token);
616 616
 			} catch (Exception $e) {
617
-				$this->miscService->log("Share '#" . $token . "' not found.", 0);
617
+				$this->miscService->log("Share '#".$token."' not found.", 0);
618 618
 				throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
619 619
 			}
620 620
 		}
@@ -623,7 +623,7 @@  discard block
 block discarded – undo
623 623
 			$share = $this->createShareObject($data);
624 624
 		} catch (InvalidShare $e) {
625 625
 			$this->miscService->log(
626
-				"Share Object '#" . $token . "' not created. " . json_encode($data), 0
626
+				"Share Object '#".$token."' not created. ".json_encode($data), 0
627 627
 			);
628 628
 			throw new ShareNotFound('Share not found', $this->l10n->t('Could not find share'));
629 629
 		}
Please login to merge, or discard this patch.
tests/unit/lib/Api/CirclesTest.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -861,7 +861,7 @@
 block discarded – undo
861 861
 	/**
862 862
 	 * function to generate admin/moderator/member and assigning them their level.
863 863
 	 *
864
-	 * @param $circleId
864
+	 * @param integer $circleId
865 865
 	 * @param bool $isClosed
866 866
 	 *
867 867
 	 * @throws QueryException
Please login to merge, or discard this 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/ShareByCircleProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -296,7 +296,7 @@
 block discarded – undo
296 296
 	 * @throws RequestBuilderException
297 297
 	 */
298 298
 	public function move(IShare $share, $recipient): IShare {
299
-		OC::$server->getLogger()->log(3, 'CSP > move' . $share->getId() . ' ' . $recipient);
299
+		OC::$server->getLogger()->log(3, 'CSP > move'.$share->getId().' '.$recipient);
300 300
 
301 301
 		$federatedUser = $this->federatedUserService->getLocalFederatedUser($recipient);
302 302
 		$child = $this->shareWrapperService->getChild($share, $federatedUser);
Please login to merge, or discard this patch.
lib/Command/CirclesDestroy.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 		} catch (FederatedItemException $e) {
126 126
 			if ($input->getOption('status-code')) {
127 127
 				throw new FederatedItemException(
128
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
128
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
129 129
 				);
130 130
 			}
131 131
 
Please login to merge, or discard this patch.
lib/Command/CirclesSync.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 		if (($userId = $input->getOption('user')) !== '') {
124 124
 			$federatedUser = $this->syncService->syncNextcloudUser($userId);
125 125
 			$output->writeln(
126
-				'- Nextcloud User <info>' . $userId . '</info>/<info>' . $federatedUser->getSingleId()
126
+				'- Nextcloud User <info>'.$userId.'</info>/<info>'.$federatedUser->getSingleId()
127 127
 				. '</info> synced'
128 128
 			);
129 129
 		}
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 		if (($groupId = $input->getOption('group')) !== '') {
137 137
 			$circle = $this->syncService->syncNextcloudGroup($groupId);
138 138
 			$output->writeln(
139
-				'- Nextcloud Group <info>' . $groupId . '</info>/<info>' . $circle->getSingleId()
139
+				'- Nextcloud Group <info>'.$groupId.'</info>/<info>'.$circle->getSingleId()
140 140
 				. '</info> synced'
141 141
 			);
142 142
 		}
Please login to merge, or discard this patch.
lib/Command/CirclesConfig.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
 		} catch (FederatedItemException $e) {
145 145
 			if ($input->getOption('status-code')) {
146 146
 				throw new FederatedItemException(
147
-					' [' . get_class($e) . ', ' . $e->getStatus() . ']' . "\n" . $e->getMessage()
147
+					' ['.get_class($e).', '.$e->getStatus().']'."\n".$e->getMessage()
148 148
 				);
149 149
 			}
150 150
 
@@ -176,8 +176,8 @@  discard block
 block discarded – undo
176 176
 			$value = array_search(strtoupper($item), $valid);
177 177
 			if (!$value) {
178 178
 				throw new InvalidArgumentException(
179
-					'Invalid config \'' . $item . '\'. Available values: '
180
-					. implode(', ', array_values($valid)) . '. '
179
+					'Invalid config \''.$item.'\'. Available values: '
180
+					. implode(', ', array_values($valid)).'. '
181 181
 					. 'To disable a config, start the value with an underscore'
182 182
 				);
183 183
 			}
Please login to merge, or discard this patch.