Skip to content

Commit 2bbad99

Browse files
author
roadiz-ci
committed
chore: bumped
1 parent 31405f7 commit 2bbad99

16 files changed

+106
-135
lines changed

‎.github/workflows/run-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
strategy:
2121
matrix:
22-
php-version: ['8.3', '8.4']
22+
php-version: ['8.2', '8.3']
2323
steps:
2424
- uses: shivammathur/setup-php@v2
2525
with:

‎LICENSE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright © 2025 Ambroise Maupate
3+
Copyright © 2024 Ambroise Maupate
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

‎composer.json‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,30 @@
2020
"minimum-stability": "dev",
2121
"prefer-stable": true,
2222
"require": {
23-
"php": ">=8.3",
23+
"php": ">=8.2",
2424
"doctrine/orm": "~2.20.0",
2525
"endroid/qr-code": "^4.0",
26-
"roadiz/core-bundle": "2.6.*",
27-
"roadiz/rozier-bundle": "2.6.*",
26+
"roadiz/core-bundle": "2.5.*",
27+
"roadiz/rozier": "2.5.*",
28+
"roadiz/rozier-bundle": "2.5.*",
2829
"scheb/2fa-backup-code": "^7.5",
2930
"scheb/2fa-bundle": "^7.5",
3031
"scheb/2fa-google-authenticator": "^7.5",
3132
"scheb/2fa-totp": "^7.5",
3233
"scheb/2fa-trusted-device": "^7.5",
33-
"symfony/framework-bundle": "7.3.*"
34+
"symfony/framework-bundle": "6.4.*"
3435
},
3536
"require-dev": {
3637
"php-coveralls/php-coveralls": "^2.4",
3738
"phpstan/phpstan": "^1.5.3",
3839
"phpstan/phpdoc-parser": "<2",
3940
"phpstan/phpstan-doctrine": "^1.3",
40-
"phpunit/phpunit": "^9.6",
41-
"roadiz/doc-generator": "2.6.*",
42-
"roadiz/entity-generator": "2.6.*",
43-
"roadiz/jwt": "2.6.*",
44-
"roadiz/random": "2.6.*",
45-
"symfony/stopwatch": "7.3.*"
41+
"phpunit/phpunit": "^9.5",
42+
"roadiz/doc-generator": "2.5.*",
43+
"roadiz/entity-generator": "2.5.*",
44+
"roadiz/jwt": "2.5.*",
45+
"roadiz/random": "2.5.*",
46+
"symfony/stopwatch": "6.4.*"
4647
},
4748
"config": {
4849
"optimize-autoloader": true,
@@ -69,8 +70,8 @@
6970
},
7071
"extra": {
7172
"branch-alias": {
72-
"dev-main": "2.6.x-dev",
73-
"dev-develop": "2.7.x-dev"
73+
"dev-main": "2.5.x-dev",
74+
"dev-develop": "2.6.x-dev"
7475
}
7576
}
7677
}

‎src/Backup/BackupCodeManager.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public function __construct(
1818
) {
1919
}
2020

