Merge pull request #47 from sfelix-martins/analysis-8QKoKm

Apply fixes from StyleCI
sfelix-martins · Aug 24, 2018 · 02b29fe · 02b29fe
2 parents 056f18b + 1e8242b
commit 02b29fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Http/Middleware/MultiAuthenticate.php b/src/Http/Middleware/MultiAuthenticate.php
@@ -4,9 +4,9 @@
 
 use Closure;
 use League\OAuth2\Server\ResourceServer;
-use Psr\Http\Message\ServerRequestInterface;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Auth\Middleware\Authenticate;
+use Psr\Http\Message\ServerRequestInterface;
 use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Contracts\Auth\Factory as Auth;
 use SMartins\PassportMultiauth\PassportMultiauth;
@@ -102,7 +102,7 @@ public function handle($request, Closure $next, ...$guards)
     public function getAccessTokenFromRequest(ServerRequestInterface $request)
     {
         if (! ($tokenId = $request->getAttribute('oauth_access_token_id'))) {
-            return null;
+            return;
         }
 
         return $this->providers->findForToken($tokenId);

diff --git a/tests/Unit/MultiAuthenticateMiddlewareTest.php b/tests/Unit/MultiAuthenticateMiddlewareTest.php
@@ -4,13 +4,13 @@
 
 use Mockery;
 use Illuminate\Http\Request;
+use Zend\Diactoros\ServerRequest;
 use SMartins\PassportMultiauth\Provider;
 use Illuminate\Auth\AuthenticationException;
 use SMartins\PassportMultiauth\Tests\TestCase;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use SMartins\PassportMultiauth\Tests\Fixtures\Models\Company;
 use SMartins\PassportMultiauth\Http\Middleware\MultiAuthenticate;
-use Zend\Diactoros\ServerRequest;
 
 class MultiAuthenticateMiddlewareTest extends TestCase
 {