♻️ Apply Analytics tools

shopperlabs · Jul 13, 2023 · f837ee2 · f837ee2
1 parent d774c52
commit f837ee2
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/packages/admin/src/Actions/AttemptToAuthenticate.php b/packages/admin/src/Actions/AttemptToAuthenticate.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Shopper\Actions;
 
 use Closure;

diff --git a/packages/admin/src/Actions/RedirectIfTwoFactorAuthenticatable.php b/packages/admin/src/Actions/RedirectIfTwoFactorAuthenticatable.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Shopper\Actions;
 
 use Closure;
@@ -12,7 +14,7 @@
 
 final class RedirectIfTwoFactorAuthenticatable
 {
-    public function handle(array $data, Closure $next): Response | Redirector
+    public function handle(array $data, Closure $next): Response|Redirector
     {
         $user = $this->validateCredentials($data);
 
@@ -26,23 +28,23 @@ public function handle(array $data, Closure $next): Response | Redirector
 
     protected function validateCredentials(array $request)
     {
-        $model = Shopper::auth()->getProvider()->getModel();
+        $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line
 
-        return tap($model::where('email', $request['email'])->first(), function ($user) use ($request) {
-            if (! $user || ! Hash::check(value: $request['password'], hashedValue:  $user->password)) {
+        return tap($model::where('email', $request['email'])->first(), function ($user) use ($request): void {
+            if (! $user || ! Hash::check(value: $request['password'], hashedValue: $user->password)) {
                 $this->throwFailedAuthenticationException();
             }
         });
     }
 
-    protected function throwFailedAuthenticationException()
+    protected function throwFailedAuthenticationException(): void
     {
         throw ValidationException::withMessages([
             'email' => __('shopper::messages.login.failed'),
         ]);
     }
 
-    protected function twoFactorChallengeResponse($user, bool $remember): Redirector | Response
+    protected function twoFactorChallengeResponse($user, bool $remember): Redirector|Response
     {
         request()->session()->put([
             'login.id' => $user->getKey(),

diff --git a/packages/admin/src/Contracts/LoginResponse.php b/packages/admin/src/Contracts/LoginResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Shopper\Contracts;
 
 use Illuminate\Contracts\Support\Responsable;

diff --git a/packages/admin/src/Http/Controllers/Auth/TwoFactorAuthenticatedController.php b/packages/admin/src/Http/Controllers/Auth/TwoFactorAuthenticatedController.php
@@ -30,7 +30,7 @@ public function create(TwoFactorLoginRequest $request): View
         return view('shopper::auth.two-factor-login');
     }
 
-    public function store(TwoFactorLoginRequest $request): FailedTwoFactorLoginResponse | JsonResponse| RedirectResponse
+    public function store(TwoFactorLoginRequest $request): FailedTwoFactorLoginResponse|JsonResponse|RedirectResponse
     {
         $user = $request->challengedUser();
 

diff --git a/packages/admin/src/Http/Livewire/Pages/Auth/Login.php b/packages/admin/src/Http/Livewire/Pages/Auth/Login.php
@@ -54,7 +54,7 @@ public function authenticate()
             RedirectIfTwoFactorAuthenticatable::class,
             AttemptToAuthenticate::class,
         ]))
-        ->then(fn ($request) => app(LoginResponse::class));
+            ->then(fn ($request) => app(LoginResponse::class));
     }
 
     public function render(): View

diff --git a/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php b/packages/admin/src/Http/Requests/TwoFactorLoginRequest.php
@@ -4,10 +4,8 @@
 
 namespace Shopper\Http\Requests;
 
-use Illuminate\Contracts\Auth\StatefulGuard;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Exceptions\HttpResponseException;
-use Illuminate\Validation\ValidationException;
 use Shopper\Contracts\TwoFactorAuthenticationProvider;
 use Shopper\Facades\Shopper;
 use Shopper\Http\Responses\FailedTwoFactorLoginResponse;
@@ -51,7 +49,7 @@ public function validRecoveryCode(): ?string
 
     public function hasChallengedUser(): bool
     {
-        $model = Shopper::auth()->getProvider()->getModel();
+        $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line
 
         return $this->session()->has('login.id') &&
             $model::find($this->session()->get('login.id'));
@@ -63,7 +61,7 @@ public function challengedUser()
             return $this->challengedUser;
         }
 
-        $model = Shopper::auth()->getProvider()->getModel();
+        $model = Shopper::auth()->getProvider()->getModel(); // @phpstan-ignore-line
 
         if (! $this->session()->has('login.id') ||
             ! $user = $model::find($this->session()->pull('login.id'))) {

diff --git a/packages/admin/src/Http/Responses/LoginResponse.php b/packages/admin/src/Http/Responses/LoginResponse.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Shopper\Http\Responses;
 
 use Shopper\Contracts\LoginResponse as Responsable;

diff --git a/packages/admin/src/ShopperServiceProvider.php b/packages/admin/src/ShopperServiceProvider.php
@@ -11,8 +11,8 @@
 use Livewire\Livewire;
 use PragmaRX\Google2FA\Google2FA;
 use Shopper\Contracts\FailedTwoFactorLoginResponse as FailedTwoFactorLoginResponseContract;
-use Shopper\Contracts\LoginResponse as LoginResponseContract;
 use Shopper\Contracts\LoginResponse;
+use Shopper\Contracts\LoginResponse as LoginResponseContract;
 use Shopper\Contracts\TwoFactorAuthenticationProvider as TwoFactorAuthenticationProviderContract;
 use Shopper\Contracts\TwoFactorDisabledResponse as TwoFactorDisabledResponseContract;
 use Shopper\Contracts\TwoFactorEnabledResponse as TwoFactorEnabledResponseContract;
@@ -115,8 +115,10 @@ protected function bootLivewireComponents(): void
     {
         Livewire::addPersistentMiddleware([Authenticate::class]);
 
-        foreach (array_merge(config('shopper.components', []),
-            $this->getLivewirePagesComponents()) as $alias => $component) {
+        foreach (array_merge(
+            config('shopper.components', []),
+            $this->getLivewirePagesComponents()
+        ) as $alias => $component) {
             Livewire::component("shopper-$alias", $component);
         }
     }

diff --git a/packages/core/src/Traits/ReviewRateable.php b/packages/core/src/Traits/ReviewRateable.php
@@ -4,7 +4,6 @@
 
 namespace Shopper\Core\Traits;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Collection;
 use Shopper\Core\Models\Review;