Merge pull request #13 from ssddanbrown/laravel11

Laravel11
ssddanbrown · May 15, 2024 · 9e0f3d9 · 9e0f3d9
2 parents 05a98f7 + d8c1ceb
commit 9e0f3d9
Show file tree

Hide file tree

Showing 61 changed files with 2,448 additions and 3,827 deletions.
diff --git a/.env.example b/.env.example
@@ -33,6 +33,7 @@ MAIL_ENCRYPTION=null
 
 # Logging details, don't need to change these to start with
 LOG_CHANNEL=stack
+LOG_STACK=single
 LOG_LEVEL=debug
 
 # Database connection

diff --git a/.github/workflows/larastan.yml b/.github/workflows/larastan.yml
@@ -12,8 +12,8 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
-    - uses: actions/checkout@v2
+        php-version: '8.3'
+    - uses: actions/checkout@v4
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
     - name: Install Dependencies

diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -12,8 +12,8 @@ jobs:
     steps:
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: '8.1'
-    - uses: actions/checkout@v2
+        php-version: '8.3'
+    - uses: actions/checkout@v4
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
     - name: Install Dependencies

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .idea/
+.phpactor.json
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
diff --git a/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\LoginRequest;
-use App\Providers\RouteServiceProvider;
+use App\Providers\AppServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -29,7 +29,7 @@ public function store(LoginRequest $request): RedirectResponse
 
         $request->session()->regenerate();
 
-        return redirect(RouteServiceProvider::HOME);
+        return redirect(AppServiceProvider::HOME);
     }
 
     /**

diff --git a/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\Providers\RouteServiceProvider;
+use App\Providers\AppServiceProvider;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -35,6 +35,6 @@ public function store(Request $request): RedirectResponse
 
         $request->session()->put('auth.password_confirmed_at', time());
 
-        return redirect()->intended(RouteServiceProvider::HOME);
+        return redirect()->intended(AppServiceProvider::HOME);
     }
 }
diff --git a/app/Http/Controllers/Auth/NewPasswordController.php b/app/Http/Controllers/Auth/NewPasswordController.php
@@ -57,6 +57,6 @@ function ($user) use ($request) {
         return $status == Password::PASSWORD_RESET
                     ? redirect()->route('login')->with('status', __($status))
                     : back()->withInput($request->only('email'))
-                            ->withErrors(['email' => __($status)]);
+                        ->withErrors(['email' => __($status)]);
     }
 }
diff --git a/app/Http/Controllers/Auth/PasswordResetLinkController.php b/app/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -41,6 +41,6 @@ public function store(Request $request): RedirectResponse
         return $status == Password::RESET_LINK_SENT
                     ? back()->with('status', __($status))
                     : back()->withInput($request->only('email'))
-                            ->withErrors(['email' => __($status)]);
+                        ->withErrors(['email' => __($status)]);
     }
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.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;
     use ValidatesRequests;

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php
diff --git a/app/Http/Middleware/PreventRequestsDuringMaintenance.php b/app/Http/Middleware/PreventRequestsDuringMaintenance.php
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php
diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
diff --git a/app/Http/Middleware/ValidateSignature.php b/app/Http/Middleware/ValidateSignature.php
diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php