Skip to content

Commit c651a47

Browse files
Baspagithub-actions[bot]
authored andcommitted
fix: styling
1 parent 2380191 commit c651a47

7 files changed

Lines changed: 39 additions & 19 deletions

File tree

config/users.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
<?php
22

3+
use Backstage\Laravel\Users\Eloquent\Models\User;
4+
use Backstage\Laravel\Users\Eloquent\Models\UserLogin;
5+
use Backstage\Laravel\Users\Eloquent\Models\UserNotificationPreference;
6+
use Backstage\Laravel\Users\Eloquent\Observers\UserObserver;
7+
use Backstage\Laravel\Users\Notifications\Invitation;
8+
39
/**
410
* Laravel Users Configuration
511
*/
612

713
return [
814
'eloquent' => [
915
'user' => [
10-
'model' => \Backstage\Laravel\Users\Eloquent\Models\User::class,
16+
'model' => User::class,
1117
'table' => 'users',
12-
'observer' => \Backstage\Laravel\Users\Eloquent\Observers\UserObserver::class,
18+
'observer' => UserObserver::class,
1319
],
1420

1521
'user_login' => [
16-
'model' => \Backstage\Laravel\Users\Eloquent\Models\UserLogin::class,
22+
'model' => UserLogin::class,
1723
'table' => 'user_logins',
1824
],
1925

2026
'user_notification_preferences' => [
21-
'model' => \Backstage\Laravel\Users\Eloquent\Models\UserNotificationPreference::class,
27+
'model' => UserNotificationPreference::class,
2228
'table' => 'user_notification_preferences',
2329
],
2430
],
@@ -27,7 +33,7 @@
2733
'auth' => [
2834
'user_created' => [
2935
// Or set Backstage\Filament\Users\Notifications\UserInvitationNotification
30-
'invitation_notification' => \Backstage\Laravel\Users\Notifications\Invitation::class,
36+
'invitation_notification' => Invitation::class,
3137
'notification_delivery_channels' => [
3238
'mail',
3339
],

helpers.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?php
22

3+
use Backstage\Laravel\Users\Domain\Email\Actions\ValidateEmail;
4+
use Backstage\Laravel\Users\Domain\Password\Actions\GeneratePassword;
5+
36
if (! function_exists('geo')) {
47
function geo($attribute = '')
58
{
@@ -18,13 +21,13 @@ function geo($attribute = '')
1821
if (! function_exists('generate_password')) {
1922
function generate_password(...$args)
2023
{
21-
return \Backstage\Laravel\Users\Domain\Password\Actions\GeneratePassword::run(...$args);
24+
return GeneratePassword::run(...$args);
2225
}
2326
}
2427

2528
if (! function_exists('validate_email')) {
2629
function validate_email(...$args)
2730
{
28-
return \Backstage\Laravel\Users\Domain\Email\Actions\ValidateEmail::run(...$args);
31+
return ValidateEmail::run(...$args);
2932
}
3033
}

src/Eloquent/Observers/UserObserver.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
namespace Backstage\Laravel\Users\Eloquent\Observers;
44

5+
use Backstage\Laravel\Users\Eloquent\Models\User;
56
use Backstage\Laravel\Users\Events\Auth\UserCreated;
67

78
class UserObserver
89
{
910
/**
1011
* Handle the User "created" event.
1112
*
12-
* @param \Backstage\Laravel\Users\Eloquent\Models\User $user
13+
* @param User $user
1314
* @return void
1415
*/
1516
public function created($user)

src/Events/Auth/UserCreated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class UserCreated
1616
/**
1717
* The user instance.
1818
*
19-
* @var \Backstage\Laravel\Users\Eloquent\Models\User
19+
* @var User
2020
*/
2121
public function __construct(public User $user) {}
2222
}

src/LaravelUsersServiceProvider.php

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,16 @@
33
namespace Backstage\Laravel\Users;
44

55
use Backstage\Laravel\Users\Console\Commands;
6+
use Backstage\Laravel\Users\Eloquent\Models\User;
7+
use Backstage\Laravel\Users\Eloquent\Observers\UserObserver;
68
use Backstage\Laravel\Users\Events\Auth\UserCreated;
79
use Backstage\Laravel\Users\Facades\UserManager;
10+
use Backstage\Laravel\Users\Listeners\Auth\HandleUserLogin;
11+
use Backstage\Laravel\Users\Listeners\Auth\HandleUserLogout;
12+
use Backstage\Laravel\Users\Listeners\Auth\SendInvitationMail;
13+
use Illuminate\Auth\Events\Login;
14+
use Illuminate\Auth\Events\Logout;
15+
use Illuminate\Contracts\Http\Kernel;
816
use Illuminate\Support\Facades\File;
917
use Spatie\LaravelPackageTools\Package;
1018
use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -61,30 +69,30 @@ public function packageBooted()
6169
/**
6270
* @var Illuminate\Foundation\Http\Kernel $kernel
6371
*/
64-
$kernel = $this->app->make(\Illuminate\Contracts\Http\Kernel::class);
72+
$kernel = $this->app->make(Kernel::class);
6573
});
6674

67-
if (config('users.eloquent.user.observer', \Backstage\Laravel\Users\Eloquent\Observers\UserObserver::class)) {
68-
config('auth.providers.users.model', \Backstage\Laravel\Users\Eloquent\Models\User::class)::observe(config('users.eloquent.user.observer', \Backstage\Laravel\Users\Eloquent\Observers\UserObserver::class));
75+
if (config('users.eloquent.user.observer', UserObserver::class)) {
76+
config('auth.providers.users.model', User::class)::observe(config('users.eloquent.user.observer', UserObserver::class));
6977
}
7078
}
7179

7280
protected function getEvents()
7381
{
7482
$this->app['events']->listen(
75-
\Illuminate\Auth\Events\Login::class,
76-
\Backstage\Laravel\Users\Listeners\Auth\HandleUserLogin::class
83+
Login::class,
84+
HandleUserLogin::class
7785
);
7886

7987
$this->app['events']->listen(
80-
\Illuminate\Auth\Events\Logout::class,
81-
\Backstage\Laravel\Users\Listeners\Auth\HandleUserLogout::class
88+
Logout::class,
89+
HandleUserLogout::class
8290
);
8391

8492
if (config('users.events.auth.user_created.enabled', true)) {
8593
$this->app['events']->listen(
8694
UserCreated::class,
87-
\Backstage\Laravel\Users\Listeners\Auth\SendInvitationMail::class
95+
SendInvitationMail::class
8896
);
8997
}
9098
}

src/Listeners/Auth/HandleUserLogin.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
namespace Backstage\Laravel\Users\Listeners\Auth;
44

5+
use Backstage\Laravel\Users\Eloquent\Models\User;
56
use Backstage\Laravel\Users\Jobs\RecordUserLogin;
67
use Illuminate\Auth\Events\Login;
78

89
class HandleUserLogin
910
{
1011
public function handle(Login $event): void
1112
{
12-
/** @var \Backstage\Laravel\Users\Eloquent\Models\User $user */
13+
/** @var User $user */
1314
$user = $event->user;
1415

1516
$inputs = request()->except('_method', '_token', 'password');

src/Listeners/Auth/HandleUserLogout.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
namespace Backstage\Laravel\Users\Listeners\Auth;
44

5+
use Backstage\Laravel\Users\Eloquent\Models\User;
56
use Backstage\Laravel\Users\Jobs\RecordUserLogin;
67
use Illuminate\Auth\Events\Logout;
78

89
class HandleUserLogout
910
{
1011
public function handle(Logout $event): void
1112
{
12-
/** @var \Backstage\Laravel\Users\Eloquent\Models\User|null $user */
13+
/** @var User|null $user */
1314
$user = $event->user;
1415

1516
if (! $user) {

0 commit comments

Comments
 (0)