Merge branch '3.0' into v3-google-plus-api-closed

.travis.yml

@@ -5,9 +5,13 @@ php:
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
 
 sudo: false
 
+before_install:
+  - phpenv config-rm xdebug.ini || true
+
 install: travis_retry composer install --no-interaction --prefer-dist --no-suggest
 
 script: vendor/bin/phpunit --verbose

README.md

@@ -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

composer.json

@@ -33,7 +33,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Laravel\\Socialite\\Tests\\": "tests/"
         }
     },
     "extra": {

src/One/AbstractProvider.php

@@ -81,8 +81,11 @@ public function user()
                 ->setToken($token->getIdentifier(), $token->getSecret());
 
         return $instance->map([
-            'id' => $user->uid, 'nickname' => $user->nickname,
-            'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
+            'id' => $user->uid,
+            'nickname' => $user->nickname,
+            'name' => $user->name,
+            'email' => $user->email,
+            'avatar' => $user->imageUrl,
         ]);
     }
 
@@ -108,8 +111,11 @@ public function userFromTokenAndSecret($token, $secret)
             ->setToken($tokenCredentials->getIdentifier(), $tokenCredentials->getSecret());
 
         return $instance->map([
-            'id' => $user->uid, 'nickname' => $user->nickname,
-            'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
+            'id' => $user->uid,
+            'nickname' => $user->nickname,
+            'name' => $user->name,
+            'email' => $user->email,
+            'avatar' => $user->imageUrl,
         ]);
     }
 

src/One/TwitterProvider.php

@@ -26,8 +26,11 @@ public function user()
                 ->setToken($token->getIdentifier(), $token->getSecret());
 
         return $instance->map([
-            'id' => $user->uid, 'nickname' => $user->nickname,
-            'name' => $user->name, 'email' => $user->email, 'avatar' => $user->imageUrl,
+            'id' => $user->uid,
+            'nickname' => $user->nickname,
+            'name' => $user->name,
+            'email' => $user->email,
+            'avatar' => $user->imageUrl,
             'avatar_original' => str_replace('_normal', '', $user->imageUrl),
         ]);
     }

src/SocialiteManager.php

@@ -7,6 +7,7 @@
 use InvalidArgumentException;
 use Illuminate\Support\Manager;
 use Laravel\Socialite\Two\GithubProvider;
+use Laravel\Socialite\Two\GitlabProvider;
 use Laravel\Socialite\Two\GoogleProvider;
 use Laravel\Socialite\One\TwitterProvider;
 use Laravel\Socialite\Two\FacebookProvider;
@@ -107,7 +108,7 @@ protected function createGitlabDriver()
         $config = $this->app['config']['services.gitlab'];
 
         return $this->buildProvider(
-            \Laravel\Socialite\Two\GitlabProvider::class, $config
+            GitlabProvider::class, $config
         );
     }
 

src/Two/AbstractProvider.php

@@ -176,7 +176,8 @@ protected function buildAuthUrlFromBase($url, $state)
     protected function getCodeFields($state = null)
     {
         $fields = [
-            'client_id' => $this->clientId, 'redirect_uri' => $this->redirectUrl,
+            'client_id' => $this->clientId,
+            'redirect_uri' => $this->redirectUrl,
             'scope' => $this->formatScopes($this->getScopes(), $this->scopeSeparator),
             'response_type' => 'code',
         ];
@@ -276,8 +277,10 @@ public function getAccessTokenResponse($code)
     protected function getTokenFields($code)
     {
         return [
-            'client_id' => $this->clientId, 'client_secret' => $this->clientSecret,
-            'code' => $code, 'redirect_uri' => $this->redirectUrl,
+            'client_id' => $this->clientId,
+            'client_secret' => $this->clientSecret,
+            'code' => $code,
+            'redirect_uri' => $this->redirectUrl,
         ];
     }
 

src/Two/BitbucketProvider.php

@@ -87,8 +87,10 @@ protected function getEmailByToken($token)
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['uuid'], 'nickname' => $user['username'],
-            'name' => Arr::get($user, 'display_name'), 'email' => Arr::get($user, 'email'),
+            'id' => $user['uuid'],
+            'nickname' => $user['username'],
+            'name' => Arr::get($user, 'display_name'),
+            'email' => Arr::get($user, 'email'),
             'avatar' => Arr::get($user, 'links.avatar.href'),
         ]);
     }

