Apply fixes from StyleCI (#1081)

database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateOauthAuthCodesTable extends Migration
 {

database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateOauthAccessTokensTable extends Migration
 {

database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateOauthRefreshTokensTable extends Migration
 {

database/migrations/2016_06_01_000004_create_oauth_clients_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateOauthClientsTable extends Migration
 {

database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateOauthPersonalAccessClientsTable extends Migration
 {

src/ApiTokenCookieFactory.php

@@ -4,9 +4,9 @@
 
 use Carbon\Carbon;
 use Firebase\JWT\JWT;
-use Symfony\Component\HttpFoundation\Cookie;
-use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Config\Repository as Config;
+use Illuminate\Contracts\Encryption\Encrypter;
+use Symfony\Component\HttpFoundation\Cookie;
 
 class ApiTokenCookieFactory
 {

src/Bridge/AccessToken.php

@@ -2,10 +2,10 @@
 
 namespace Laravel\Passport\Bridge;
 
-use League\OAuth2\Server\Entities\Traits\EntityTrait;
+use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\Traits\AccessTokenTrait;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
 use League\OAuth2\Server\Entities\Traits\TokenEntityTrait;
-use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 
 class AccessToken implements AccessTokenEntityInterface
 {

src/Bridge/AccessTokenRepository.php

@@ -3,11 +3,11 @@
 namespace Laravel\Passport\Bridge;
 
 use DateTime;
-use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Laravel\Passport\Events\AccessTokenCreated;
-use League\OAuth2\Server\Entities\ClientEntityInterface;
+use Laravel\Passport\TokenRepository;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
 
 class AccessTokenRepository implements AccessTokenRepositoryInterface

src/Bridge/AuthCode.php

@@ -2,9 +2,9 @@
 
 namespace Laravel\Passport\Bridge;
 
-use League\OAuth2\Server\Entities\Traits\EntityTrait;
-use League\OAuth2\Server\Entities\Traits\AuthCodeTrait;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
+use League\OAuth2\Server\Entities\Traits\AuthCodeTrait;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
 use League\OAuth2\Server\Entities\Traits\TokenEntityTrait;
 
 class AuthCode implements AuthCodeEntityInterface

src/Bridge/AuthCodeRepository.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Bridge;
 
-use Laravel\Passport\Passport;
 use Illuminate\Database\Connection;
+use Laravel\Passport\Passport;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
 use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
 

src/Bridge/Client.php

@@ -2,9 +2,9 @@
 
 namespace Laravel\Passport\Bridge;
 
+use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\Traits\ClientTrait;
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
-use League\OAuth2\Server\Entities\ClientEntityInterface;
 
 class Client implements ClientEntityInterface
 {

src/Bridge/PersonalAccessGrant.php

@@ -3,9 +3,9 @@
 namespace Laravel\Passport\Bridge;
 
 use DateInterval;
-use Psr\Http\Message\ServerRequestInterface;
 use League\OAuth2\Server\Grant\AbstractGrant;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 class PersonalAccessGrant extends AbstractGrant
 {

src/Bridge/RefreshToken.php

@@ -2,9 +2,9 @@
 
 namespace Laravel\Passport\Bridge;
 
+use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
 use League\OAuth2\Server\Entities\Traits\RefreshTokenTrait;
-use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 
 class RefreshToken implements RefreshTokenEntityInterface
 {

src/Bridge/RefreshTokenRepository.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Bridge;
 
-use Illuminate\Database\Connection;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Database\Connection;
 use Laravel\Passport\Events\RefreshTokenCreated;
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;

src/Bridge/Scope.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Bridge;
 
-use League\OAuth2\Server\Entities\Traits\EntityTrait;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
+use League\OAuth2\Server\Entities\Traits\EntityTrait;
 
 class Scope implements ScopeEntityInterface
 {

src/Bridge/UserRepository.php

@@ -2,11 +2,11 @@
 
 namespace Laravel\Passport\Bridge;
 
-use RuntimeException;
-use Illuminate\Hashing\HashManager;
 use Illuminate\Contracts\Hashing\Hasher;
+use Illuminate\Hashing\HashManager;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use RuntimeException;
 
 class UserRepository implements UserRepositoryInterface
 {

src/ClientRepository.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport;
 
-use RuntimeException;
 use Illuminate\Support\Str;
+use RuntimeException;
 
 class ClientRepository
 {

src/Console/ClientCommand.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Console;
 
-use Laravel\Passport\Client;
 use Illuminate\Console\Command;
+use Laravel\Passport\Client;
 use Laravel\Passport\ClientRepository;
 
 class ClientCommand extends Command

src/Console/KeysCommand.php

@@ -2,10 +2,10 @@
 
 namespace Laravel\Passport\Console;
 
-use phpseclib\Crypt\RSA;
+use Illuminate\Console\Command;
 use Illuminate\Support\Arr;
 use Laravel\Passport\Passport;
-use Illuminate\Console\Command;
+use phpseclib\Crypt\RSA;
 
 class KeysCommand extends Command
 {

src/Exceptions/MissingScopeException.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Exceptions;
 
-use Illuminate\Support\Arr;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Support\Arr;
 
 class MissingScopeException extends AuthorizationException
 {

src/Guards/TokenGuard.php

@@ -4,18 +4,18 @@
 
 use Exception;
 use Firebase\JWT\JWT;
-use Illuminate\Http\Request;
-use Laravel\Passport\Passport;
 use Illuminate\Container\Container;
-use Laravel\Passport\TransientToken;
-use Laravel\Passport\TokenRepository;
-use Laravel\Passport\ClientRepository;
-use League\OAuth2\Server\ResourceServer;
 use Illuminate\Contracts\Auth\UserProvider;
-use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Contracts\Encryption\Encrypter;
 use Illuminate\Cookie\Middleware\EncryptCookies;
+use Illuminate\Http\Request;
+use Laravel\Passport\ClientRepository;
+use Laravel\Passport\Passport;
+use Laravel\Passport\TokenRepository;
+use Laravel\Passport\TransientToken;
 use League\OAuth2\Server\Exception\OAuthServerException;
+use League\OAuth2\Server\ResourceServer;
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 
 class TokenGuard

src/Http/Controllers/AccessTokenController.php

@@ -4,9 +4,9 @@
 
 use Laravel\Passport\TokenRepository;
 use Lcobucci\JWT\Parser as JwtParser;
+use League\OAuth2\Server\AuthorizationServer;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response as Psr7Response;
-use League\OAuth2\Server\AuthorizationServer;
 
 class AccessTokenController
 {

src/Http/Controllers/ApproveAuthorizationController.php

@@ -3,8 +3,8 @@
 namespace Laravel\Passport\Http\Controllers;
 
 use Illuminate\Http\Request;
-use Zend\Diactoros\Response as Psr7Response;
 use League\OAuth2\Server\AuthorizationServer;
+use Zend\Diactoros\Response as Psr7Response;
 
 class ApproveAuthorizationController
 {

src/Http/Controllers/AuthorizationController.php

@@ -2,15 +2,15 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
-use Laravel\Passport\Passport;
 use Laravel\Passport\Bridge\User;
-use Laravel\Passport\TokenRepository;
 use Laravel\Passport\ClientRepository;
+use Laravel\Passport\Passport;
+use Laravel\Passport\TokenRepository;
+use League\OAuth2\Server\AuthorizationServer;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response as Psr7Response;
-use League\OAuth2\Server\AuthorizationServer;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
 class AuthorizationController
 {

src/Http/Controllers/ClientController.php

@@ -2,11 +2,11 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Laravel\Passport\ClientRepository;
 use Laravel\Passport\Http\Rules\RedirectRule;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 
 class ClientController
 {

src/Http/Controllers/DenyAuthorizationController.php

@@ -2,9 +2,9 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
-use Illuminate\Support\Arr;
-use Illuminate\Http\Request;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 
 class DenyAuthorizationController
 {

src/Http/Controllers/HandlesOAuthErrors.php

@@ -3,14 +3,14 @@
 namespace Laravel\Passport\Http\Controllers;
 
 use Exception;
-use Throwable;
-use Illuminate\Http\Response;
 use Illuminate\Container\Container;
 use Illuminate\Contracts\Config\Repository;
-use Zend\Diactoros\Response as Psr7Response;
 use Illuminate\Contracts\Debug\ExceptionHandler;
+use Illuminate\Http\Response;
 use League\OAuth2\Server\Exception\OAuthServerException;
 use Symfony\Component\Debug\Exception\FatalThrowableError;
+use Throwable;
+use Zend\Diactoros\Response as Psr7Response;
 
 trait HandlesOAuthErrors
 {

src/Http/Controllers/PersonalAccessTokenController.php

@@ -2,11 +2,11 @@
 
 namespace Laravel\Passport\Http\Controllers;
 
+use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Laravel\Passport\Passport;
 use Laravel\Passport\TokenRepository;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 
 class PersonalAccessTokenController
 {

src/Http/Middleware/CheckClientCredentials.php

@@ -3,10 +3,10 @@
 namespace Laravel\Passport\Http\Middleware;
 
 use Closure;
-use League\OAuth2\Server\ResourceServer;
 use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 use League\OAuth2\Server\Exception\OAuthServerException;
+use League\OAuth2\Server\ResourceServer;
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 
 class CheckClientCredentials

src/Http/Middleware/CheckClientCredentialsForAnyScope.php

@@ -3,10 +3,10 @@
 namespace Laravel\Passport\Http\Middleware;
 
 use Closure;
-use League\OAuth2\Server\ResourceServer;
 use Illuminate\Auth\AuthenticationException;
 use Laravel\Passport\Exceptions\MissingScopeException;
 use League\OAuth2\Server\Exception\OAuthServerException;
+use League\OAuth2\Server\ResourceServer;
 use Symfony\Bridge\PsrHttpMessage\Factory\DiactorosFactory;
 
 class CheckClientCredentialsForAnyScope

src/Http/Middleware/CreateFreshApiToken.php

@@ -3,10 +3,10 @@
 namespace Laravel\Passport\Http\Middleware;
 
 use Closure;
-use Illuminate\Http\Response;
-use Laravel\Passport\Passport;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
 use Laravel\Passport\ApiTokenCookieFactory;
+use Laravel\Passport\Passport;
 
 class CreateFreshApiToken
 {

src/Http/Rules/RedirectRule.php

@@ -2,8 +2,8 @@
 
 namespace Laravel\Passport\Http\Rules;
 
-use Illuminate\Contracts\Validation\Rule;
 use Illuminate\Contracts\Validation\Factory;
+use Illuminate\Contracts\Validation\Rule;
 
 class RedirectRule implements Rule
 {