Apply Laravel Pint fixes

app/Api/v1/Controllers/TwoFAccountController.php

@@ -15,9 +15,9 @@ use App\Api\v1\Resources\TwoFAccountReadResource;
 use App\Api\v1\Resources\TwoFAccountStoreResource;
 use App\Facades\Groups;
 use App\Facades\TwoFAccounts;
+use App\Helpers\Helpers;
 use App\Http\Controllers\Controller;
 use App\Models\TwoFAccount;
-use App\Helpers\Helpers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 

app/Api/v1/Requests/GroupStoreRequest.php

@@ -30,8 +30,8 @@ class GroupStoreRequest extends FormRequest
                 'required',
                 'string',
                 'max:32',
-                Rule::unique('groups')->where(fn ($query) => $query->where('user_id', $this->user()->id))
+                Rule::unique('groups')->where(fn ($query) => $query->where('user_id', $this->user()->id)),
-            ]
+            ],
         ];
     }
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -7,9 +7,9 @@ use App\Http\Requests\UserStoreRequest;
 use App\Models\User;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\DB;
 
 class RegisterController extends Controller
 {

app/Http/Controllers/Auth/WebAuthnLoginController.php

@@ -47,8 +47,8 @@ class WebAuthnLoginController extends Controller
             'email' => [
                 'required',
                 'email',
-                new \App\Rules\CaseInsensitiveEmailExists
+                new \App\Rules\CaseInsensitiveEmailExists,
-            ]
+            ],
         ]));
     }
 

app/Http/Kernel.php

