Skip to content

Commit

Permalink
Merge pull request #11 from DirectoryTree/bug-10
Browse files Browse the repository at this point in the history
Bug 10 - Argument #2 ($user) must be of type Laravel\Socialite\Two\User
  • Loading branch information
stevebauman authored Jun 4, 2024
2 parents c540aed + 868a510 commit e3baa25
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ namespace App\Socialite;
use App\Models\User;
use Illuminate\Contracts\Auth\Authenticatable;
use DirectoryTree\Bartender\ProviderRepository;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

class UserProviderRepository implements ProviderRepository
{
Expand Down
2 changes: 1 addition & 1 deletion src/ProviderRedirector.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Exception;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Http\RedirectResponse;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

interface ProviderRedirector
{
Expand Down
2 changes: 1 addition & 1 deletion src/ProviderRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace DirectoryTree\Bartender;

use Illuminate\Contracts\Auth\Authenticatable;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

interface ProviderRepository
{
Expand Down
2 changes: 1 addition & 1 deletion src/UserProviderHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Exception;
use Illuminate\Http\RedirectResponse;
use Laravel\Socialite\Contracts\Provider;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

class UserProviderHandler implements ProviderHandler
{
Expand Down
2 changes: 1 addition & 1 deletion src/UserProviderRedirector.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

class UserProviderRedirector implements ProviderRedirector
{
Expand Down
3 changes: 1 addition & 2 deletions src/UserProviderRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
use Illuminate\Auth\MustVerifyEmail;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
use Laravel\Socialite\Two\User as SocialiteUser;
use Laravel\Socialite\Contracts\User as SocialiteUser;

class UserProviderRepository implements ProviderRepository
{
Expand Down
1 change: 0 additions & 1 deletion tests/UserProviderHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
use DirectoryTree\Bartender\ProviderRepository;
use DirectoryTree\Bartender\ProviderRedirector;
use DirectoryTree\Bartender\Tests\User;
use Illuminate\Support\Facades\Auth;
use Laravel\Socialite\Contracts\Provider;
use Laravel\Socialite\Two\User as SocialiteUser;
use DirectoryTree\Bartender\UserProviderHandler;
Expand Down

0 comments on commit e3baa25

Please sign in to comment.