src/Two/FacebookProvider.php

@@ -111,8 +111,11 @@ protected function mapUserToObject(array $user)
         $avatarUrl = $this->graphUrl.'/'.$this->version.'/'.$user['id'].'/picture';
 
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => null, 'name' => isset($user['name']) ? $user['name'] : null,
-            'email' => isset($user['email']) ? $user['email'] : null, 'avatar' => $avatarUrl.'?type=normal',
+            'id' => $user['id'],
+            'nickname' => null,
+            'name' => isset($user['name']) ? $user['name'] : null,
+            'email' => isset($user['email']) ? $user['email'] : null,
+            'avatar' => $avatarUrl.'?type=normal',
             'avatar_original' => $avatarUrl.'?width=1920',
             'profileUrl' => isset($user['link']) ? $user['link'] : null,
         ]);

src/Two/GithubProvider.php

@@ -81,8 +81,11 @@ protected function getEmailByToken($token)
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => $user['login'], 'name' => Arr::get($user, 'name'),
-            'email' => Arr::get($user, 'email'), 'avatar' => $user['avatar_url'],
+            'id' => $user['id'],
+            'nickname' => $user['login'],
+            'name' => Arr::get($user, 'name'),
+            'email' => Arr::get($user, 'email'),
+            'avatar' => $user['avatar_url'],
         ]);
     }
 

src/Two/GoogleProvider.php

@@ -48,7 +48,7 @@ protected function getTokenUrl()
      */
     protected function getTokenFields($code)
     {
-        return array_add(
+        return Arr::add(
             parent::getTokenFields($code), 'grant_type', 'authorization_code'
         );
     }

src/Two/LinkedInProvider.php

@@ -83,8 +83,11 @@ protected function getUserByToken($token)
     protected function mapUserToObject(array $user)
     {
         return (new User)->setRaw($user)->map([
-            'id' => $user['id'], 'nickname' => null, 'name' => Arr::get($user, 'formattedName'),
-            'email' => Arr::get($user, 'emailAddress'), 'avatar' => Arr::get($user, 'pictureUrl'),
+            'id' => $user['id'],
+            'nickname' => null,
+            'name' => Arr::get($user, 'formattedName'),
+            'email' => Arr::get($user, 'emailAddress'),
+            'avatar' => Arr::get($user, 'pictureUrl'),
             'avatar_original' => Arr::get($user, 'pictureUrls.values.0'),
         ]);
     }

tests/Fixtures/FacebookTestProviderStub.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace Tests\Fixtures;
+namespace Laravel\Socialite\Tests\Fixtures;
 
+use stdClass;
 use Mockery as m;
 use Laravel\Socialite\Two\FacebookProvider;
 
@@ -28,6 +29,6 @@ protected function getHttpClient()
             return $this->http;
         }
 
-        return $this->http = m::mock(\stdClass::class);
+        return $this->http = m::mock(stdClass::class);
     }
 }

tests/Fixtures/OAuthOneTestProviderStub.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Fixtures;
+namespace Laravel\Socialite\Tests\Fixtures;
 
 use Laravel\Socialite\One\AbstractProvider;
 

tests/Fixtures/OAuthTwoTestProviderStub.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace Tests\Fixtures;
+namespace Laravel\Socialite\Tests\Fixtures;
 
+use stdClass;
 use Mockery as m;
 use Laravel\Socialite\Two\User;
 use Laravel\Socialite\Two\AbstractProvider;
@@ -44,6 +45,6 @@ protected function getHttpClient()
             return $this->http;
         }
 
-        return $this->http = m::mock(\stdClass::class);
+        return $this->http = m::mock(stdClass::class);
     }
 }

tests/OAuthOneTest.php

@@ -1,56 +1,66 @@
 <?php
 
-namespace Tests;
+namespace Laravel\Socialite\Tests;
 
 use Mockery as m;
 use Illuminate\Http\Request;
