5.6.2

laravelwebdev · laravelwebdev · commit 1cb552138628 · 2025-05-08T18:25:24.000+08:00
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
     "inertiajs/inertia-laravel": "^1.3.2|^2.0",
     "laravel/fortify": "^1.25.4",
     "nesbot/carbon": "^2.62.1|^3.4",
-    "orchestra/sidekick": "^1.2.0",
+    "orchestra/sidekick": "^1.2.1",
     "rap2hpoutre/fast-excel": "^5.4",
     "spatie/once": "^3.0",
     "symfony/console": "^6.4.14|^7.0.3",
@@ -45,7 +45,7 @@
     "orchestra/workbench": "^8.17.4|^9.13.4|^10.0.3",
     "phpstan/phpstan": "^1.12.20|^2.1.13",
     "phpunit/phpunit": "^10.5.35|^11.3.5",
-    "predis/predis": "^2.3",
+    "predis/predis": "^2.3|^3.0",
     "spatie/laravel-ray": "^1.39.1"
   },
   "autoload": {
@@ -173,5 +173,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.6.1"
+  "version": "5.6.2"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,11 +12,11 @@
     "test": "./node_modules/.bin/jest"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.27.1",
+    "@babel/preset-env": "^7.26.7",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@types/lodash": "^4.17.16",
-    "@vue/babel-plugin-jsx": "^1.4.0",
+    "@types/lodash": "^4.17.15",
+    "@vue/babel-plugin-jsx": "^1.2.5",
     "@vue/babel-preset-jsx": "^1.4.0",
     "@vue/compiler-sfc": "^3.5.13",
     "@vue/test-utils": "^2.4.6",
@@ -29,7 +29,7 @@
     "cross-env": "^7.0.3",
     "jest": "^27.5.1",
     "laravel-mix": "^6.0.49",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.1",
     "postcss-import": "^14.1.0",
     "postcss-rtlcss": "^3.7.2",
     "tailwindcss": "^3.4.17",
@@ -47,7 +47,7 @@
     "@vueuse/core": "^10.11.1",
     "@vueuse/integrations": "^10.11.1",
     "autosize": "^4.0.4",
-    "axios": "^1.9.0",
+    "axios": "^1.8.1",
     "chartist": "^1.3.1",
     "chartist-plugin-tooltips-updated": "^1.0.0",
     "codemirror": "^5.65.19",
@@ -56,7 +56,7 @@
     "focus-trap": "^7.6.4",
     "inflector-js": "^1.0.1",
     "js-cookie": "^2.2.1",
-    "laravel-echo": "^1.19.0",
+    "laravel-echo": "^1.16.1",
     "laravel-vapor": "^0.7.1",
     "lodash": "^4.17.21",
     "luxon": "^1.28.1",
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,9 +1,9 @@
 {
-    "/app.js": "/app.js?id=e1d3fc1d89e57f58900ff2e1238ee574",
+    "/app.js": "/app.js?id=38b7298c1ee41697a7f6a7f50fdce531",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
-    "/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",
-    "/vendor.js": "/vendor.js?id=f48b6aa9dda0a3f022e52aab3427f7ec",
+    "/app.css": "/app.css?id=765b33130b253cf418b26f27b6918d2c",
+    "/vendor.js": "/vendor.js?id=93fac1761211fa11cf1740215ce16d3b",
     "/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/resources/js/fields/Form/BooleanField.vue b/resources/js/fields/Form/BooleanField.vue
@@ -4,7 +4,7 @@
     :errors="errors"
     :show-help-text="showHelpText"
     :full-width-content="fullWidthContent"
-    @focus-form-input="toggle"
+    @focus-form-input="toggleFromLabel"
   >
     <template #field>
       <Checkbox
@@ -54,6 +54,12 @@ export default {
       this.fillIfVisible(formData, this.fieldAttribute, this.trueValue)
     },
 
+    toggleFromLabel() {
+      if (!this.currentlyIsReadonly) {
+        this.toggle()
+      }
+    },
+
     toggle() {
       this.value = !this.value
 
diff --git a/resources/js/layouts/MainHeader.vue b/resources/js/layouts/MainHeader.vue
@@ -20,6 +20,8 @@
         >
           <AppLogo class="h-6" />
         </Link>
+
+        <LicenseWarning />
       </div>
 
       <div class="flex flex-1 px-4 sm:px-8 lg:px-12">
@@ -124,6 +126,7 @@
 
 <script setup>
 import { useStore } from 'vuex'
+import LicenseWarning from '@/components/LicenseWarning'
 import { Button } from 'laravel-nova-ui'
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
 import { computed, onBeforeUnmount, useTemplateRef, watch } from 'vue'
diff --git a/src/Actions/Action.php b/src/Actions/Action.php
@@ -28,6 +28,7 @@
 use Stringable;
 
 /**
+ * @phpstan-type TModel \Illuminate\Database\Eloquent\Model
  * @phpstan-type TAuthoriseCallback \Closure(\Laravel\Nova\Http\Requests\NovaRequest):bool
  *
  * @phpstan-property TAuthoriseCallback|null $seeCallback
@@ -221,6 +222,13 @@ class Action implements JsonSerializable
      */
     public $handleCallback = null;
 
+    /**
+     * The underlying model resource instance.
+     *
+     * @var TModel|null
+     */
+    public $resource;
+
     /**
      * Create a new action using the given callback.
      *
diff --git a/src/Actions/ActionEvent.php b/src/Actions/ActionEvent.php
@@ -13,7 +13,7 @@
 use Laravel\Nova\Util;
 use Throwable;
 
-use function Orchestra\Sidekick\Eloquent\normalize_value;
+use function Orchestra\Sidekick\Eloquent\model_state;
 
 /**
  * @property \Illuminate\Database\Eloquent\Model $target
@@ -86,6 +86,8 @@ public function target()
      */
     public static function forResourceCreate($user, $model)
     {
+        [$original, $changes] = model_state($model);
+
         return new static([
             'batch_id' => (string) Str::orderedUuid(),
             'user_id' => $user->getAuthIdentifier(),
@@ -97,8 +99,8 @@ public static function forResourceCreate($user, $model)
             'model_type' => $model->getMorphClass(),
             'model_id' => $model->getKey(),
             'fields' => '',
-            'original' => null,
-            'changes' => array_diff_key($model->attributesToArray(), array_flip($model->getHidden())),
+            'original' => $original,
+            'changes' => $changes,
             'status' => 'finished',
             'exception' => '',
         ]);
@@ -113,6 +115,8 @@ public static function forResourceCreate($user, $model)
      */
     public static function forResourceUpdate($user, $model)
     {
+        [$original, $changes] = model_state($model);
+
         return new static([
             'batch_id' => (string) Str::orderedUuid(),
             'user_id' => $user->getAuthIdentifier(),
@@ -124,12 +128,8 @@ public static function forResourceUpdate($user, $model)
             'model_type' => $model->getMorphClass(),
             'model_id' => $model->getKey(),
             'fields' => '',
-            'changes' => static::hydrateChangesPayload(
-                $changes = array_diff_key($model->getDirty(), array_flip($model->getHidden()))
-            ),
-            'original' => static::hydrateChangesPayload(
-                array_intersect_key($model->newInstance()->setRawAttributes($model->getRawOriginal())->attributesToArray(), $changes)
-            ),
+            'changes' => $changes,
+            'original' => $original,
             'status' => 'finished',
             'exception' => '',
         ]);
@@ -144,6 +144,8 @@ public static function forResourceUpdate($user, $model)
      */
     public static function forAttachedResource(NovaRequest $request, $parent, $pivot)
     {
+        [$original, $changes] = model_state($pivot);
+
         return new static([
             'batch_id' => (string) Str::orderedUuid(),
             'user_id' => Nova::user($request)->getAuthIdentifier(),
@@ -155,8 +157,8 @@ public static function forAttachedResource(NovaRequest $request, $parent, $pivot
             'model_type' => $pivot->getMorphClass(),
             'model_id' => $pivot->getKey(),
             'fields' => '',
-            'original' => null,
-            'changes' => array_diff_key($pivot->attributesToArray(), $pivot->getHidden()),
+            'original' => $original,
+            'changes' => $changes,
             'status' => 'finished',
             'exception' => '',
         ]);
@@ -171,6 +173,8 @@ public static function forAttachedResource(NovaRequest $request, $parent, $pivot
      */
     public static function forAttachedResourceUpdate(NovaRequest $request, $parent, $pivot)
     {
+        [$original, $changes] = model_state($pivot);
+
         return new static([
             'batch_id' => (string) Str::orderedUuid(),
             'user_id' => Nova::user($request)->getAuthIdentifier(),
@@ -182,12 +186,8 @@ public static function forAttachedResourceUpdate(NovaRequest $request, $parent,
             'model_type' => $pivot->getMorphClass(),
             'model_id' => $pivot->getKey(),
             'fields' => '',
-            'changes' => static::hydrateChangesPayload(
-                $changes = array_diff_key($pivot->getDirty(), array_flip($pivot->getHidden()))
-            ),
-            'original' => static::hydrateChangesPayload(
-                array_intersect_key($pivot->newInstance()->setRawAttributes($pivot->getRawOriginal())->attributesToArray(), $changes)
-            ),
+            'changes' => $changes,
+            'original' => $original,
             'status' => 'finished',
             'exception' => '',
         ]);
@@ -433,14 +433,4 @@ public function getTable(): string
     {
         return 'action_events';
     }
-
-    /**
-     * Hydrate the changes payuload.
-     */
-    protected static function hydrateChangesPayload(array $attributes): array
-    {
-        return collect($attributes)
-            ->transform(static fn ($value) => normalize_value($value))
-            ->all();
-    }
 }
diff --git a/src/Auth/Actions/UpdateUserPassword.php b/src/Auth/Actions/UpdateUserPassword.php
@@ -27,7 +27,7 @@ public function update(
 
         Validator::make($input, [
             'current_password' => ['required', 'string', "current_password:{$userGuard}"],
-            'password' => $this->passwordRules(),
+            'password' => $this->passwordWithConfirmedRules(),
         ], [
             'current_password.current_password' => __('The provided password does not match your current password.'),
         ])->validate();
diff --git a/src/Fields/FieldMergeValue.php b/src/Fields/FieldMergeValue.php
@@ -34,13 +34,12 @@ public function __isset($offset): bool
      * Get the value for a given offset.
      *
      * @param  string  $offset
-     * @return mixed
      */
     public function __get($offset): mixed
     {
         return match ($offset) {
             'fields' => $this->data,
-            default => throw new InvalidArgumentException(sprintf('Unable to retrieve $%s value', $offset)),
+            default => throw new InvalidArgumentException(\sprintf('Unable to retrieve $%s value', $offset)),
         };
     }
 
diff --git a/src/ResolvesActions.php b/src/ResolvesActions.php
@@ -57,12 +57,18 @@ public function availableActionsOnIndex(NovaRequest $request): ActionCollection
                     ->authorizedToSeeOnIndex($request);
 
         if (model_exists($resource)) {
-            return $actions->withAuthorizedToRun($request, $resource)->values();
+            return $actions->withAuthorizedToRun($request, $resource)
+                ->each(static function ($action) use ($resource) {
+                    $action->resource = $resource;
+                })->values();
         }
 
         if (! \is_null($resources = $request->selectedResources())) {
             $resources->each(static function ($resource) use ($request, $actions) {
-                $actions->withAuthorizedToRun($request, $resource);
+                $actions->withAuthorizedToRun($request, $resource)
+                    ->each(static function ($action) use ($resource) {
+                        $action->resource = $resource;
+                    });
             });
 
             return $actions->values();
@@ -81,6 +87,9 @@ public function availableActionsOnDetail(NovaRequest $request): ActionCollection
         return $this->resolveActions($request)
                     ->authorizedToSeeOnDetail($request)
                     ->withAuthorizedToRun($request, $this->resource)
+                    ->each(function ($action) {
+                        $action->resource = $this->resource;
+                    })
                     ->values();
     }
 
@@ -94,6 +103,9 @@ public function availableActionsOnTableRow(NovaRequest $request): ActionCollecti
         return $this->resolveActions($request)
                     ->authorizedToSeeOnTableRow($request)
                     ->withAuthorizedToRun($request, $this->resource)
+                    ->each(function ($action) {
+                        $action->resource = $this->resource;
+                    })
                     ->values();
     }
 
diff --git a/src/Tabs/Tab.php b/src/Tabs/Tab.php
@@ -11,6 +11,7 @@
 /**
  * @phpstan-import-type TFields from \Laravel\Nova\Resource
  * @phpstan-import-type TPanelFields from \Laravel\Nova\Fields\FieldMergeValue
+ * @phpstan-import-type TGroupFields from \Laravel\Nova\Tabs\TabsGroup
  *
  * @method static static make(\Stringable|string $name, callable|array $fields, ?string $attribute = null)
  */
@@ -59,7 +60,7 @@ public function __construct(
      * @param  (callable():(iterable))|iterable  $fields
      * @return \Laravel\Nova\Tabs\TabsGroup
      *
-     * @phpstan-param (callable():(TPanelFields))|TPanelFields $fields
+     * @phpstan-param (callable():(TGroupFields))|TGroupFields $fields
      */
     public static function group($name = null, callable|iterable $fields = [], ?string $attribute = null)
     {
diff --git a/src/Tabs/TabsGroup.php b/src/Tabs/TabsGroup.php
@@ -13,6 +13,8 @@
  * @phpstan-import-type TFields from \Laravel\Nova\Resource
  * @phpstan-import-type TPanelFields from \Laravel\Nova\Fields\FieldMergeValue
  *
+ * @phpstan-type TGroupFields iterable<int, TFields|\Laravel\Nova\Tabs\Tab>
+ *
  * @method static static make(\Stringable|string|null $name = null, callable|iterable $fields = [], ?string $attribute = null)
  */
 class TabsGroup extends Panel
@@ -31,6 +33,8 @@ class TabsGroup extends Panel
 
     /**
      * List of tabs.
+     *
+     * @var array<int, \Laravel\Nova\Tabs\Tab>
      */
     public array $tabs = [];
 
@@ -49,6 +53,8 @@ class TabsGroup extends Panel
      *
      * @param  \Stringable|string|null  $name
      * @param  (callable():(iterable))|iterable  $fields
+     *
+     * @phpstan-param (callable():(TGroupFields))|TGroupFields  $fields
      */
     public function __construct($name = null, callable|iterable $fields = [], ?string $attribute = null)
     {
