Skip to content

Commit

Permalink
Merge pull request #531 from nextcloud/renovate/nextcloud-coding-stan…
Browse files Browse the repository at this point in the history
…dard-1.x

fix(deps): bump nextcloud/coding-standard from 1.1.1 to ^1.2.1
  • Loading branch information
st3iny authored Feb 6, 2024
2 parents cc1016a + 1dd586f commit c092046
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion lib/Activity/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function __construct(L10nFactory $l10n, IURLGenerator $urlGenerator, ILog
* @return IEvent
* @throws InvalidArgumentException
*/
public function parse($language, IEvent $event, IEvent $previousEvent = null) {
public function parse($language, IEvent $event, ?IEvent $previousEvent = null) {
if ($event->getApp() !== 'twofactor_webauthn') {
throw new InvalidArgumentException();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
}, $credentials);
}

public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, string $name = null): void {
public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null): void {
$name = $this->getName($publicKeyCredentialSource, $name);
$entity = PublicKeyCredentialEntity::fromPublicKeyCrendentialSource(
$name,
Expand All @@ -100,7 +100,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
$this->publicKeyCredentialEntityMapper->insertOrUpdate($entity);
}

private function getName(PublicKeyCredentialSource $publicKeyCredentialSource, string $name = null): string {
private function getName(PublicKeyCredentialSource $publicKeyCredentialSource, ?string $name = null): string {
if ($name !== null) {
return $name;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/U2FMigrator.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class U2FMigrator {
* @return false|string
*/
private function base64_urlsafe_decode(string $data) {
return base64_decode(str_replace(array('-', '_'), array('+', '/'), $data));
return base64_decode(str_replace(['-', '_'], ['+', '/'], $data));
}

private function zeroUuid(): UuidInterface {
Expand Down
2 changes: 1 addition & 1 deletion vendor-bin/cs-fixer/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"nextcloud/coding-standard": "^1.1.1"
"nextcloud/coding-standard": "^1.2.1"
},
"config": {
"optimize-autoloader": true,
Expand Down
26 changes: 13 additions & 13 deletions vendor-bin/cs-fixer/composer.lock

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

0 comments on commit c092046

Please sign in to comment.