feat: update Laravel to 10

lightszentip · Aug 28, 2024 · 89566a4 · 89566a4
1 parent c7b71c8
commit 89566a4
Show file tree

Hide file tree

Showing 15 changed files with 168 additions and 186 deletions.
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
@@ -23,7 +23,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $this->registerPolicies();
 
         //
     }

diff --git a/composer.json b/composer.json
@@ -5,23 +5,24 @@
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {
-        "php": "^7.4|^8.0|^8.1|^8.2",
-        "guzzlehttp/guzzle": "^7.5.0",
-        "laravel/framework": "^v9.43.0",
-        "laravel/jetstream": "^3.0.1",
-        "laravel/sanctum": "^3.0",
-        "laravel/tinker": "^v2.7.3",
-        "lightszentip/laravel-release-changelog-generator": "^0.3.0",
-        "livewire/livewire": "^v2.10.7",
-        "spatie/laravel-permission": "^5.7"
+        "php": "^8.1|^8.2",
+        "guzzlehttp/guzzle": "^7.9.2",
+        "laravel/framework": "^v10.48.20",
+        "laravel/jetstream": "^v4.3.1",
+        "laravel/sanctum": "^v3.3.3",
+        "laravel/tinker": "^v2.9.0",
+        "lightszentip/laravel-release-changelog-generator": "^0.3.5",
+        "livewire/livewire": "^v3.5.6",
+        "spatie/laravel-google-fonts": "^1.4",
+        "spatie/laravel-permission": "^5.11.1"
     },
     "require-dev": {
-        "spatie/laravel-ignition": "^2.0.0",
-        "fakerphp/faker": "^1.21.1",
-        "laravel/sail": "^1.16.4",
-        "mockery/mockery": "^1.5.1",
-        "nunomaduro/collision": "^v7.0.0",
-        "phpunit/phpunit": "^10.0.12"
+        "spatie/laravel-ignition": "^2.8.0",
+        "fakerphp/faker": "^v1.23.1",
+        "laravel/sail": "^v1.31.1",
+        "mockery/mockery": "^1.6.12",
+        "nunomaduro/collision": "^v7.10.0",
+        "phpunit/phpunit": "^10.5.30"
     },
     "autoload": {
         "psr-4": {
@@ -60,6 +61,6 @@
         "preferred-install": "dist",
         "sort-packages": true
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,17 +11,17 @@
     },
     "devDependencies": {
         "@popperjs/core": "^2.11.8",
-        "axios": "^1.6.0",
-        "bootstrap": "^5.3.0",
-        "bootstrap-icons": "^1.10.5",
-        "jquery": "^3.7.0",
+        "axios": "^1.7.5",
+        "bootstrap": "^5.3.3",
+        "bootstrap-icons": "^1.11.3",
+        "jquery": "^3.7.1",
         "laravel-mix": "^6.0.49",
         "lodash": "^4.17.21",
-        "postcss": "^8.4.31",
-        "postcss-import": "^16.0.0",
+        "postcss": "^8.4.41",
+        "postcss-import": "^16.1.0",
         "resolve-url-loader": "^5.0.0",
-        "sass-loader": "^13.3.2",
-        "sass": "^1.63.6"
+        "sass-loader": "^16.0.1",
+        "sass": "^1.77.8"
     },
     "dependencies": {
         "dropzone": "^5.9.3",

diff --git a/resources/js/app.js b/resources/js/app.js
@@ -4,7 +4,6 @@ import {Tooltip} from 'bootstrap';
 import Popper from '@popperjs/core/dist/umd/popper.js';
 
 try {
-    window.Popper = Popper;
     window.Popper = Popper;
     window.$ = window.jQuery = require('jquery');
     require('bootstrap');

diff --git a/resources/views/api/api-token-manager.blade.php b/resources/views/api/api-token-manager.blade.php
@@ -13,7 +13,7 @@
             <!-- Token Name -->
             <div class="col-span-6 sm:col-span-4">
                 <x-jet-label for="name" value="{{ __('Token Name') }}"/>
-                <x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="createApiTokenForm.name"
+                <x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model="createApiTokenForm.name"
                              autofocus/>
                 <x-jet-input-error for="name" class="mt-2"/>
             </div>
@@ -26,7 +26,7 @@
                     <div class="mt-2 grid grid-cols-1 md:grid-cols-2 gap-4">
                         @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
                             <label class="flex items-center">
-                                <x-jet-checkbox wire:model.defer="createApiTokenForm.permissions" :value="$permission"/>
+                                <x-jet-checkbox wire:model="createApiTokenForm.permissions" :value="$permission"/>
                                 <span class="ml-2 text-sm text-gray-600">{{ $permission }}</span>
                             </label>
                         @endforeach
@@ -97,7 +97,7 @@
 @endif
 
 <!-- Token Value Modal -->
-    <x-jet-dialog-modal wire:model="displayingToken">
+    <x-jet-dialog-modal wire:model.live="displayingToken">
         <x-slot name="title">
             {{ __('API Token') }}
         </x-slot>
@@ -122,7 +122,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
     </x-jet-dialog-modal>
 
     <!-- API Token Permissions Modal -->
-    <x-jet-dialog-modal wire:model="managingApiTokenPermissions">
+    <x-jet-dialog-modal wire:model.live="managingApiTokenPermissions">
         <x-slot name="title">
             {{ __('API Token Permissions') }}
         </x-slot>
@@ -131,7 +131,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                 @foreach (Laravel\Jetstream\Jetstream::$permissions as $permission)
                     <label class="flex items-center">
-                        <x-jet-checkbox wire:model.defer="updateApiTokenForm.permissions" :value="$permission"/>
+                        <x-jet-checkbox wire:model="updateApiTokenForm.permissions" :value="$permission"/>
                         <span class="ml-2 text-sm text-gray-600">{{ $permission }}</span>
                     </label>
                 @endforeach
@@ -151,7 +151,7 @@ class="mt-4 bg-gray-100 px-4 py-2 rounded font-mono text-sm text-gray-500 w-full
     </x-jet-dialog-modal>
 
     <!-- Delete Token Confirmation Modal -->
-    <x-jet-confirmation-modal wire:model="confirmingApiTokenDeletion">
+    <x-jet-confirmation-modal wire:model.live="confirmingApiTokenDeletion">
         <x-slot name="title">
             {{ __('Delete API Token') }}
         </x-slot>

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -8,7 +8,7 @@
     <title>{{ config('app.name', 'Laravel') }}</title>
 
     <!-- Fonts -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
+    @googlefonts
 
     <!-- Styles -->
     <link rel="stylesheet" href="{{ mix('css/app.css') }}">

diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
@@ -8,8 +8,9 @@
     <title>{{ config('app.name', 'Laravel') }}</title>
 
     <!-- Fonts -->
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
-
+    @googlefonts
+    <!-- Styles -->
+    @livewireStyles
     <!-- Styles -->
     <link rel="stylesheet" href="{{ mix('css/app.css') }}">
 
@@ -60,6 +61,7 @@
     @if( !App::environment(['Production','prd','PROD']))
         <link rel="stylesheet" href="{{ asset('css/ribbon.css') }}">
     @endif
+
 </head>
 <body class="text-center bg-light text-dark">
 @if( !App::environment(['Production','prd','PROD']))
@@ -69,8 +71,8 @@
 
 
 {{ $slot }}
-
+@livewireScripts
 <script src="{{ mix('js/extras.js') }}"></script>
-</body>
+
 </body>
 </html>
diff --git a/resources/views/profile/delete-user-form.blade.php b/resources/views/profile/delete-user-form.blade.php
@@ -19,7 +19,7 @@
         </div>
 
         <!-- Delete User Confirmation Modal -->
-        <x-jet-dialog-modal wire:model="confirmingUserDeletion">
+        <x-jet-dialog-modal wire:model.live="confirmingUserDeletion">
             <x-slot name="title">
                 {{ __('Delete Account') }}
             </x-slot>
@@ -32,7 +32,7 @@
                     <x-jet-input type="password" class="mt-1 block w-3/4"
                                  placeholder="{{ __('Password') }}"
                                  x-ref="password"
-                                 wire:model.defer="password"
+                                 wire:model="password"
                                  wire:keydown.enter="deleteUser"/>
 
                     <x-jet-input-error for="password" class="mt-2"/>

diff --git a/resources/views/profile/logout-other-browser-sessions-form.blade.php b/resources/views/profile/logout-other-browser-sessions-form.blade.php
@@ -67,7 +67,7 @@ class="bi bi-phone" viewBox="0 0 16 16">
         </div>
 
         <!-- Log Out Other Devices Confirmation Modal -->
-        <x-jet-dialog-modal wire:model="confirmingLogout">
+        <x-jet-dialog-modal wire:model.live="confirmingLogout">
             <x-slot name="title">
                 {{ __('Log Out Other Browser Sessions') }}
             </x-slot>
@@ -80,7 +80,7 @@ class="bi bi-phone" viewBox="0 0 16 16">
                     <x-jet-input type="password" class="mt-1 block w-3/4"
                                  placeholder="{{ __('Password') }}"
                                  x-ref="password"
-                                 wire:model.defer="password"
+                                 wire:model="password"
                                  wire:keydown.enter="logoutOtherBrowserSessions"/>
 
                     <x-jet-input-error for="password" class="mt-2"/>

diff --git a/resources/views/profile/update-password-form.blade.php b/resources/views/profile/update-password-form.blade.php
@@ -11,21 +11,21 @@
         <div class="col-span-6 sm:col-span-4">
             <x-jet-label for="current_password" value="{{ __('Current Password') }}"/>
             <x-jet-input id="current_password" type="password" class="mt-1 block w-full"
-                         wire:model.defer="state.current_password" autocomplete="current-password"/>
+                         wire:model="state.current_password" autocomplete="current-password"/>
             <x-jet-input-error for="current_password" class="mt-2"/>
         </div>
 
         <div class="col-span-6 sm:col-span-4">
             <x-jet-label for="password" value="{{ __('New Password') }}"/>
-            <x-jet-input id="password" type="password" class="mt-1 block w-full" wire:model.defer="state.password"
+            <x-jet-input id="password" type="password" class="mt-1 block w-full" wire:model="state.password"
                          autocomplete="new-password"/>
             <x-jet-input-error for="password" class="mt-2"/>
         </div>
 
         <div class="col-span-6 sm:col-span-4">
             <x-jet-label for="password_confirmation" value="{{ __('Confirm Password') }}"/>
             <x-jet-input id="password_confirmation" type="password" class="mt-1 block w-full"
-                         wire:model.defer="state.password_confirmation" autocomplete="new-password"/>
+                         wire:model="state.password_confirmation" autocomplete="new-password"/>
             <x-jet-input-error for="password_confirmation" class="mt-2"/>
         </div>
     </x-slot>

diff --git a/resources/views/profile/update-profile-information-form.blade.php b/resources/views/profile/update-profile-information-form.blade.php
@@ -13,7 +13,7 @@
             <div x-data="{photoName: null, photoPreview: null}" class="col-span-6 sm:col-span-4">
                 <!-- Profile Photo File Input -->
                 <input type="file" class="hidden"
-                       wire:model="photo"
+                       wire:model.live="photo"
                        x-ref="photo"
                        x-on:change="
                                     photoName = $refs.photo.files[0].name;
@@ -56,15 +56,15 @@ class="rounded-full h-20 w-20 object-cover">
     <!-- Name -->
         <div class="col-span-6 sm:col-span-4">
             <x-jet-label for="name" value="{{ __('Name') }}"/>
-            <x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model.defer="state.name"
+            <x-jet-input id="name" type="text" class="mt-1 block w-full" wire:model="state.name"
                          autocomplete="name"/>
             <x-jet-input-error for="name" class="mt-2"/>
         </div>
 
         <!-- Email -->
         <div class="col-span-6 sm:col-span-4">
             <x-jet-label for="email" value="{{ __('Email') }}"/>
-            <x-jet-input id="email" type="email" class="mt-1 block w-full" wire:model.defer="state.email"/>
+            <x-jet-input id="email" type="email" class="mt-1 block w-full" wire:model="state.email"/>
             <x-jet-input-error for="email" class="mt-2"/>
         </div>
     </x-slot>

diff --git a/resources/views/vendor/jetstream/components/confirms-password.blade.php b/resources/views/vendor/jetstream/components/confirms-password.blade.php
@@ -15,7 +15,7 @@
 </span>
 
 @once
-    <x-jet-dialog-modal wire:model="confirmingPassword">
+    <x-jet-dialog-modal wire:model.live="confirmingPassword">
         <x-slot name="title">
             {{ $title }}
         </x-slot>
@@ -27,7 +27,7 @@
                  x-on:confirming-password.window="setTimeout(() => $refs.confirmable_password.focus(), 250)">
                 <x-jet-input type="password" class="mt-1 block w-3/4" placeholder="{{ __('Password') }}"
                              x-ref="confirmable_password"
-                             wire:model.defer="confirmablePassword"
+                             wire:model="confirmablePassword"
                              wire:keydown.enter="confirmPassword"/>
 
                 <x-jet-input-error for="confirmable_password" class="mt-2"/>

diff --git a/resources/views/vendor/jetstream/components/form-section.blade.php b/resources/views/vendor/jetstream/components/form-section.blade.php
@@ -8,7 +8,7 @@
     </x-jet-section-title>
 
     <div class="mb-3">
-        <form wire:submit.prevent="{{ $submit }}">
+        <form wire:submit="{{ $submit }}">
             <div
                 class=" {{ isset($actions) ? 'sm:rounded-tl-md sm:rounded-tr-md' : 'sm:rounded-md' }}">
 

diff --git a/resources/views/vendor/jetstream/components/modal.blade.php b/resources/views/vendor/jetstream/components/modal.blade.php
@@ -14,7 +14,7 @@
 
 <div
     x-data="{
-        show: @entangle($attributes->wire('model')).defer,
+        show: @entangle($attributes->wire('model')),
         focusables() {
             // All focusable element types...
             let selector = 'a, button, input:not([type=\'hidden\']), textarea, select, details, [tabindex]:not([tabindex=\'-1\'])'
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,6 @@ class AuthServiceProvider extends ServiceProvider @@
          */
         public function boot()
         {
-            $this->registerPolicies();
             //
         }
@@ Expand Down @@