5.7.1

laravelwebdev · laravelwebdev · commit 2525fe1d1742 · 2025-05-24T21:04:34.000+08:00
diff --git a/bun.lockb b/bun.lockb
diff --git a/composer.json b/composer.json
@@ -173,5 +173,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.7.0"
+  "version": "5.7.1"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "@babel/preset-env": "^7.27.2",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@types/lodash": "^4.17.16",
+    "@types/lodash": "^4.17.17",
     "@vue/babel-plugin-jsx": "^1.4.0",
     "@vue/babel-preset-jsx": "^1.4.0",
     "@vue/compiler-sfc": "^3.5.14",
@@ -41,7 +41,7 @@
     "@floating-ui/vue": "^1.1.6",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.2.0",
-    "@inertiajs/vue3": "^2.0.10",
+    "@inertiajs/vue3": "^2.0.11",
     "@popperjs/core": "^2.11.8",
     "@vue/compat": "^3.5.14",
     "@vueuse/core": "^10.11.1",
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -3,7 +3,7 @@
     "/ui.js": "/ui.js?id=b8df0ca1161b86cfb1aca2b3b642e584",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",
-    "/vendor.js": "/vendor.js?id=94d7e26e8c94fdf223cf5f0a163c0b3d",
+    "/vendor.js": "/vendor.js?id=ed85a48ec921ddfd0f403acdd3b4d92b",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2?id=c8390e146be0a3c8a5498355dec892ae",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2?id=b0735c7dd6126471acbaf9d6e9f5e41a",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty1ciurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty1ciurt9w6fk2a.woff2?id=7c1fb232e3050e36dcc1aee61f1d0c06",
diff --git a/public/vendor.js b/public/vendor.js
diff --git a/src/Console/PolicyMakeCommand.php b/src/Console/PolicyMakeCommand.php
@@ -121,6 +121,17 @@ protected function getStub()
         return $this->resolveStubPath('/stubs/policy.stub');
     }
 
+    /** {@inheritDoc} */
+    #[\Override]
+    protected function resolveStubPath($stub)
+    {
+        if (file_exists($customPath = $this->laravel->basePath('/stubs/nova/policy.stub'))) {
+            return $customPath;
+        }
+
+        return parent::resolveStubPath($stub);
+    }
+
     /** {@inheritDoc} */
     #[\Override]
     protected function userProviderModel()
diff --git a/src/Http/Controllers/NotificationDeleteAllController.php b/src/Http/Controllers/NotificationDeleteAllController.php
@@ -6,7 +6,6 @@
 use Illuminate\Routing\Controller;
 use Laravel\Nova\Http\Requests\NotificationRequest;
 use Laravel\Nova\Notifications\Notification;
-use Laravel\Nova\Nova;
 
 class NotificationDeleteAllController extends Controller
 {
@@ -15,10 +14,10 @@ class NotificationDeleteAllController extends Controller
      */
     public function __invoke(NotificationRequest $request): JsonResponse
     {
-        $userId = Nova::user($request)->getKey();
-
-        dispatch(static function () use ($userId) {
-            Notification::whereNotifiableId($userId)->delete();
+        dispatch(static function () use ($request) {
+            Notification::whereNotifiableId(
+                $request->user()->getKey()
+            )->delete();
         })->afterResponse();
 
         return response()->json();
diff --git a/src/Http/Controllers/NotificationDeleteController.php b/src/Http/Controllers/NotificationDeleteController.php
@@ -12,9 +12,12 @@ class NotificationDeleteController extends Controller
     /**
      * Mark the given notification as read.
      */
-    public function __invoke(NotificationRequest $request): JsonResponse
+    public function __invoke(NotificationRequest $request, string|int $notification): JsonResponse
     {
-        $notification = Notification::findOrFail($request->notification);
+        $notification = Notification::whereNotifiableId(
+            $request->user()->getKey()
+        )->findOrFail($notification);
+
         $notification->update(['read_at' => now()]);
         $notification->delete();
 
diff --git a/src/Http/Controllers/NotificationReadController.php b/src/Http/Controllers/NotificationReadController.php
@@ -12,9 +12,12 @@ class NotificationReadController extends Controller
     /**
      * Mark the given notification as read.
      */
-    public function __invoke(NotificationRequest $request): JsonResponse
+    public function __invoke(NotificationRequest $request, string|int $notification): JsonResponse
     {
-        $notification = Notification::findOrFail($request->notification);
+        $notification = Notification::query()
+            ->whereNotifiableId($request->user()->getKey())
+            ->findOrFail($notification);
+
         $notification->update(['read_at' => now()]);
 
         return response()->json();
diff --git a/src/Http/Controllers/NotificationUnreadController.php b/src/Http/Controllers/NotificationUnreadController.php
@@ -14,7 +14,10 @@ class NotificationUnreadController extends Controller
      */
     public function __invoke(NotificationRequest $request, string|int $notification): JsonResponse
     {
-        $notification = Notification::findOrFail($notification);
+        $notification = Notification::query()
+            ->whereNotifiableId($request->user()->getKey())
+            ->findOrFail($notification);
+
         $notification->update(['read_at' => null]);
 
         return response()->json();
diff --git a/src/Http/Requests/NotificationRequest.php b/src/Http/Requests/NotificationRequest.php
@@ -5,7 +5,6 @@
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Laravel\Nova\Http\Resources\NotificationResource;
 use Laravel\Nova\Notifications\Notification;
-use Laravel\Nova\Nova;
 
 /**
  * @param  string|int  $notification
@@ -18,7 +17,7 @@ class NotificationRequest extends NovaRequest
     public function notifications(): AnonymousResourceCollection
     {
         return NotificationResource::collection(
-            Notification::whereNotifiableId(Nova::user($this)->getKey())
+            Notification::whereNotifiableId($this->user()->getKey())
                 ->latest()
                 ->take(100)
                 ->get()
@@ -30,18 +29,18 @@ public function notifications(): AnonymousResourceCollection
      */
     public function markAsRead(): void
     {
-        Notification::unread()->whereNotifiableId(
-            Nova::user($this)->getKey()
-        )->update(['read_at' => now()]);
+        Notification::unread()
+            ->whereNotifiableId($this->user()->getKey())
+            ->update(['read_at' => now()]);
     }
 
     /**
      * Notification unread count for the user.
      */
     public function unreadCount(): int
     {
-        return Notification::unread()->whereNotifiableId(
-            Nova::user($this)->getKey()
-        )->count();
+        return Notification::unread()
+            ->whereNotifiableId($this->user()->getKey())
+            ->count();
     }
 }
diff --git a/src/Http/Requests/NovaRequest.php b/src/Http/Requests/NovaRequest.php
@@ -57,6 +57,15 @@ public static function fake(
         return $request;
     }
 
+    /** {@inheritDoc} */
+    #[\Override]
+    public function user($guard = null)
+    {
+        $guard ??= config('nova.guard');
+
+        return parent::user($guard);
+    }
+
     /**
      * Determine if this request is an inline create or attach request.
      */

Original file line number	Diff line number	Diff line change
`@@ -173,5 +173,5 @@`
`173`	`173`	`},`
`174`	`174`	`"minimum-stability": "dev",`
`175`	`175`	`"prefer-stable": true,`
`176`		`- "version": "5.7.0"`
	`176`	`+ "version": "5.7.1"`
`177`	`177`	`}`