@@ -72,7 +72,7 @@ class Kernel extends HttpKernel
      */
     protected $routeMiddleware = [
         'auth'                 => \App\Http\Middleware\Authenticate::class,
-        'admin'                 => \App\Http\Middleware\AdminOnly::class,
+        'admin'                => \App\Http\Middleware\AdminOnly::class,
         'guest'                => \App\Http\Middleware\RejectIfAuthenticated::class,
         'SkipIfAuthenticated'  => \App\Http\Middleware\SkipIfAuthenticated::class,
         'throttle'             => \Illuminate\Routing\Middleware\ThrottleRequests::class,

app/Http/Middleware/AdminOnly.php

@@ -3,8 +3,8 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Facades\Auth;
 
 class AdminOnly
 {

app/Http/Middleware/Authenticate.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Support\Facades\App;
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Support\Facades\App;
 
 class Authenticate extends Middleware
 {
@@ -38,7 +38,7 @@ class Authenticate extends Middleware
                 // by the SetLanguage global middleware
                 $lang = $this->auth->guard()->user()->preferences['lang'] ?? null;
 
-                if ($lang && in_array($lang, config('2fauth.locales')) && !App::isLocale($lang)) {
+                if ($lang && in_array($lang, config('2fauth.locales')) && ! App::isLocale($lang)) {
                     App::setLocale($lang);
                 }
 

app/Http/Middleware/KickOutInactiveUser.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Middleware;
 
-use App\Facades\Settings;
 use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Response;

app/Http/Middleware/SetLanguage.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Support\Facades\Auth;
 use Closure;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Auth;
 
 class SetLanguage
 {
@@ -33,13 +33,14 @@ class SetLanguage
                 array_diff(explode(',', $accepted), ['*']),
                 function ($langs, $langItem) {
                     [$langLong, $weight] = array_merge(explode(';q=', $langItem), [1]);
-                    $langShort = substr($langLong, 0, 2);
+                    $langShort           = substr($langLong, 0, 2);
                     if (array_key_exists($langShort, $langs)) {
                         if ($langs[$langShort] < $weight) {
                             $langs[$langShort] = (float) $weight;
                         }
+                    } else {
+                        $langs[$langShort] = (float) $weight;
                     }
-                    else $langs[$langShort] = (float) $weight;
 
                     return $langs;
                 },

app/Models/TwoFAccount.php

@@ -395,8 +395,7 @@ class TwoFAccount extends Model implements Sortable
         // First we instanciate the OTP generator
         try {
             $this->generator = Factory::loadFromProvisioningUri($isSteamTotp ? str_replace('otpauth://steam', 'otpauth://totp', $uri) : $uri);
-        }
+        } catch (\Assert\AssertionFailedException|\Assert\InvalidArgumentException|\Exception|\Throwable $ex) {
-        catch (\Assert\AssertionFailedException|\Assert\InvalidArgumentException|\Exception|\Throwable $ex) {
             throw ValidationException::withMessages([
                 'uri' => __('validation.custom.uri.regex', ['attribute' => 'uri']),
             ]);
@@ -696,6 +695,9 @@ class TwoFAccount extends Model implements Sortable
         return Settings::get('useEncryption') ? Crypt::encryptString($value) : $value;
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Builder<TwoFAccount>
+     */
     public function buildSortQuery()
     {
         return static::query()->where('user_id', $this->user_id);

app/Policies/GroupPolicy.php

@@ -4,7 +4,6 @@ namespace App\Policies;
 
 use App\Models\Group;
 use App\Models\User;
-use Illuminate\Auth\Access\Response;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class GroupPolicy

app/Policies/OwnershipTrait.php

@@ -3,11 +3,9 @@
 namespace App\Policies;
 
 use App\Models\User;
-use Illuminate\Contracts\Support\Arrayable;
 
 trait OwnershipTrait
 {
-
     /**
      * Ownership of single item condition
      *
@@ -40,5 +38,4 @@ trait OwnershipTrait
 
         return true;
     }
-
 }

app/Policies/TwoFAccountPolicy.php

@@ -4,7 +4,6 @@ namespace App\Policies;
 
 use App\Models\TwoFAccount;
 use App\Models\User;
-use Illuminate\Auth\Access\Response;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
 class TwoFAccountPolicy
@@ -68,8 +67,6 @@ class TwoFAccountPolicy
     public function update(User $user, TwoFAccount $twofaccount)
     {
         return $this->isOwnerOf($user, $twofaccount);
-            // ? Response::allow()
-            // : Response::deny('You do not own this post.');
     }
 
     /**

app/Providers/AuthServiceProvider.php

@@ -5,10 +5,10 @@ namespace App\Providers;
 use App\Extensions\RemoteUserProvider;
 use App\Extensions\WebauthnCredentialBroker;
 use App\Facades\Settings;
-use App\Models\TwoFAccount;
 use App\Models\Group;
-use App\Policies\TwoFAccountPolicy;
+use App\Models\TwoFAccount;
 use App\Policies\GroupPolicy;
+use App\Policies\TwoFAccountPolicy;
 use App\Services\Auth\ReverseProxyGuard;
 use Illuminate\Auth\Passwords\DatabaseTokenRepository;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;

app/Services/Migrators/PlainTextMigrator.php

@@ -31,11 +31,9 @@ class PlainTextMigrator extends Migrator
 
         foreach ($otpauthURIs as $key => $uri) {
             try {
-               $twofaccounts[$key] = new TwoFAccount;
+                $twofaccounts[$key] = new TwoFAccount;
-               $twofaccounts[$key]->fillWithURI($uri, str_starts_with($uri, 'otpauth://steam/'));
+                $twofaccounts[$key]->fillWithURI($uri, str_starts_with($uri, 'otpauth://steam/'));
-            }
+            } catch (\Exception $exception) {
-            catch (\Exception $exception) {
-
                 Log::error(sprintf('Cannot instanciate a TwoFAccount object with OTP parameters from imported item #%s', $key));
                 Log::debug($exception->getMessage());
 

app/Services/SettingService.php

@@ -5,12 +5,11 @@ namespace App\Services;
 use App\Exceptions\DbEncryptionException;
 use App\Models\Option;
 use Exception;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Cache;
 use Throwable;
 
 class SettingService
@@ -25,7 +24,7 @@ class SettingService
     /**
      * Cache duration
      *
-     * @var int $minutes
+     * @var int
      */
     private int $minutes = 10;
 
@@ -41,6 +40,7 @@ class SettingService
     {
         $this->settings = Cache::remember(self::CACHE_ITEM_NAME, now()->addMinutes($this->minutes), function () {
             self::build();
+
             return $this->settings;
         });
     }
@@ -130,8 +130,7 @@ class SettingService
         });
 
         // Merge customized values with app default values
-        $settings = collect(config('2fauth.settings'))->merge($options); /** @phpstan-ignore-line */
+        $settings       = collect(config('2fauth.settings'))->merge($options); /** @phpstan-ignore-line */
-
         $this->settings = $settings;
     }
 

app/Services/TwoFAccountService.php

@@ -3,8 +3,8 @@
 namespace App\Services;
 
 use App\Factories\MigratorFactoryInterface;
-use App\Models\TwoFAccount;
 use App\Helpers\Helpers;
+use App\Models\TwoFAccount;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Log;
 
@@ -117,5 +117,4 @@ class TwoFAccountService
 
         return $twofaccounts;
     }
-    
 }

tests/Feature/Http/Auth/RegisterControllerTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Feature\Http\Auth;
 
-use App\Models\User;
 use Illuminate\Support\Facades\DB;
 use Tests\FeatureTestCase;
 

tests/Feature/Services/SettingServiceTest.php

@@ -3,10 +3,10 @@
 namespace Tests\Feature\Services;
 
 use App\Facades\Settings;
-use App\Services\SettingService;
 use App\Models\TwoFAccount;
-use Illuminate\Support\Facades\Crypt;
+use App\Services\SettingService;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Tests\FeatureTestCase;
 
@@ -174,7 +174,7 @@ class SettingServiceTest extends FeatureTestCase
      */
     public function test_set_setting_persist_correct_value_in_db_and_cache()
     {
-        $value = Settings::set(self::SETTING_NAME, self::SETTING_VALUE_STRING);
+        $value  = Settings::set(self::SETTING_NAME, self::SETTING_VALUE_STRING);
         $cached = Cache::get(SettingService::CACHE_ITEM_NAME); // returns a Collection
 
         $this->assertDatabaseHas('options', [
@@ -378,7 +378,7 @@ class SettingServiceTest extends FeatureTestCase
     }
 
     /**
-     * 
+     * @test
      */
     public function test_cache_is_updated_when_setting_is_set()
     {
@@ -392,7 +392,7 @@ class SettingServiceTest extends FeatureTestCase
     }
 
     /**
-     * 
+     * @test
      */
     public function test_cache_is_updated_when_setting_is_deleted()
     {