Support for Laravel 10 (#15)

protonemedia · Feb 16, 2023 · 3748882 · 3748882
1 parent 6acdce6
commit 3748882
Show file tree

Hide file tree

Showing 33 changed files with 22 additions and 61 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -4,16 +4,18 @@ on: [push, pull_request]
 
 jobs:
   stub-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false
       matrix:
         php: [8.2, 8.1, 8.0]
-        laravel: [9.*]
-        dependency-version: [prefer-lowest, prefer-stable]
+        laravel: [10.0, 9.3]
+        exclude:
+          - php: 8.0
+            laravel: 10.0
 
-    name: Test Stubs ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
+    name: Test Stubs P${{ matrix.php }} - L${{ matrix.laravel }}
 
     steps:
       - name: Setup PHP
@@ -25,17 +27,17 @@ jobs:
 
       - name: Setup Laravel
         run: |
-          composer create-project laravel/laravel:^9.3 .
-          composer require protonemedia/laravel-splade-breeze
+          composer create-project laravel/laravel:^${{ matrix.laravel }} .
+          composer require protonemedia/laravel-splade
+          composer require laravel/breeze
 
-      - name: Remove installed Breeze (Unix)
-        run: rm -rf vendor/protonemedia/laravel-splade-breeze
-        if: matrix.os == 'ubuntu-latest'
+      - name: Remove installed Breeze
+        run: rm -rf vendor/laravel/breeze
 
       - name: Checkout code
         uses: actions/checkout@v2
         with:
-          path: "vendor/protonemedia/laravel-splade-breeze"
+          path: "vendor/laravel/breeze"
 
       - name: Install Breeze and Setup Dusk environment
         run: |

diff --git a/composer.json b/composer.json
@@ -24,11 +24,11 @@
     ],
     "require": {
         "php": "^8.0.2",
-        "illuminate/console": "^9.37",
-        "illuminate/filesystem": "^9.37",
-        "illuminate/support": "^9.37",
-        "illuminate/validation": "^9.37",
-        "protonemedia/laravel-splade": "^1.2.9"
+        "illuminate/console": "^9.37|^10.0",
+        "illuminate/filesystem": "^9.37|^10.0",
+        "illuminate/support": "^9.37|^10.0",
+        "illuminate/validation": "^9.37|^10.0",
+        "protonemedia/laravel-splade": "^1.2.15"
     },
     "conflict": {
         "laravel/framework": "<9.37.0"

diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -170,7 +170,6 @@ protected function requireComposerPackages($packages, $dev = false)
     /**
      * Update the "package.json" file.
      *
-     * @param  callable  $callback
      * @param  bool  $dev
      * @return void
      */
@@ -261,7 +260,6 @@ protected function runCommands($commands)
     /**
      * Remove Tailwind dark classes from the given files.
      *
-     * @param  \Symfony\Component\Finder\Finder  $finder
      * @return void
      */
     protected function removeDarkClasses(Finder $finder)

diff --git a/src/Console/InstallsSpladeStack.php b/src/Console/InstallsSpladeStack.php
@@ -25,7 +25,7 @@ protected function installSpladeStack()
         // NPM Packages...
         $this->updateNodePackages(function ($packages) {
             return [
-                '@protonemedia/laravel-splade' => '^1.2.9',
+                '@protonemedia/laravel-splade' => '^1.2.15',
                 '@tailwindcss/forms' => '^0.5.3',
                 '@tailwindcss/typography' => '^0.5.2',
                 '@vitejs/plugin-vue' => '^3.0.0',
@@ -104,7 +104,6 @@ protected function installSpladeStack()
     /**
      * Remove Tailwind dark classes from the given files.
      *
-     * @param  \Symfony\Component\Finder\Finder  $finder
      * @return void
      */
     protected function removeDarkClasses(Finder $finder)

diff --git a/stubs/api/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/stubs/api/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -12,7 +12,6 @@ class AuthenticatedSessionController extends Controller
     /**
      * Handle an incoming authentication request.
      *
-     * @param  \App\Http\Requests\Auth\LoginRequest  $request
      * @return \Illuminate\Http\Response
      */
     public function store(LoginRequest $request)
@@ -27,7 +26,6 @@ public function store(LoginRequest $request)
     /**
      * Destroy an authenticated session.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
     public function destroy(Request $request)

diff --git a/stubs/api/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/api/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -11,7 +11,6 @@ class EmailVerificationNotificationController extends Controller
     /**
      * Send a new email verification notification.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)

diff --git a/stubs/api/app/Http/Controllers/Auth/NewPasswordController.php b/stubs/api/app/Http/Controllers/Auth/NewPasswordController.php
@@ -16,7 +16,6 @@ class NewPasswordController extends Controller
     /**
      * Handle an incoming new password request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/api/app/Http/Controllers/Auth/PasswordResetLinkController.php b/stubs/api/app/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -12,7 +12,6 @@ class PasswordResetLinkController extends Controller
     /**
      * Handle an incoming password reset link request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\JsonResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/api/app/Http/Controllers/Auth/RegisteredUserController.php b/stubs/api/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -15,7 +15,6 @@ class RegisteredUserController extends Controller
     /**
      * Handle an incoming registration request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/api/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/api/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -12,7 +12,6 @@ class VerifyEmailController extends Controller
     /**
      * Mark the authenticated user's email address as verified.
      *
-     * @param  \Illuminate\Foundation\Auth\EmailVerificationRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function __invoke(EmailVerificationRequest $request)

diff --git a/stubs/api/app/Http/Middleware/EnsureEmailIsVerified.php b/stubs/api/app/Http/Middleware/EnsureEmailIsVerified.php
@@ -11,7 +11,6 @@ class EnsureEmailIsVerified
      * Handle an incoming request.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
      * @param  string|null  $redirectToRoute
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse|null
      */

diff --git a/stubs/default/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/stubs/default/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -23,7 +23,6 @@ public function create()
     /**
      * Handle an incoming authentication request.
      *
-     * @param  \App\Http\Requests\Auth\LoginRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(LoginRequest $request)
@@ -38,7 +37,6 @@ public function store(LoginRequest $request)
     /**
      * Destroy an authenticated session.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request)

diff --git a/stubs/default/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/stubs/default/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -23,7 +23,6 @@ public function show()
     /**
      * Confirm the user's password.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return mixed
      */
     public function store(Request $request)

diff --git a/stubs/default/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/default/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -11,7 +11,6 @@ class EmailVerificationNotificationController extends Controller
     /**
      * Send a new email verification notification.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)

diff --git a/stubs/default/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/stubs/default/app/Http/Controllers/Auth/EmailVerificationPromptController.php
@@ -11,7 +11,6 @@ class EmailVerificationPromptController extends Controller
     /**
      * Display the email verification prompt.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return mixed
      */
     public function __invoke(Request $request)

diff --git a/stubs/default/app/Http/Controllers/Auth/NewPasswordController.php b/stubs/default/app/Http/Controllers/Auth/NewPasswordController.php
@@ -15,7 +15,6 @@ class NewPasswordController extends Controller
     /**
      * Display the password reset view.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\View\View
      */
     public function create(Request $request)
@@ -26,7 +25,6 @@ public function create(Request $request)
     /**
      * Handle an incoming new password request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/default/app/Http/Controllers/Auth/PasswordController.php b/stubs/default/app/Http/Controllers/Auth/PasswordController.php
@@ -12,7 +12,6 @@ class PasswordController extends Controller
     /**
      * Update the user's password.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request)

diff --git a/stubs/default/app/Http/Controllers/Auth/PasswordResetLinkController.php b/stubs/default/app/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -21,7 +21,6 @@ public function create()
     /**
      * Handle an incoming password reset link request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/default/app/Http/Controllers/Auth/RegisteredUserController.php b/stubs/default/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -26,7 +26,6 @@ public function create()
     /**
      * Handle an incoming registration request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/default/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/default/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -12,7 +12,6 @@ class VerifyEmailController extends Controller
     /**
      * Mark the authenticated user's email address as verified.
      *
-     * @param  \Illuminate\Foundation\Auth\EmailVerificationRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function __invoke(EmailVerificationRequest $request)

diff --git a/stubs/default/app/Http/Controllers/ProfileController.php b/stubs/default/app/Http/Controllers/ProfileController.php
@@ -12,7 +12,6 @@ class ProfileController extends Controller
     /**
      * Display the user's profile form.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\View\View
      */
     public function edit(Request $request)
@@ -25,7 +24,6 @@ public function edit(Request $request)
     /**
      * Update the user's profile information.
      *
-     * @param  \App\Http\Requests\ProfileUpdateRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(ProfileUpdateRequest $request)
@@ -44,7 +42,6 @@ public function update(ProfileUpdateRequest $request)
     /**
      * Delete the user's account.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/AuthenticatedSessionController.php b/stubs/inertia-common/app/Http/Controllers/Auth/AuthenticatedSessionController.php
@@ -28,7 +28,6 @@ public function create()
     /**
      * Handle an incoming authentication request.
      *
-     * @param  \App\Http\Requests\Auth\LoginRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(LoginRequest $request)
@@ -43,7 +42,6 @@ public function store(LoginRequest $request)
     /**
      * Destroy an authenticated session.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/ConfirmablePasswordController.php b/stubs/inertia-common/app/Http/Controllers/Auth/ConfirmablePasswordController.php
@@ -24,7 +24,6 @@ public function show()
     /**
      * Confirm the user's password.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return mixed
      */
     public function store(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationNotificationController.php b/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationNotificationController.php
@@ -11,7 +11,6 @@ class EmailVerificationNotificationController extends Controller
     /**
      * Send a new email verification notification.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function store(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationPromptController.php b/stubs/inertia-common/app/Http/Controllers/Auth/EmailVerificationPromptController.php
@@ -12,7 +12,6 @@ class EmailVerificationPromptController extends Controller
     /**
      * Display the email verification prompt.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return mixed
      */
     public function __invoke(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/NewPasswordController.php b/stubs/inertia-common/app/Http/Controllers/Auth/NewPasswordController.php
@@ -17,7 +17,6 @@ class NewPasswordController extends Controller
     /**
      * Display the password reset view.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Inertia\Response
      */
     public function create(Request $request)
@@ -31,7 +30,6 @@ public function create(Request $request)
     /**
      * Handle an incoming new password request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/PasswordController.php b/stubs/inertia-common/app/Http/Controllers/Auth/PasswordController.php
@@ -12,7 +12,6 @@ class PasswordController extends Controller
     /**
      * Update the user's password.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(Request $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/PasswordResetLinkController.php b/stubs/inertia-common/app/Http/Controllers/Auth/PasswordResetLinkController.php
@@ -25,7 +25,6 @@ public function create()
     /**
      * Handle an incoming password reset link request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/RegisteredUserController.php b/stubs/inertia-common/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -27,7 +27,6 @@ public function create()
     /**
      * Handle an incoming registration request.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      *
      * @throws \Illuminate\Validation\ValidationException

diff --git a/stubs/inertia-common/app/Http/Controllers/Auth/VerifyEmailController.php b/stubs/inertia-common/app/Http/Controllers/Auth/VerifyEmailController.php
@@ -12,7 +12,6 @@ class VerifyEmailController extends Controller
     /**
      * Mark the authenticated user's email address as verified.
      *
-     * @param  \Illuminate\Foundation\Auth\EmailVerificationRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function __invoke(EmailVerificationRequest $request)

diff --git a/stubs/inertia-common/app/Http/Controllers/ProfileController.php b/stubs/inertia-common/app/Http/Controllers/ProfileController.php
@@ -14,7 +14,6 @@ class ProfileController extends Controller
     /**
      * Display the user's profile form.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Inertia\Response
      */
     public function edit(Request $request)
@@ -28,7 +27,6 @@ public function edit(Request $request)
     /**
      * Update the user's profile information.
      *
-     * @param  \App\Http\Requests\ProfileUpdateRequest  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function update(ProfileUpdateRequest $request)
@@ -47,7 +45,6 @@ public function update(ProfileUpdateRequest $request)
     /**
      * Delete the user's account.
      *
-     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\RedirectResponse
      */
     public function destroy(Request $request)