From 74d84e9371b2d2486edcc8f458adc9f22957d68b Mon Sep 17 00:00:00 2001 From: Patrick Heppler <12952240+HepplerDotNet@users.noreply.github.com> Date: Mon, 9 Sep 2019 20:51:51 +0200 Subject: [PATCH 1/3] According to PHP Bug 78516 Argon2 requires at least 8KB (#5097) https://bugs.php.net/bug.php?id=78516 Argon2 requires at least 8KB On PHP 7.4 memory 1024 will throw: password_hash(): Memory cost is outside of allowed memory range --- config/hashing.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hashing.php b/config/hashing.php index 84257708..9146bfd9 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -44,7 +44,7 @@ */ 'argon' => [ - 'memory' => 1024, + 'memory' => 8192, 'threads' => 2, 'time' => 2, ], From 79fb6af96ebf0325cef15c3132157fdf75f6fd6c Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 10 Sep 2019 17:25:19 +0200 Subject: [PATCH 2/3] Order imports alphabetically --- .styleci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.styleci.yml b/.styleci.yml index 1db61d96..5e3689bd 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -1,6 +1,9 @@ php: preset: laravel + enabled: + - alpha_ordered_imports disabled: + - length_ordered_imports - unused_use finder: not-name: From e656932002588bcaaa94476f1ed1850747eb4708 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 10 Sep 2019 17:26:00 +0200 Subject: [PATCH 3/3] Apply fixes from StyleCI (#5100) --- app/Http/Controllers/Auth/RegisterController.php | 4 ++-- app/Http/Controllers/Controller.php | 6 +++--- app/Http/Middleware/TrustProxies.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- app/User.php | 2 +- database/factories/UserFactory.php | 2 +- .../migrations/2014_10_12_000000_create_users_table.php | 4 ++-- .../2014_10_12_100000_create_password_resets_table.php | 4 ++-- .../2019_08_19_000000_create_failed_jobs_table.php | 4 ++-- tests/Bootstrap.php | 2 +- tests/Feature/ExampleTest.php | 2 +- tests/Unit/ExampleTest.php | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 85b9057a..6fdcba0a 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Auth; -use App\User; use App\Http\Controllers\Controller; +use App\User; +use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; -use Illuminate\Foundation\Auth\RegistersUsers; class RegisterController extends Controller { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a23..a0a2a8a3 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; -use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Foundation\Validation\ValidatesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 12fdf8b5..ee5b5958 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Illuminate\Http\Request; use Fideloper\Proxy\TrustProxies as Middleware; +use Illuminate\Http\Request; class TrustProxies extends Middleware { diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 0acc984b..30490683 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Gate; use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Gate; class AuthServiceProvider extends ServiceProvider { diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 352cce44..395c518b 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Broadcast; +use Illuminate\Support\ServiceProvider; class BroadcastServiceProvider extends ServiceProvider { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 6c64e52b..723a290d 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,10 +2,10 @@ namespace App\Providers; -use Illuminate\Support\Facades\Event; use Illuminate\Auth\Events\Registered; use Illuminate\Auth\Listeners\SendEmailVerificationNotification; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 5ea48d39..548e4be7 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Route; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { diff --git a/app/User.php b/app/User.php index faa03c3b..e79dab7f 100644 --- a/app/User.php +++ b/app/User.php @@ -2,9 +2,9 @@ namespace App; -use Illuminate\Notifications\Notifiable; use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class User extends Authenticatable { diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 5e516cee..084535f6 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,8 +2,8 @@ /** @var \Illuminate\Database\Eloquent\Factory $factory */ use App\User; -use Illuminate\Support\Str; use Faker\Generator as Faker; +use Illuminate\Support\Str; /* |-------------------------------------------------------------------------- diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 4a3ba472..a91e1d3c 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,8 +1,8 @@