Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
driesvints committed Dec 6, 2018
2 parents cf45ac5 + bc29c2b commit 049c6ba
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Laravel Socialite provides an expressive, fluent interface to OAuth authenticati

**We are not accepting new adapters.**

**If you are using Laravel 5.3 or below, please use [Socialite 2.0](https://github.com/laravel/socialite/tree/2.0).**

Adapters for other platforms are listed at the community driven [Socialite Providers](https://socialiteproviders.github.io/) website.

## Official Documentation
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/"
"Laravel\\Socialite\\Tests\\": "tests/"
}
},
"extra": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/FacebookTestProviderStub.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests\Fixtures;
namespace Laravel\Socialite\Tests\Fixtures;

use stdClass;
use Mockery as m;
Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/OAuthOneTestProviderStub.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests\Fixtures;
namespace Laravel\Socialite\Tests\Fixtures;

use Laravel\Socialite\One\AbstractProvider;

Expand Down
2 changes: 1 addition & 1 deletion tests/Fixtures/OAuthTwoTestProviderStub.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests\Fixtures;
namespace Laravel\Socialite\Tests\Fixtures;

use stdClass;
use Mockery as m;
Expand Down
4 changes: 2 additions & 2 deletions tests/OAuthOneTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests;
namespace Laravel\Socialite\Tests;

use Mockery as m;
use Illuminate\Http\Request;
Expand All @@ -9,10 +9,10 @@
use League\OAuth1\Client\Server\User;
use League\OAuth1\Client\Server\Twitter;
use Illuminate\Contracts\Session\Session;
use Tests\Fixtures\OAuthOneTestProviderStub;
use Laravel\Socialite\One\User as SocialiteUser;
use League\OAuth1\Client\Credentials\TokenCredentials;
use League\OAuth1\Client\Credentials\TemporaryCredentials;
use Laravel\Socialite\Tests\Fixtures\OAuthOneTestProviderStub;
use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirectResponse;

class OAuthOneTest extends TestCase
Expand Down
6 changes: 3 additions & 3 deletions tests/OAuthTwoTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Tests;
namespace Laravel\Socialite\Tests;

use stdClass;
use Mockery as m;
Expand All @@ -10,8 +10,8 @@
use PHPUnit\Framework\TestCase;
use Illuminate\Http\RedirectResponse;
use Illuminate\Contracts\Session\Session;
use Tests\Fixtures\FacebookTestProviderStub;
use Tests\Fixtures\OAuthTwoTestProviderStub;
use Laravel\Socialite\Tests\Fixtures\FacebookTestProviderStub;
use Laravel\Socialite\Tests\Fixtures\OAuthTwoTestProviderStub;
use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpFoundation\RedirectResponse as SymfonyRedirectResponse;

Expand Down

0 comments on commit 049c6ba

Please sign in to comment.