@@ -85,13 +85,13 @@ discard block |
||
| 85 | 85 | return new Card( |
| 86 | 86 | $this->mapper->find( |
| 87 | 87 | $this->getUid(), |
| 88 | - (int)$name |
|
| 88 | + (int) $name |
|
| 89 | 89 | ), |
| 90 | 90 | $this->principalUri, |
| 91 | 91 | $this->getACL() |
| 92 | 92 | ); |
| 93 | 93 | } catch (DoesNotExistException $ex) { |
| 94 | - throw new NotFound("Contact does not exist: " . $ex->getMessage(), 0, $ex); |
|
| 94 | + throw new NotFound("Contact does not exist: ".$ex->getMessage(), 0, $ex); |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | */ |
| 101 | 101 | public function getChildren(): array { |
| 102 | 102 | return array_map( |
| 103 | - function (RecentContact $contact) { |
|
| 103 | + function(RecentContact $contact) { |
|
| 104 | 104 | return new Card( |
| 105 | 105 | $contact, |
| 106 | 106 | $this->principalUri, |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | try { |
| 119 | 119 | $this->mapper->find( |
| 120 | 120 | $this->getUid(), |
| 121 | - (int)$name |
|
| 121 | + (int) $name |
|
| 122 | 122 | ); |
| 123 | 123 | return true; |
| 124 | 124 | } catch (DoesNotExistException $e) { |
@@ -147,8 +147,8 @@ discard block |
||
| 147 | 147 | return [ |
| 148 | 148 | 'principaluri' => $this->principalUri, |
| 149 | 149 | '{DAV:}displayname' => $this->l10n->t('Recently contacted'), |
| 150 | - '{' . Plugin::NS_OWNCLOUD . '}read-only' => true, |
|
| 151 | - '{' . \OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($this->getLastModified() ?? 0), |
|
| 150 | + '{'.Plugin::NS_OWNCLOUD.'}read-only' => true, |
|
| 151 | + '{'.\OCA\DAV\CalDAV\Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($this->getLastModified() ?? 0), |
|
| 152 | 152 | ]; |
| 153 | 153 | } |
| 154 | 154 | |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | * @inheritDoc |
| 96 | 96 | */ |
| 97 | 97 | public function getETag(): ?string { |
| 98 | - return '"' . md5((string) $this->getLastModified()) . '"'; |
|
| 98 | + return '"'.md5((string) $this->getLastModified()).'"'; |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | |
| 41 | 41 | public function afterController($controller, $methodName, Response $response) { |
| 42 | 42 | $etagHeader = $this->request->getHeader('IF_NONE_MATCH'); |
| 43 | - if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"' . $response->getETag() . '"') { |
|
| 43 | + if ($etagHeader !== '' && $response->getETag() !== null && trim($etagHeader) === '"'.$response->getETag().'"') { |
|
| 44 | 44 | $response->setStatus(Http::STATUS_NOT_MODIFIED); |
| 45 | 45 | return $response; |
| 46 | 46 | } |
@@ -31,20 +31,20 @@ |
||
| 31 | 31 | |
| 32 | 32 | require '../3rdparty/autoload.php'; |
| 33 | 33 | |
| 34 | -$locales = array_map(static function (string $localeCode) { |
|
| 34 | +$locales = array_map(static function(string $localeCode) { |
|
| 35 | 35 | return [ |
| 36 | 36 | 'code' => $localeCode, |
| 37 | 37 | 'name' => Locale::getDisplayName($localeCode, 'en') |
| 38 | 38 | ]; |
| 39 | 39 | }, ResourceBundle::getLocales('')); |
| 40 | 40 | |
| 41 | -$locales = array_filter($locales, static function (array $locale) { |
|
| 41 | +$locales = array_filter($locales, static function(array $locale) { |
|
| 42 | 42 | return is_array(Punic\Data::explodeLocale($locale['code'])); |
| 43 | 43 | }); |
| 44 | 44 | |
| 45 | 45 | $locales = array_values($locales); |
| 46 | 46 | |
| 47 | -if (file_put_contents(__DIR__ . '/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) { |
|
| 47 | +if (file_put_contents(__DIR__.'/locales.json', json_encode($locales, JSON_PRETTY_PRINT)) === false) { |
|
| 48 | 48 | echo 'Failed to update locales.json'; |
| 49 | 49 | exit(1); |
| 50 | 50 | } |
@@ -97,20 +97,20 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | $cachedGroups = &$this->cachedGroups; |
| 99 | 99 | $cachedUserGroups = &$this->cachedUserGroups; |
| 100 | - $this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) { |
|
| 100 | + $this->listen('\OC\Group', 'postDelete', function($group) use (&$cachedGroups, &$cachedUserGroups) { |
|
| 101 | 101 | /** |
| 102 | 102 | * @var \OC\Group\Group $group |
| 103 | 103 | */ |
| 104 | 104 | unset($cachedGroups[$group->getGID()]); |
| 105 | 105 | $cachedUserGroups = []; |
| 106 | 106 | }); |
| 107 | - $this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) { |
|
| 107 | + $this->listen('\OC\Group', 'postAddUser', function($group) use (&$cachedUserGroups) { |
|
| 108 | 108 | /** |
| 109 | 109 | * @var \OC\Group\Group $group |
| 110 | 110 | */ |
| 111 | 111 | $cachedUserGroups = []; |
| 112 | 112 | }); |
| 113 | - $this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) { |
|
| 113 | + $this->listen('\OC\Group', 'postRemoveUser', function($group) use (&$cachedUserGroups) { |
|
| 114 | 114 | /** |
| 115 | 115 | * @var \OC\Group\Group $group |
| 116 | 116 | */ |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | if ($aGroup instanceof IGroup) { |
| 251 | 251 | $groups[$groupId] = $aGroup; |
| 252 | 252 | } else { |
| 253 | - $this->logger->debug('Group "' . $groupId . '" was returned by search but not found through direct access', ['app' => 'core']); |
|
| 253 | + $this->logger->debug('Group "'.$groupId.'" was returned by search but not found through direct access', ['app' => 'core']); |
|
| 254 | 254 | } |
| 255 | 255 | } |
| 256 | 256 | if (!is_null($limit) and $limit <= 0) { |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | if ($aGroup instanceof IGroup) { |
| 284 | 284 | $groups[$groupId] = $aGroup; |
| 285 | 285 | } else { |
| 286 | - $this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']); |
|
| 286 | + $this->logger->debug('User "'.$uid.'" belongs to deleted group: "'.$groupId.'"', ['app' => 'core']); |
|
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | * @return array ['displayName' => displayname] |
| 352 | 352 | */ |
| 353 | 353 | public function getUserGroupNames(IUser $user) { |
| 354 | - return array_map(function ($group) { |
|
| 354 | + return array_map(function($group) { |
|
| 355 | 355 | return ['displayName' => $group->getDisplayName()]; |
| 356 | 356 | }, $this->getUserGroups($user)); |
| 357 | 357 | } |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | $ip = $input->getArgument('ipaddress'); |
| 54 | 54 | |
| 55 | 55 | if (!filter_var($ip, FILTER_VALIDATE_IP)) { |
| 56 | - $output->writeln('<error>"' . $ip . '" is not a valid IP address</error>'); |
|
| 56 | + $output->writeln('<error>"'.$ip.'" is not a valid IP address</error>'); |
|
| 57 | 57 | return 1; |
| 58 | 58 | } |
| 59 | 59 | |
@@ -461,7 +461,7 @@ discard block |
||
| 461 | 461 | // Failed, maybe the user used their email address |
| 462 | 462 | $users = $this->manager->getByEmail($user); |
| 463 | 463 | if (!(\count($users) === 1 && $this->login($users[0]->getUID(), $password))) { |
| 464 | - $this->logger->warning('Login failed: \'' . $user . '\' (Remote IP: \'' . \OC::$server->getRequest()->getRemoteAddress() . '\')', ['app' => 'core']); |
|
| 464 | + $this->logger->warning('Login failed: \''.$user.'\' (Remote IP: \''.\OC::$server->getRequest()->getRemoteAddress().'\')', ['app' => 'core']); |
|
| 465 | 465 | |
| 466 | 466 | $throttler->registerAttempt('login', $request->getRemoteAddress(), ['user' => $user]); |
| 467 | 467 | |
@@ -533,7 +533,7 @@ discard block |
||
| 533 | 533 | } catch (InvalidTokenException $ex) { |
| 534 | 534 | $this->logger->logException($ex, [ |
| 535 | 535 | 'level' => ILogger::DEBUG, |
| 536 | - 'message' => 'Token is not valid: ' . $ex->getMessage(), |
|
| 536 | + 'message' => 'Token is not valid: '.$ex->getMessage(), |
|
| 537 | 537 | ]); |
| 538 | 538 | return false; |
| 539 | 539 | } |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | // trigger any other initialization |
| 566 | - \OC::$server->getEventDispatcher()->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser())); |
|
| 566 | + \OC::$server->getEventDispatcher()->dispatch(IUser::class.'::firstLogin', new GenericEvent($this->getUser())); |
|
| 567 | 567 | } |
| 568 | 568 | } |
| 569 | 569 | |
@@ -725,7 +725,7 @@ discard block |
||
| 725 | 725 | private function checkTokenCredentials(IToken $dbToken, $token) { |
| 726 | 726 | // Check whether login credentials are still valid and the user was not disabled |
| 727 | 727 | // This check is performed each 5 minutes |
| 728 | - $lastCheck = $dbToken->getLastCheck() ? : 0; |
|
| 728 | + $lastCheck = $dbToken->getLastCheck() ?: 0; |
|
| 729 | 729 | $now = $this->timeFactory->getTime(); |
| 730 | 730 | if ($lastCheck > ($now - 60 * 5)) { |
| 731 | 731 | // Checked performed recently, nothing to do now |
@@ -985,9 +985,9 @@ discard block |
||
| 985 | 985 | setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT, '', $secureCookie, true); |
| 986 | 986 | // old cookies might be stored under /webroot/ instead of /webroot |
| 987 | 987 | // and Firefox doesn't like it! |
| 988 | - setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true); |
|
| 989 | - setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true); |
|
| 990 | - setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT . '/', '', $secureCookie, true); |
|
| 988 | + setcookie('nc_username', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT.'/', '', $secureCookie, true); |
|
| 989 | + setcookie('nc_token', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT.'/', '', $secureCookie, true); |
|
| 990 | + setcookie('nc_session_id', '', $this->timeFactory->getTime() - 3600, OC::$WEBROOT.'/', '', $secureCookie, true); |
|
| 991 | 991 | } |
| 992 | 992 | |
| 993 | 993 | /** |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | if (isset($context[$name])) { |
| 71 | 71 | $context = $context[$name]; |
| 72 | 72 | } else { |
| 73 | - throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set'); |
|
| 73 | + throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set'); |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) { |
| 76 | 76 | $this->sftp = $context['session']; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | public function stream_open($path, $mode, $options, &$opened_path) { |
| 84 | 84 | [, $path] = explode('://', $path); |
| 85 | - $path = '/' . ltrim($path); |
|
| 85 | + $path = '/'.ltrim($path); |
|
| 86 | 86 | $path = str_replace('//', '/', $path); |
| 87 | 87 | |
| 88 | 88 | $this->loadContext('sftp'); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | if (isset($context[$name])) { |
| 71 | 71 | $context = $context[$name]; |
| 72 | 72 | } else { |
| 73 | - throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set'); |
|
| 73 | + throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set'); |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) { |
| 76 | 76 | $this->sftp = $context['session']; |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | |
| 83 | 83 | public function stream_open($path, $mode, $options, &$opened_path) { |
| 84 | 84 | [, $path] = explode('://', $path); |
| 85 | - $path = '/' . ltrim($path); |
|
| 85 | + $path = '/'.ltrim($path); |
|
| 86 | 86 | $path = str_replace('//', '/', $path); |
| 87 | 87 | |
| 88 | 88 | $this->loadContext('sftp'); |