Merge pull request #67 from spatie/shift-115810

Laravel 11.x Shift

Author: riasvdv

.env.example

@@ -2,9 +2,20 @@ APP_NAME=Mailcoach
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
+APP_TIMEZONE=UTC
 APP_URL=http://localhost
 
+APP_LOCALE=en
+APP_FALLBACK_LOCALE=en
+APP_FAKER_LOCALE=en_US
+
+APP_MAINTENANCE_DRIVER=file
+APP_MAINTENANCE_STORE=database
+
+BCRYPT_ROUNDS=12
+
 LOG_CHANNEL=stack
+LOG_STACK=single
 LOG_DEPRECATIONS_CHANNEL=null
 LOG_LEVEL=debug
 
@@ -15,12 +26,15 @@ DB_DATABASE=mailcoach
 DB_USERNAME=root
 DB_PASSWORD=
 
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
+BROADCAST_CONNECTION=log
+CACHE_STORE=file
 FILESYSTEM_DISK=local
 QUEUE_CONNECTION=redis
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
+SESSION_ENCRYPT=false
+SESSION_PATH=/
+SESSION_DOMAIN=null
 
 MEMCACHED_HOST=127.0.0.1
 

.gitignore

@@ -20,3 +20,5 @@ public/vendor
 public/js/filament
 public/css/filament
 database/migrations
+
+/.phpunit.cache

app/Console/Commands/MakeUserCommand.php

@@ -2,9 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 
@@ -29,20 +28,20 @@ protected function requestData(): array
     {
         return [
             'name' => $this->option('username') ?? text(
-                    label: 'Username',
-                    required: true,
-                ),
+                label: 'Username',
+                required: true,
+            ),
 
             'email' => $this->option('email') ?? text(
-                    label: 'Email address',
-                    required: true,
-                    validate: fn (string $value) => match (true) {
-                        ! filter_var($value, FILTER_VALIDATE_EMAIL) => 'The email address must be valid.',
-                        User::where('email', $value)->exists() => 'A user with this email address already exists.',
-                        ! is_null($error = $this->verifyDns($value)) => $error,
-                        default => null,
-                    },
-                ),
+                label: 'Email address',
+                required: true,
+                validate: fn (string $value) => match (true) {
+                    ! filter_var($value, FILTER_VALIDATE_EMAIL) => 'The email address must be valid.',
+                    User::where('email', $value)->exists() => 'A user with this email address already exists.',
+                    ! is_null($error = $this->verifyDns($value)) => $error,
+                    default => null,
+                },
+            ),
 
             'password' => Hash::make($this->option('password') ?? password(
                 label: 'Password',

app/Console/Kernel.php

@@ -10,9 +10,9 @@
 
 class ForgotPasswordController
 {
-    use SendsPasswordResetEmails;
     use AuthorizesRequests;
     use DispatchesJobs;
+    use SendsPasswordResetEmails;
     use ValidatesRequests;
 
     public function showLinkRequestForm()

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -6,7 +6,6 @@
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Support\Facades\Auth;
 
 class LoginController
 {

app/Http/Controllers/Auth/LoginController.php

@@ -10,9 +10,9 @@
 
 class ResetPasswordController
 {
-    use ResetsPasswords;
     use AuthorizesRequests;
     use DispatchesJobs;
+    use ResetsPasswords;
     use ValidatesRequests;
 
     public function showResetForm(Request $request)

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -6,7 +6,7 @@
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
 
-class Controller extends BaseController
+abstract class Controller extends BaseController
 {
     use AuthorizesRequests, ValidatesRequests;
 }