Fix styling

database/migrations/modify_user_table.php

@@ -6,7 +6,6 @@
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
-use Raiolanetworks\OAuth\Tests\Models\TestUser;
 
 return new class extends Migration
 {

src/Commands/OAuthCommand.php

@@ -10,7 +10,6 @@
 use function Laravel\Prompts\info;
 use function Laravel\Prompts\select;
 use function Laravel\Prompts\text;
-use function Orchestra\Testbench\package_path;
 
 class OAuthCommand extends Command
 {
@@ -134,8 +133,8 @@ protected function modelNameValidation(string $value): ?string
         $class                = '\\' . Str::ucfirst(Str::replace('/', '\\', $value));
         $authenticatableClass = 'Illuminate\Contracts\Auth\Authenticatable';
 
-        if(app()->environment() === 'testing') {
-            $path                 = 'Tests/Models/TestUser.php';
+        if (app()->environment() === 'testing') {
+            $path = 'Tests/Models/TestUser.php';
         }
 
         return match (true) {

src/Controllers/OAuthController.php

@@ -25,7 +25,7 @@ class OAuthController extends Controller
 {
     private OAuthService $provider;
 
-    public function __construct(OAuthService $provider = null)
+    public function __construct(?OAuthService $provider = null)
     {
         $this->provider = $provider ?? app(OAuthService::class);
     }
@@ -76,7 +76,7 @@ public function callback(): RedirectResponse
             ]);
 
             $callback = $this->provider->getResourceOwner($accessToken)->toArray();
-            $user = $this->updateOrCreateUser($callback, $accessToken);
+            $user     = $this->updateOrCreateUser($callback, $accessToken);
 
             EventsOAuthTokenUpdated::dispatch($user, $callback['groups']);
             Session::remove('oauth2-state');

tests/Feature/ControllerTest.php

@@ -129,11 +129,11 @@
     $mockOAuthService->shouldReceive('getResourceOwner')
         ->andReturn(Mockery::mock([
             'toArray' => [
-                'id'    => 1,
-                'name' => 'user',
-                'email' => '[email protected]',
+                'id'     => 1,
+                'name'   => 'user',
+                'email'  => '[email protected]',
                 'groups' => ['admin'],
-                'sub' => '123456abc',
+                'sub'    => '123456abc',
             ],
         ]));
 
@@ -159,30 +159,30 @@
     // $mockUser->oauth_refresh_token = 'valid_refresh_token';
     // $mockUser->oauth_token_expires_at = Carbon::now()->subHour()->timestamp;
     $mockUser = TestUser::factory(state: [
-        'oauth_token_expires_at' => Carbon::now()->subHour()
+        'oauth_token_expires_at' => Carbon::now()->subHour(),
     ])->create();
 
     Auth::shouldReceive('guard')
         ->with(config('oauth.guard_name'))
         ->andReturn(Mockery::mock(Guard::class, ['check' => true, 'user' => $mockUser]));
 
-    $newOAuthToken = 'new_oauth_token';
+    $newOAuthToken   = 'new_oauth_token';
     $newRefreshToken = 'new_refresh_token';
-    $newExpiredDate = Carbon::now()->addHour()->timestamp;
+    $newExpiredDate  = Carbon::now()->addHour()->timestamp;
 
     $mockAccessToken = Mockery::mock(AccessToken::class);
     $mockAccessToken->shouldReceive('getToken')->andReturn($newOAuthToken);
     $mockAccessToken->shouldReceive('getRefreshToken')->andReturn($newRefreshToken);
     $mockAccessToken->shouldReceive('getExpires')->andReturn($newExpiredDate);
 
     $mockOAuthService->shouldReceive('getAccessToken')
-                     ->with('refresh_token', ['refresh_token' => 'oauth_refresh_token'])
-                     ->andReturn($mockAccessToken);
+        ->with('refresh_token', ['refresh_token' => 'oauth_refresh_token'])
+        ->andReturn($mockAccessToken);
 
     $mockOAuthService->shouldReceive('getResourceOwner')
-                     ->andReturn(Mockery::mock(['toArray' => [
-                         'groups' => ['admin'],
-                     ]]));
+        ->andReturn(Mockery::mock(['toArray' => [
+            'groups' => ['admin'],
+        ]]));
 
     $this->instance(OAuthService::class, $mockOAuthService);
 

tests/TestCase.php

@@ -4,7 +4,6 @@
 
 namespace Raiolanetworks\OAuth\Tests;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Config;
 use Orchestra\Testbench\TestCase as Orchestra;
@@ -42,7 +41,7 @@ public function getEnvironmentSetUp($app)
         config()->set('database.default', 'testing');
         config()->set('database.connections.testing', [
             'driver'   => 'sqlite',
-            'database' => ':memory:'
+            'database' => ':memory:',
         ]);
     }
 }

tests/database/factories/TestUserFactory.php

@@ -34,14 +34,14 @@ class TestUserFactory extends Factory
     public function definition(): array
     {
         return [
-            'name' => fake()->name(),
-            'email' => fake()->unique()->safeEmail(),
-            'type' => 'admin',
-            'password' => static::$password ??= Hash::make('password'),
-            'oauth_id' => 'oauth_id',
-            'oauth_token' => 'oauth_token',
-            'oauth_refresh_token' => 'oauth_refresh_token',
-            'oauth_token_expires_at' => Carbon::now()->addHours(2)
+            'name'                   => fake()->name(),
+            'email'                  => fake()->unique()->safeEmail(),
+            'type'                   => 'admin',
+            'password'               => static::$password ??= Hash::make('password'),
+            'oauth_id'               => 'oauth_id',
+            'oauth_token'            => 'oauth_token',
+            'oauth_refresh_token'    => 'oauth_refresh_token',
+            'oauth_token_expires_at' => Carbon::now()->addHours(2),
         ];
     }
 }