From e624995ebc72383164b099f8dd7f5d4704ef8923 Mon Sep 17 00:00:00 2001 From: Bubka <858858+Bubka@users.noreply.github.com> Date: Thu, 27 Mar 2025 17:19:57 +0100 Subject: [PATCH] Fix pint issues --- app/Api/v1/Controllers/GroupController.php | 3 +-- app/Api/v1/Requests/GroupStoreRequest.php | 2 +- app/Events/GroupDeleted.php | 2 +- app/Helpers/Helpers.php | 6 +++--- app/Http/Controllers/SinglePageController.php | 2 +- app/Models/Group.php | 7 +++---- app/Models/TwoFAccount.php | 12 +++++------- app/Models/User.php | 2 +- app/Services/GroupService.php | 4 ++-- tests/Api/v1/Controllers/Auth/UserControllerTest.php | 10 +++++----- tests/Unit/GroupModelTest.php | 2 +- tests/Unit/HelpersTest.php | 2 +- 12 files changed, 25 insertions(+), 29 deletions(-) diff --git a/app/Api/v1/Controllers/GroupController.php b/app/Api/v1/Controllers/GroupController.php index 9e8a3920..206ccad3 100644 --- a/app/Api/v1/Controllers/GroupController.php +++ b/app/Api/v1/Controllers/GroupController.php @@ -131,8 +131,7 @@ class GroupController extends Controller // are not assigned to any group record. if ($group->id === 0) { $twofaccounts = $request->user()->twofaccounts; - } - else { + } else { $twofaccounts = $group->twofaccounts; } diff --git a/app/Api/v1/Requests/GroupStoreRequest.php b/app/Api/v1/Requests/GroupStoreRequest.php index ffb87716..d42c742a 100644 --- a/app/Api/v1/Requests/GroupStoreRequest.php +++ b/app/Api/v1/Requests/GroupStoreRequest.php @@ -41,7 +41,7 @@ class GroupStoreRequest extends FormRequest * * @return array */ - public function messages(): array + public function messages() : array { return [ 'name.not_in' => __('errors.reserved_name_please_choose_something_else'), diff --git a/app/Events/GroupDeleted.php b/app/Events/GroupDeleted.php index d7b50c58..ebbaf998 100644 --- a/app/Events/GroupDeleted.php +++ b/app/Events/GroupDeleted.php @@ -25,7 +25,7 @@ class GroupDeleted public function __construct(Group $group) { $this->group = $group; - + Log::info(sprintf('Group %s (id #%d) deleted ', var_export($group->name, true), $group->id)); } } diff --git a/app/Helpers/Helpers.php b/app/Helpers/Helpers.php index 77bd5325..0c5d7db6 100644 --- a/app/Helpers/Helpers.php +++ b/app/Helpers/Helpers.php @@ -57,14 +57,14 @@ class Helpers public static function lockedPreferences(array $preferences) : array { foreach ($preferences as $key => $value) { - $_key = $key === 'revealDottedOTP' ? 'revealDottedOtp' : $key; + $_key = $key === 'revealDottedOTP' ? 'revealDottedOtp' : $key; $isLocked = envUnlessEmpty(Str::of($_key)->snake('_')->upper()->prepend('USERPREF_LOCKED__')->toString(), false); - + if ($isLocked) { $lockedPreferences[] = $key; } } - + return $lockedPreferences ?? []; } } diff --git a/app/Http/Controllers/SinglePageController.php b/app/Http/Controllers/SinglePageController.php index 209cff97..3561f02e 100644 --- a/app/Http/Controllers/SinglePageController.php +++ b/app/Http/Controllers/SinglePageController.php @@ -28,7 +28,7 @@ class SinglePageController extends Controller $publicSettings = $appSettings->only([ 'disableRegistration', 'enableSso', - 'useSsoOnly' + 'useSsoOnly', ]); $settings = $appSettings->map(function (mixed $item, string $key) { return null; diff --git a/app/Models/Group.php b/app/Models/Group.php index 14c4635b..0d677e75 100644 --- a/app/Models/Group.php +++ b/app/Models/Group.php @@ -78,7 +78,7 @@ class Group extends Model * @var array */ protected $dispatchesEvents = [ - 'deleted' => GroupDeleted::class, + 'deleted' => GroupDeleted::class, ]; /** @@ -97,7 +97,7 @@ class Group extends Model Log::info(sprintf('Group %s (id #%d) updated by user ID #%s', var_export($model->name, true), $model->id, $model->user_id)); }); } - + /** * Retrieve the model for a bound value. * @@ -117,8 +117,7 @@ class Group extends Model $group->id = 0; return $group; - } - else { + } else { return parent::resolveRouteBinding($value, $field); } } diff --git a/app/Models/TwoFAccount.php b/app/Models/TwoFAccount.php index 17baae80..0661f108 100644 --- a/app/Models/TwoFAccount.php +++ b/app/Models/TwoFAccount.php @@ -427,16 +427,14 @@ class TwoFAccount extends Model implements Sortable $this->save(); } } else { - $OtpDto = new TotpDto; - $OtpDto->otp_type = $this->otp_type; - $OtpDto->generated_at = $time ?: time(); - $expires_in = $this->generator->expiresIn(); /** @phpstan-ignore-line - expiresIn() is in the TOTPInterface only */ - + $OtpDto = new TotpDto; + $OtpDto->otp_type = $this->otp_type; + $OtpDto->generated_at = $time ?: time(); + $expires_in = $this->generator->expiresIn(); /** @phpstan-ignore-line - expiresIn() is in the TOTPInterface only */ if ($this->otp_type === self::TOTP) { $OtpDto->password = $this->generator->at($OtpDto->generated_at); $OtpDto->next_password = $this->generator->at($OtpDto->generated_at + $expires_in + 2); - } - else { + } else { $OtpDto->password = SteamTotp::getAuthCode(base64_encode(Base32::decodeUpper($this->secret))); $OtpDto->next_password = SteamTotp::getAuthCode(base64_encode(Base32::decodeUpper($this->secret)), $expires_in + 2); } diff --git a/app/Models/User.php b/app/Models/User.php index 9af631ca..47a97dfa 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -212,7 +212,7 @@ class User extends Authenticatable implements HasLocalePreference, WebAuthnAuthe public function getPreferencesAttribute($value) { $preferences = collect(config('2fauth.preferences'))->merge(json_decode($value)); /** @phpstan-ignore-line */ - + return $preferences; } diff --git a/app/Services/GroupService.php b/app/Services/GroupService.php index 79d8f59c..f6b5205c 100644 --- a/app/Services/GroupService.php +++ b/app/Services/GroupService.php @@ -61,7 +61,7 @@ class GroupService DB::transaction(function () use ($group, $ids, $user) { $group = Group::sharedLock()->find($group->id); $twofaccounts = TwoFAccount::sharedLock()->find($ids); - + if (! $group) { throw new ModelNotFoundException('group no longer exists'); } @@ -71,7 +71,7 @@ class GroupService } $group->twofaccounts()->saveMany($twofaccounts); - + Log::info(sprintf('Twofaccounts #%s assigned to group %s (ID #%s)', implode(',', $ids), var_export($group->name, true), $group->id)); }, 5); } else { diff --git a/tests/Api/v1/Controllers/Auth/UserControllerTest.php b/tests/Api/v1/Controllers/Auth/UserControllerTest.php index 9242b48b..3b467a00 100644 --- a/tests/Api/v1/Controllers/Auth/UserControllerTest.php +++ b/tests/Api/v1/Controllers/Auth/UserControllerTest.php @@ -120,8 +120,8 @@ class UserControllerTest extends FeatureTestCase ->json('GET', '/api/v1/user/preferences/showOtpAsDot') ->assertOk() ->assertExactJson([ - 'key' => 'showOtpAsDot', - 'value' => config('2fauth.preferences.showOtpAsDot'), + 'key' => 'showOtpAsDot', + 'value' => config('2fauth.preferences.showOtpAsDot'), 'locked' => false, ]); } @@ -130,7 +130,7 @@ class UserControllerTest extends FeatureTestCase public function test_showPreference_returns_preference_with_locked_default_env_value() { // See .env.testing which sets USERPREF_DEFAULT__THEME=light - // while config/2fauth.php sets the default value to 'system' + // while config/2fauth.php sets the default value to 'system' /** * @var \App\Models\User|\Illuminate\Contracts\Auth\Authenticatable @@ -141,8 +141,8 @@ class UserControllerTest extends FeatureTestCase ->json('GET', '/api/v1/user/preferences/theme') ->assertOk() ->assertExactJson([ - 'key' => 'theme', - 'value' => 'light', + 'key' => 'theme', + 'value' => 'light', 'locked' => true, ]); } diff --git a/tests/Unit/GroupModelTest.php b/tests/Unit/GroupModelTest.php index 05716e9a..e770a5b2 100644 --- a/tests/Unit/GroupModelTest.php +++ b/tests/Unit/GroupModelTest.php @@ -31,7 +31,7 @@ class GroupModelTest extends ModelTestCase 'user_id' => 'integer', ], [ - 'deleted' => GroupDeleted::class, + 'deleted' => GroupDeleted::class, ] ); } diff --git a/tests/Unit/HelpersTest.php b/tests/Unit/HelpersTest.php index 242d19f1..fe768e1e 100644 --- a/tests/Unit/HelpersTest.php +++ b/tests/Unit/HelpersTest.php @@ -223,7 +223,7 @@ class HelpersTest extends TestCase public function test_lockedPreferences_returns_locked_preferences() { // See .env.testing which sets USERPREF_DEFAULT__THEME=light - // while config/2fauth.php sets the default value to 'system' + // while config/2fauth.php sets the default value to 'system' $lockedPreferences = Helpers::lockedPreferences(config('2fauth.preferences')); $this->assertContains('theme', $lockedPreferences);