-use PHPUnit_Framework_TestCase;
-use Tests\Fixtures\OAuthOneTestProviderStub;
+use PHPUnit\Framework\TestCase;
+use Illuminate\Http\RedirectResponse;
+use League\OAuth1\Client\Server\User;
+use League\OAuth1\Client\Server\Twitter;
+use Illuminate\Contracts\Session\Session;
+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 PHPUnit_Framework_TestCase
+class OAuthOneTest extends TestCase
 {
-    public function tearDown()
+    protected function tearDown()
     {
+        parent::tearDown();
+
         m::close();
     }
 
     public function testRedirectGeneratesTheProperIlluminateRedirectResponse()
     {
-        $server = m::mock(\League\OAuth1\Client\Server\Twitter::class);
+        $server = m::mock(Twitter::class);
         $server->shouldReceive('getTemporaryCredentials')->once()->andReturn('temp');
         $server->shouldReceive('getAuthorizationUrl')->once()->with('temp')->andReturn('http://auth.url');
         $request = Request::create('foo');
-        $request->setLaravelSession($session = m::mock(\Illuminate\Contracts\Session\Session::class));
+        $request->setLaravelSession($session = m::mock(Session::class));
         $session->shouldReceive('put')->once()->with('oauth.temp', 'temp');
 
         $provider = new OAuthOneTestProviderStub($request, $server);
         $response = $provider->redirect();
 
-        $this->assertInstanceOf('Symfony\Component\HttpFoundation\RedirectResponse', $response);
-        $this->assertInstanceOf('Illuminate\Http\RedirectResponse', $response);
+        $this->assertInstanceOf(SymfonyRedirectResponse::class, $response);
+        $this->assertInstanceOf(RedirectResponse::class, $response);
     }
 
     public function testUserReturnsAUserInstanceForTheAuthenticatedRequest()
     {
-        $server = m::mock(\League\OAuth1\Client\Server\Twitter::class);
-        $temp = m::mock(\League\OAuth1\Client\Credentials\TemporaryCredentials::class);
+        $server = m::mock(Twitter::class);
+        $temp = m::mock(TemporaryCredentials::class);
         $server->shouldReceive('getTokenCredentials')->once()->with($temp, 'oauth_token', 'oauth_verifier')->andReturn(
-            $token = m::mock(\League\OAuth1\Client\Credentials\TokenCredentials::class)
+            $token = m::mock(TokenCredentials::class)
         );
-        $server->shouldReceive('getUserDetails')->once()->with($token, false)->andReturn($user = m::mock(\League\OAuth1\Client\Server\User::class));
+        $server->shouldReceive('getUserDetails')->once()->with($token, false)->andReturn($user = m::mock(User::class));
         $token->shouldReceive('getIdentifier')->twice()->andReturn('identifier');
         $token->shouldReceive('getSecret')->twice()->andReturn('secret');
         $user->uid = 'uid';
         $user->email = '[email protected]';
         $user->extra = ['extra' => 'extra'];
         $request = Request::create('foo', 'GET', ['oauth_token' => 'oauth_token', 'oauth_verifier' => 'oauth_verifier']);
-        $request->setLaravelSession($session = m::mock(\Illuminate\Contracts\Session\Session::class));
+        $request->setLaravelSession($session = m::mock(Session::class));
         $session->shouldReceive('get')->once()->with('oauth.temp')->andReturn($temp);
 
         $provider = new OAuthOneTestProviderStub($request, $server);
         $user = $provider->user();
 
-        $this->assertInstanceOf('Laravel\Socialite\One\User', $user);
+        $this->assertInstanceOf(SocialiteUser::class, $user);
         $this->assertSame('uid', $user->id);
         $this->assertSame('[email protected]', $user->email);
         $this->assertSame(['extra' => 'extra'], $user->user);
@@ -61,9 +71,9 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedRequest()
      */
     public function testExceptionIsThrownWhenVerifierIsMissing()
     {
-        $server = m::mock(\League\OAuth1\Client\Server\Twitter::class);
+        $server = m::mock(Twitter::class);
         $request = Request::create('foo');
-        $request->setLaravelSession($session = m::mock(\Illuminate\Contracts\Session\Session::class));
+        $request->setLaravelSession($session = m::mock(Session::class));
 
         $provider = new OAuthOneTestProviderStub($request, $server);
         $provider->user();