Skip to content

Commit

Permalink
Merge pull request #708 from nextcloud/dependabot/composer/nextcloud/…
Browse files Browse the repository at this point in the history
…coding-standard-1.3.2

Chore(deps-dev): Bump nextcloud/coding-standard from 1.2.3 to 1.3.2
  • Loading branch information
tcitworld authored Oct 21, 2024
2 parents 2a4850f + 6db1e91 commit 62d5e1a
Show file tree
Hide file tree
Showing 15 changed files with 99 additions and 24 deletions.
59 changes: 53 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion lib/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@

class Capabilities implements IPublicCapability {

public function __construct(private IURLGenerator $urlGenerator) {
public function __construct(
private IURLGenerator $urlGenerator,
) {
}

public function getCapabilities(): array {
Expand Down
2 changes: 1 addition & 1 deletion lib/Controller/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function __construct(
LoginFlowService $loginFlowService,
MailService $mailService,
IEventDispatcher $eventDispatcher,
IInitialState $initialState
IInitialState $initialState,
) {
parent::__construct($appName, $request);
$this->l10n = $l10n;
Expand Down
5 changes: 4 additions & 1 deletion lib/Db/RegistrationMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
use OCP\Security\ISecureRandom;

class RegistrationMapper extends QBMapper {
public function __construct(IDBConnection $db, protected ISecureRandom $random) {
public function __construct(
IDBConnection $db,
protected ISecureRandom $random,
) {
parent::__construct($db, 'registration', Registration::class);
}

Expand Down
5 changes: 4 additions & 1 deletion lib/Events/AFormEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ abstract class AFormEvent extends Event {
public const STEP_VERIFICATION = 'verification';
public const STEP_USER = 'user';

public function __construct(protected string $step, protected string $registrationId = '') {
public function __construct(
protected string $step,
protected string $registrationId = '',
) {
parent::__construct();
}

Expand Down
6 changes: 5 additions & 1 deletion lib/Events/PassedFormEvent.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@

class PassedFormEvent extends AFormEvent {

public function __construct(string $step, string $registrationId = '', protected ?IUser $user = null) {
public function __construct(
string $step,
string $registrationId = '',
protected ?IUser $user = null,
) {
parent::__construct($step, $registrationId);
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Listener/UserEnabledListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

class UserEnabledListener implements IEventListener {

public function __construct(private IConfig $config,
private RegistrationService $registrationService) {
public function __construct(
private IConfig $config,
private RegistrationService $registrationService,
) {
}

public function handle(Event $event): void {
Expand Down
6 changes: 5 additions & 1 deletion lib/RegistrationLoginOption.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@

class RegistrationLoginOption implements IAlternativeLogin {

public function __construct(protected IURLGenerator $url, protected IL10N $l, protected \OC_Defaults $theming) {
public function __construct(
protected IURLGenerator $url,
protected IL10N $l,
protected \OC_Defaults $theming,
) {
}

public function getLabel(): string {
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/LoginFlowService.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class LoginFlowService {
public function __construct(
protected IRequest $request,
protected ISession $session,
protected LoginFlowV2Service $loginFlowV2Service
protected LoginFlowV2Service $loginFlowV2Service,
) {
}

Expand Down
5 changes: 3 additions & 2 deletions lib/Service/MailService.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public function __construct(
private IGroupManager $groupManager,
private IConfig $config,
private LoginFlowService $loginFlowService,
private LoggerInterface $logger) {
private LoggerInterface $logger,
) {
}

/**
Expand Down Expand Up @@ -130,7 +131,7 @@ public function notifyAdmins(string $userId, ?string $userEMailAddress, bool $us
try {
$this->sendNewUserNotifyEmail([$email => $adminUser->getDisplayName()], $userId, $userEMailAddress, $userIsEnabled, $language);
} catch (\Exception $e) {
$this->logger->error('Sending admin notification email failed: '. $e->getMessage());
$this->logger->error('Sending admin notification email failed: ' . $e->getMessage());
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion lib/Service/RegistrationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
namespace OCA\Registration\Service;

class RegistrationException extends \Exception {
public function __construct(string $message, protected string $hint = '', int $code = 400) {
public function __construct(
string $message,
protected string $hint = '',
int $code = 400,
) {
parent::__construct($message, $code);
}

Expand Down
2 changes: 1 addition & 1 deletion lib/Service/RegistrationService.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function __construct(
private LoggerInterface $logger,
private ISession $session,
private IProvider $tokenProvider,
private ICrypto $crypto
private ICrypto $crypto,
) {
}

Expand Down
6 changes: 4 additions & 2 deletions lib/Settings/RegistrationSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@

class RegistrationSettings implements ISettings {

public function __construct(protected string $appName,
public function __construct(
protected string $appName,
private IConfig $config,
private IGroupManager $groupManager,
private IInitialState $initialState) {
private IInitialState $initialState,
) {
}

public function getForm(): TemplateResponse {
Expand Down
5 changes: 4 additions & 1 deletion lib/Settings/RegistrationSettingsSection.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
use OCP\Settings\IIconSection;

class RegistrationSettingsSection implements IIconSection {
public function __construct(private IL10N $l10n, private IURLGenerator $urlGenerator) {
public function __construct(
private IL10N $l10n,
private IURLGenerator $urlGenerator,
) {
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

require_once __DIR__.'/../../../tests/bootstrap.php';
require_once __DIR__.'/../vendor/autoload.php';
require_once __DIR__ . '/../../../tests/bootstrap.php';
require_once __DIR__ . '/../vendor/autoload.php';

0 comments on commit 62d5e1a

Please sign in to comment.