@@ -95,7 +95,7 @@ |
||
| 95 | 95 | RequestResultNotJsonException $e |
| 96 | 96 | ) { |
| 97 | 97 | $this->miscService->log( |
| 98 | - 'Issue while search users from lookup: ' . get_class($e) . ' ' . $e->getMessage() |
|
| 98 | + 'Issue while search users from lookup: '.get_class($e).' '.$e->getMessage() |
|
| 99 | 99 | ); |
| 100 | 100 | |
| 101 | 101 | return []; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | continue; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - $replace['{' . $k . '}'] = $data[$k]['_parsed']; |
|
| 140 | + $replace['{'.$k.'}'] = $data[$k]['_parsed']; |
|
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | $line = strtr($line, $replace); |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | return [ |
| 302 | 302 | 'type' => $member->getTypeName(), |
| 303 | 303 | 'id' => $member->getUserId(), |
| 304 | - 'name' => $member->getCachedName() . ' (' . $member->getTypeString() . ')', |
|
| 304 | + 'name' => $member->getCachedName().' ('.$member->getTypeString().')', |
|
| 305 | 305 | '_parsed' => $member->getCachedName() |
| 306 | 306 | ]; |
| 307 | 307 | } |
@@ -337,8 +337,8 @@ discard block |
||
| 337 | 337 | return [ |
| 338 | 338 | 'type' => 'circle', |
| 339 | 339 | 'id' => $link->getUniqueId(), |
| 340 | - 'name' => $link->getToken() . '@' . $link->getAddress(), |
|
| 341 | - '_parsed' => $link->getToken() . '@' . $link->getAddress() |
|
| 340 | + 'name' => $link->getToken().'@'.$link->getAddress(), |
|
| 341 | + '_parsed' => $link->getToken().'@'.$link->getAddress() |
|
| 342 | 342 | ]; |
| 343 | 343 | } |
| 344 | 344 | |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | use Throwable; |
| 60 | 60 | |
| 61 | 61 | |
| 62 | -require_once __DIR__ . '/../../vendor/autoload.php'; |
|
| 62 | +require_once __DIR__.'/../../vendor/autoload.php'; |
|
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | /** |
@@ -93,7 +93,7 @@ |
||
| 93 | 93 | */ |
| 94 | 94 | private function listLinkedGroups(InputInterface $input, OutputInterface $output) { |
| 95 | 95 | if ($input->getOption('list') !== true) { |
| 96 | - return ; |
|
| 96 | + return; |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | throw new FakeException(); |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | * |
| 182 | 182 | * @param SharingFrame $frame |
| 183 | 183 | * @param DeprecatedCircle $circle |
| 184 | - * @param $broadcast |
|
| 184 | + * @param string|null $broadcast |
|
| 185 | 185 | */ |
| 186 | 186 | private function generateHeaders(SharingFrame $frame, DeprecatedCircle $circle, $broadcast) { |
| 187 | 187 | |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | * Please use getFrameFromCircle(); |
| 221 | 221 | * |
| 222 | 222 | * @param string $circleUniqueId |
| 223 | - * @param $viewerId |
|
| 223 | + * @param string $viewerId |
|
| 224 | 224 | * |
| 225 | 225 | * @return SharingFrame[] |
| 226 | 226 | * @throws CircleDoesNotExistException |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) { |
| 149 | 149 | |
| 150 | 150 | $this->miscService->log( |
| 151 | - 'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0 |
|
| 151 | + 'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0 |
|
| 152 | 152 | ); |
| 153 | 153 | try { |
| 154 | 154 | $circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId); |
@@ -163,7 +163,7 @@ discard block |
||
| 163 | 163 | $this->initiateShare($circle->getUniqueId(), $frame->getUniqueId()); |
| 164 | 164 | } catch (Exception $e) { |
| 165 | 165 | $this->miscService->log( |
| 166 | - 'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage() |
|
| 166 | + 'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage() |
|
| 167 | 167 | ); |
| 168 | 168 | throw $e; |
| 169 | 169 | } |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | return true; |
| 311 | 311 | } catch (Exception $e) { |
| 312 | 312 | $this->miscService->log( |
| 313 | - 'fail to initialise circle share with request ' . json_encode($request) . ' - ' |
|
| 313 | + 'fail to initialise circle share with request '.json_encode($request).' - ' |
|
| 314 | 314 | . $e->getMessage(), 3 |
| 315 | 315 | ); |
| 316 | 316 | throw $e; |
@@ -569,24 +569,24 @@ |
||
| 569 | 569 | switch ($type) { |
| 570 | 570 | case DeprecatedCircle::CIRCLES_PERSONAL: |
| 571 | 571 | return $urlGen->getAbsoluteURL( |
| 572 | - $urlGen->imagePath(Application::APP_ID, 'personal' . $ext) |
|
| 572 | + $urlGen->imagePath(Application::APP_ID, 'personal'.$ext) |
|
| 573 | 573 | ); |
| 574 | 574 | case DeprecatedCircle::CIRCLES_CLOSED: |
| 575 | 575 | return $urlGen->getAbsoluteURL( |
| 576 | - $urlGen->imagePath(Application::APP_ID, 'closed' . $ext) |
|
| 576 | + $urlGen->imagePath(Application::APP_ID, 'closed'.$ext) |
|
| 577 | 577 | ); |
| 578 | 578 | case DeprecatedCircle::CIRCLES_SECRET: |
| 579 | 579 | return $urlGen->getAbsoluteURL( |
| 580 | - $urlGen->imagePath(Application::APP_ID, 'secret' . $ext) |
|
| 580 | + $urlGen->imagePath(Application::APP_ID, 'secret'.$ext) |
|
| 581 | 581 | ); |
| 582 | 582 | case DeprecatedCircle::CIRCLES_PUBLIC: |
| 583 | 583 | return $urlGen->getAbsoluteURL( |
| 584 | - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) |
|
| 584 | + $urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext) |
|
| 585 | 585 | ); |
| 586 | 586 | } |
| 587 | 587 | |
| 588 | 588 | return $urlGen->getAbsoluteURL( |
| 589 | - $urlGen->imagePath(Application::APP_ID, 'black_circle' . $ext) |
|
| 589 | + $urlGen->imagePath(Application::APP_ID, 'black_circle'.$ext) |
|
| 590 | 590 | ); |
| 591 | 591 | } |
| 592 | 592 | |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | * returns the index of a specific UserID in a Members List |
| 317 | 317 | * |
| 318 | 318 | * @param array $members |
| 319 | - * @param $userId |
|
| 319 | + * @param string $userId |
|
| 320 | 320 | * |
| 321 | 321 | * @return int |
| 322 | 322 | */ |
@@ -656,6 +656,9 @@ discard block |
||
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | |
| 659 | + /** |
|
| 660 | + * @param string $groupId |
|
| 661 | + */ |
|
| 659 | 662 | public function unlinkAllFromGroup($groupId) { |
| 660 | 663 | $qb = $this->getMembersDeleteSql(); |
| 661 | 664 | |
@@ -178,7 +178,7 @@ |
||
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | 180 | * @param array $arr |
| 181 | - * @param $key |
|
| 181 | + * @param string $key |
|
| 182 | 182 | * @param int $type |
| 183 | 183 | * |
| 184 | 184 | * @return null|DeprecatedMember |
@@ -292,7 +292,7 @@ |
||
| 292 | 292 | * @return int |
| 293 | 293 | */ |
| 294 | 294 | public static function convertTypeToConfig(int $type): int { |
| 295 | - switch($type) { |
|
| 295 | + switch ($type) { |
|
| 296 | 296 | case DeprecatedCircle::CIRCLES_PERSONAL: |
| 297 | 297 | return 2; |
| 298 | 298 | case DeprecatedCircle::CIRCLES_SECRET: |
@@ -41,6 +41,9 @@ |
||
| 41 | 41 | class DeprecatedMember extends BaseMember { |
| 42 | 42 | |
| 43 | 43 | |
| 44 | + /** |
|
| 45 | + * @param integer $circleType |
|
| 46 | + */ |
|
| 44 | 47 | public function inviteToCircle($circleType) { |
| 45 | 48 | |
| 46 | 49 | if ($circleType === 0) { |
@@ -31,9 +31,7 @@ |
||
| 31 | 31 | use OCA\Circles\Exceptions\MemberCantJoinCircleException; |
| 32 | 32 | use OCA\Circles\Exceptions\MemberDoesNotExistException; |
| 33 | 33 | use OCA\Circles\Exceptions\MemberIsBlockedException; |
| 34 | -use OCA\Circles\Exceptions\MemberIsNotAdminException; |
|
| 35 | 34 | use OCA\Circles\Exceptions\MemberIsNotModeratorException; |
| 36 | -use OCA\Circles\Exceptions\MemberIsNotOwnerException; |
|
| 37 | 35 | use OCA\Circles\Exceptions\MemberIsOwnerException; |
| 38 | 36 | use OCA\Circles\Exceptions\MemberTypeCantEditLevelException; |
| 39 | 37 | use OCA\Circles\Exceptions\ModeratorIsNotHighEnoughException; |