diff --git a/.laravel-commit b/.laravel-commit
index a9d9a07..ba962a0 100644
--- a/.laravel-commit
+++ b/.laravel-commit
@@ -1 +1 @@
-e6becd2ca35a650f51ed49525935e8ca65671152
+953b488b8bb681d4d6e12227645c7c1b7ac26935
diff --git a/app/Http/Controllers/Auth/ConfirmPasswordController.php b/app/Http/Controllers/Auth/ConfirmPasswordController.php
new file mode 100644
index 0000000..3559954
--- /dev/null
+++ b/app/Http/Controllers/Auth/ConfirmPasswordController.php
@@ -0,0 +1,39 @@
+middleware('auth');
+ }
+}
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
index 5ed6430..b3ec0f8 100644
--- a/app/Http/Controllers/Auth/ForgotPasswordController.php
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -18,14 +18,4 @@ class ForgotPasswordController extends Controller {
use SendsPasswordResetEmails;
- /**
- * Create a new controller instance.
- *
- * @return void
- */
- public function __construct()
- {
- $this->middleware('guest');
- }
-
}
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index c32d79a..c49555e 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -1,11 +1,11 @@
middleware('guest');
- }
-
}
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 03e02a2..a0a2a8a 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/Kernel.php b/app/Http/Kernel.php
index 4fb323d..ef390ff 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -57,6 +57,7 @@ class Kernel extends HttpKernel
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
+ 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
index 12fdf8b..ee5b595 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 0acc984..3049068 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 352cce4..395c518 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 6c64e52..723a290 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 5ea48d3..548e4be 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 17088e2..d9d74a2 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;
use Hash;
use App\Traits\Timestamp;
diff --git a/composer.json b/composer.json
index b032324..7674c44 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
"erusev/parsedown": "~1.6",
"fideloper/proxy": "^4.0",
"intervention/image": "^2.4",
- "laravel/framework": "^6.0",
+ "laravel/framework": "^6.2",
"laravel/helpers": "^1.1",
"laravel/tinker": "^1.0",
"phpoffice/phpspreadsheet": "^1.2",
@@ -22,7 +22,7 @@
"spatie/laravel-newsletter": "^4.6"
},
"require-dev": {
- "filp/whoops": "^2.0",
+ "facade/ignition": "^1.4",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^3.0",
diff --git a/config/auth.php b/config/auth.php
index 897dc82..aaf982b 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -97,7 +97,21 @@ return [
'provider' => 'users',
'table' => 'password_resets',
'expire' => 60,
+ 'throttle' => 60,
],
],
+ /*
+ |--------------------------------------------------------------------------
+ | Password Confirmation Timeout
+ |--------------------------------------------------------------------------
+ |
+ | Here you may define the amount of seconds before a password confirmation
+ | times out and the user is prompted to re-enter their password via the
+ | confirmation screen. By default, the timeout lasts for three hours.
+ |
+ */
+
+ 'password_timeout' => 10800,
+
];
diff --git a/config/logging.php b/config/logging.php
index d09cd7d..0df8212 100644
--- a/config/logging.php
+++ b/config/logging.php
@@ -1,5 +1,6 @@
'errorlog',
'level' => 'debug',
],
+
+ 'null' => [
+ 'driver' => 'monolog',
+ 'handler' => NullHandler::class,
+ ],
],
];
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 5e516ce..084535f 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 6e68373..e583a24 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 @@
-
-
-
-
-
-
diff --git a/readme.md b/readme.md
index 860beb8..7b8b0b2 100644
--- a/readme.md
+++ b/readme.md
@@ -3,7 +3,7 @@
A Hypothetical website template for bootstrapping new projects.
* Written and maintained by Kevin MacMartin
-* Based on Laravel 6.0
+* Based on Laravel 6.4
## Setup
diff --git a/resources/lang/en/passwords.php b/resources/lang/en/passwords.php
index f3b01a4..86f1082 100644
--- a/resources/lang/en/passwords.php
+++ b/resources/lang/en/passwords.php
@@ -17,5 +17,6 @@ return [
'sent' => 'We have e-mailed your password reset link!',
'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.",
+ 'throttled' => 'Please wait before retrying.',
];
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index e1d879f..ce1d80d 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -93,6 +93,7 @@ return [
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute format is invalid.',
'numeric' => 'The :attribute must be a number.',
+ 'password' => 'The password is incorrect.',
'present' => 'The :attribute field must be present.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
index f31e495..cdb5111 100644
--- a/tests/Feature/ExampleTest.php
+++ b/tests/Feature/ExampleTest.php
@@ -2,8 +2,8 @@
namespace Tests\Feature;
-use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
class ExampleTest extends TestCase
{
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php
index e9fe19c..266ef35 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/ExampleTest.php
@@ -2,8 +2,8 @@
namespace Tests\Unit;
-use Tests\TestCase;
use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
class ExampleTest extends TestCase
{
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 5041c5a..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,29 +0,0 @@
-make(Kernel::class))->bootstrap();
-
-foreach ($commands as $command) {
- $console->call($command);
-}