21-
#[\Override]
2221
public function isBackupCode(object $user, string $code): bool
2322
{
2423
if ($user instanceof User) {
@@ -32,7 +31,6 @@ public function isBackupCode(object $user, string $code): bool
3231
return false;
3332
}
3433

35-
#[\Override]
3634
public function invalidateBackupCode(object $user, string $code): void
3735
{
3836
if ($user instanceof User) {

‎src/Console/DisableTwoFactorUserCommand.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
)]
1818
final class DisableTwoFactorUserCommand extends UsersCommand
1919
{
20-
#[\Override]
2120
protected function configure(): void
2221
{
2322
$this->addArgument(
@@ -27,7 +26,6 @@ protected function configure(): void
2726
);
2827
}
2928

30-
#[\Override]
3129
protected function execute(InputInterface $input, OutputInterface $output): int
3230
{
3331
$io = new SymfonyStyle($input, $output);

‎src/Console/UsersCommand.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public function __construct(
2323
parent::__construct($managerRegistry, $name);
2424
}
2525

26-
#[\Override]
2726
protected function getUserTableRow(User $user): array
2827
{
2928
$twoFactorUser = $this->twoFactorUserProvider->getFromUser($user);

‎src/DependencyInjection/Compiler/DoctrineMigrationCompilerPass.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
class DoctrineMigrationCompilerPass implements CompilerPassInterface
1111
{
12-
#[\Override]
1312
public function process(ContainerBuilder $container): void
1413
{
1514
if ($container->hasDefinition('doctrine.migrations.configuration')) {

‎src/DependencyInjection/RoadizTwoFactorExtension.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
class RoadizTwoFactorExtension extends Extension
1313
{
14-
#[\Override]
1514
public function getAlias(): string
1615
{
1716
return 'roadiz_two_factor';
@@ -20,7 +19,6 @@ public function getAlias(): string
2019
/**
2120
* @throws \Exception
2221
*/
23-
#[\Override]
2422
public function load(array $configs, ContainerBuilder $container): void
2523
{
2624
$loader = new YamlFileLoader($container, new FileLocator(dirname(__DIR__).'/../config'));

‎src/Entity/TwoFactorUser.php‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,11 @@ public function setDigits(?int $digits): TwoFactorUser
121121
return $this;
122122
}
123123

124-
#[\Override]
125124
public function isTotpAuthenticationEnabled(): bool
126125
{
127126
return (bool) $this->secret && null !== $this->activatedAt;
128127
}
129128

130-
#[\Override]
131129
public function getTotpAuthenticationUsername(): string
132130
{
133131
if (null === $this->user) {
@@ -137,14 +135,12 @@ public function getTotpAuthenticationUsername(): string
137135
return $this->user->getUserIdentifier();
138136
}
139137

140-
#[\Override]
141138
public function getTotpAuthenticationConfiguration(): ?TotpConfigurationInterface
142139
{
143140
// You could persist the other configuration options in the user entity to make it individual per user.
144141
return new TotpConfiguration($this->secret, $this->getAlgorithm(), $this->getPeriod(), $this->getDigits());
145142
}
146143

147-
#[\Override]
148144
public function isGoogleAuthenticatorEnabled(): bool
149145
{
150146
return (bool) $this->secret
@@ -155,7 +151,6 @@ public function isGoogleAuthenticatorEnabled(): bool
155151
;
156152
}
157153

158-
#[\Override]
159154
public function getGoogleAuthenticatorUsername(): string
160155
{
161156
if (null === $this->user) {
@@ -165,7 +160,6 @@ public function getGoogleAuthenticatorUsername(): string
165160
return $this->user->getUserIdentifier();
166161
}
167162

168-
#[\Override]
169163
public function getGoogleAuthenticatorSecret(): ?string
170164
{
171165
return $this->secret;
@@ -174,12 +168,11 @@ public function getGoogleAuthenticatorSecret(): ?string
174168
/**
175169
* Check if it is a valid backup code.
176170
*/
177-
#[\Override]
178171
public function isBackupCode(string $code): bool
179172
{
180173
// Loop over all backup codes and check if the code is valid
181174
foreach ($this->backupCodes as $backupCode) {
182-
if (password_verify($code, (string) $backupCode)) {
175+
if (password_verify($code, $backupCode)) {
183176
return true;
184177
}
185178
}
@@ -190,12 +183,11 @@ public function isBackupCode(string $code): bool
190183
/**
191184
* Invalidate a backup code.
192185
*/
193-
#[\Override]
194186
public function invalidateBackupCode(string $code): void
195187
{
196188
// Loop over all backup codes and check if the code is valid to invalidate it
197189
foreach ($this->backupCodes as $key => $backupCode) {
198-
if (password_verify($code, (string) $backupCode)) {
190+
if (password_verify($code, $backupCode)) {
199191
unset($this->backupCodes[$key]);
200192
$this->backupCodes = array_values($this->backupCodes);
201193
}
@@ -212,7 +204,6 @@ public function addBackUpCode(string $backUpCode): void
212204
}
213205
}
214206

215-
#[\Override]
216207
public function getTrustedTokenVersion(): int
217208
{
218209
return $this->trustedVersion;

‎src/EventSubscriber/UserActionsMenuEventSubscriber.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace RZ\Roadiz\TwoFactorBundle\EventSubscriber;
66

7-
use RZ\Roadiz\RozierBundle\Event\UserActionsMenuEvent;
87
use Symfony\Bundle\SecurityBundle\Security;
98
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
109
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
10+
use Themes\Rozier\Event\UserActionsMenuEvent;
1111

1212
final readonly class UserActionsMenuEventSubscriber implements EventSubscriberInterface
1313
{
@@ -17,7 +17,6 @@ public function __construct(
1717
) {
1818
}
1919

20-
#[\Override]
2120
public static function getSubscribedEvents(): array
2221
{
2322
return [

0 commit comments

Comments
 (0)