Merge branch '7.0' into testing-acting-as-client

Author: gdebrauwer

.styleci.yml

@@ -1,4 +1,8 @@
 php:
   preset: laravel
+  enabled:
+    - alpha_ordered_imports
+  disabled:
+    - length_ordered_imports
 js: true
 css: true

CHANGELOG.md

@@ -1,6 +1,12 @@
 # Release Notes
 
-## [Unreleased](https://github.com/laravel/passport/compare/v7.4.0...7.0)
+## [Unreleased](https://github.com/laravel/passport/compare/v7.4.1...7.0)
+
+
+## [v7.4.1 (2019-09-10)](https://github.com/laravel/passport/compare/v7.4.0...v7.4.1)
+
+### Fixed
+- Fixed key types for models ([#1078](https://github.com/laravel/passport/pull/1078), [a9a885d3](https://github.com/laravel/passport/commit/a9a885d3c2344ec133ed42a0268e503a76810982))
 
 
 ## [v7.4.0 (2019-08-20)](https://github.com/laravel/passport/compare/v7.3.5...v7.4.0)

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