Skip to content

Commit 2de3247

Browse files
committed
Deps: Updated PHP package versions
Includes major version change of antonioribeiro/google2fa which changes secret length. From manual testing of old MFA secrets and new, this should not be breaking at all.
1 parent 48df2be commit 2de3247

File tree

6 files changed

+68
-69
lines changed

6 files changed

+68
-69
lines changed

app/Access/Mfa/TotpService.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@
1414

1515
class TotpService
1616
{
17-
protected $google2fa;
18-
19-
public function __construct(Google2FA $google2fa)
20-
{
17+
public function __construct(
18+
protected Google2FA $google2fa
19+
) {
2120
$this->google2fa = $google2fa;
2221
// Use SHA1 as a default, Personal testing of other options in 2021 found
2322
// many apps lack support for other algorithms yet still will scan
@@ -35,7 +34,7 @@ public function generateSecret(): string
3534
}
3635

3736
/**
38-
* Generate a TOTP URL from secret key.
37+
* Generate a TOTP URL from a secret key.
3938
*/
4039
public function generateUrl(string $secret, User $user): string
4140
{

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"league/oauth2-client": "^2.6",
3232
"onelogin/php-saml": "^4.3.1",
3333
"phpseclib/phpseclib": "^3.0",
34-
"pragmarx/google2fa": "^8.0",
34+
"pragmarx/google2fa": "^9.0",
3535
"predis/predis": "^3.2",
3636
"socialiteproviders/discord": "^4.1",
3737
"socialiteproviders/gitlab": "^4.1",
@@ -47,7 +47,7 @@
4747
"nunomaduro/collision": "^8.6",
4848
"larastan/larastan": "^v3.0",
4949
"phpunit/phpunit": "^11.5",
50-
"squizlabs/php_codesniffer": "^3.7",
50+
"squizlabs/php_codesniffer": "^4.0.1",
5151
"ssddanbrown/asserthtml": "^3.1"
5252
},
5353
"autoload": {

composer.lock

Lines changed: 59 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/Activity/CommentSettingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Activity;
3+
namespace Tests\Activity;
44

55
use Tests\TestCase;
66

0 commit comments

Comments
 (0)