5.5.4

laravelwebdev · laravelwebdev · commit 3060f231c0e1 · 2025-04-22T13:32:41.000+08:00
diff --git a/bun.lockb b/bun.lockb
diff --git a/composer.json b/composer.json
@@ -28,18 +28,20 @@
     "symfony/deprecation-contracts": "^2.5|^3.0",
     "symfony/finder": "^6.4.13|^7.0.3",
     "symfony/polyfill-intl-icu": "^1.31",
+    "symfony/polyfill-php82": "^1.31",
     "symfony/polyfill-php83": "^1.31",
     "symfony/polyfill-php84": "^1.31",
     "symfony/process": "^6.4.14|^7.0.3"
   },
   "require-dev": {
     "doctrine/dbal": "^3.5.1|^4.0",
     "larastan/larastan": "^2.9.14|^3.1",
+    "laravel/nova-devtool": "^1.8",
     "laravel/pint": "^1.20",
     "laravel/scout": "^10.12.2",
     "orchestra/testbench-core": "^8.35|^9.12|^10.1",
     "orchestra/testbench-dusk": "^8.36|^9.15|^10.1",
-    "orchestra/workbench": "^8.17.3|^9.13.3|^10.0.1",
+    "orchestra/workbench": "^8.17.4|^9.13.4|^10.0.3",
     "phpstan/phpstan": "^1.12.20|^2.1.7",
     "phpunit/phpunit": "^10.5.35|^11.3.5",
     "predis/predis": "^2.3",
@@ -170,5 +172,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.5.3"
+  "version": "5.5.4"
 }
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.26.7",
+    "@babel/preset-env": "^7.26.9",
     "@tailwindcss/container-queries": "^0.1.1",
     "@tailwindcss/typography": "^0.5.16",
-    "@types/lodash": "^4.17.15",
-    "@vue/babel-plugin-jsx": "^1.2.5",
+    "@types/lodash": "^4.17.16",
+    "@vue/babel-plugin-jsx": "^1.4.0",
     "@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.1",
+    "postcss": "^8.5.3",
     "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.8.1",
+    "axios": "^1.8.4",
     "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.16.1",
+    "laravel-echo": "^1.19.0",
     "laravel-vapor": "^0.7.1",
     "lodash": "^4.17.21",
     "luxon": "^1.28.1",
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=2ed44de0138d16238ba20f9944de40af",
+    "/app.js": "/app.js?id=884ec8563d6be8e3fdef3eeaa3868758",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",
-    "/vendor.js": "/vendor.js?id=d4575477537b83268fdef08ed2409b9d",
+    "/vendor.js": "/vendor.js?id=eebeb328ddc112be14198734fc6e7076",
     "/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/public/vendor.js.LICENSE.txt b/public/vendor.js.LICENSE.txt
@@ -485,6 +485,8 @@
 
 /*! @license DOMPurify 3.2.3 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.2.3/LICENSE */
 
+/*! Axios v1.8.4 Copyright (c) 2025 Matt Zabriskie and contributors */
+
 /*! Hammer.JS - v2.0.7 - 2016-04-22
  * http://hammerjs.github.io/
  *
diff --git a/src/Auth/Actions/ResetUserPassword.php b/src/Auth/Actions/ResetUserPassword.php
@@ -18,8 +18,10 @@ class ResetUserPassword implements ResetsUserPasswords
      * @param  \Illuminate\Contracts\Auth\CanResetPassword&\Illuminate\Database\Eloquent\Model  $user
      * @param  array<string, string>  $input
      */
-    public function reset(CanResetPassword $user, array $input): void
-    {
+    public function reset(
+        CanResetPassword $user,
+        #[\SensitiveParameter] array $input
+    ): void {
         Validator::make($input, [
             'password' => $this->passwordWithConfirmedRules(),
         ])->validate();
diff --git a/src/Auth/Actions/UpdateUserPassword.php b/src/Auth/Actions/UpdateUserPassword.php
@@ -19,8 +19,10 @@ class UpdateUserPassword implements UpdatesUserPasswords
      * @param  \Illuminate\Contracts\Auth\Authenticatable&\Illuminate\Database\Eloquent\Model  $user
      * @param  array<string, string>  $input
      */
-    public function update(Authenticatable $user, array $input): void
-    {
+    public function update(
+        Authenticatable $user,
+        #[\SensitiveParameter] array $input
+    ): void {
         $userGuard = Util::userGuard();
 
         Validator::make($input, [
diff --git a/src/Nova.php b/src/Nova.php
@@ -799,7 +799,7 @@ class_exists($value, false) => class_basename($value),
             return $value->label();
         }
 
-        return Str::headline($value->name);
+        return Str::title(str_replace('_', ' ', $value->name));
     }
 
     /**
diff --git a/src/Tabs/Tab.php b/src/Tabs/Tab.php
@@ -2,6 +2,9 @@
 
 namespace Laravel\Nova\Tabs;
 
+use Illuminate\Http\Resources\ConditionallyLoadsAttributes;
+use Illuminate\Http\Resources\MissingValue;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use JsonSerializable;
 use Laravel\Nova\Makeable;
@@ -12,6 +15,7 @@
  */
 class Tab implements JsonSerializable
 {
+    use ConditionallyLoadsAttributes;
     use Makeable;
 
     /**
@@ -24,6 +28,13 @@ class Tab implements JsonSerializable
      */
     public string $attribute;
 
+    /**
+     * List of fields available for the tab.
+     *
+     * @var array<int, \Laravel\Nova\Fields\Field>
+     */
+    public array $fields = [];
+
     /**
      * The position of the tab.
      */
@@ -33,15 +44,22 @@ class Tab implements JsonSerializable
      * Construct a new tab instance.
      *
      * @param  \Stringable|string  $name
-     * @param  array<int, \Laravel\Nova\Fields\Field>  $fields
+     * @param  (callable():(iterable))|iterable  $fields
      */
     public function __construct(
         $name,
-        public array $fields,
+        callable|iterable $fields,
         ?string $attribute = null,
     ) {
         $this->name = $name;
         $this->attribute = $attribute ?? Str::slug($name);
+
+        $fields = \is_callable($fields) ? \call_user_func($fields) : $fields;
+
+        $this->fields = collect($this->filter($fields instanceof Collection ? $fields->all() : $fields))
+                ->reject(static fn ($field) => $field instanceof MissingValue)
+                ->values()
+                ->all();
     }
 
     /**
diff --git a/src/Util.php b/src/Util.php
@@ -48,7 +48,7 @@ public static function isNovaRequest(Request $request): bool
     }
 
     /**
-     * Convert large integer higher than Number.MAX_SAFE_INTEGER to string.
+     * Convert a large integer higher than Number.MAX_SAFE_INTEGER to string.
      *
      * https://stackoverflow.com/questions/47188449/json-max-int-number/47188576
      */
@@ -149,7 +149,7 @@ public static function userModel(): ?string
     }
 
     /**
-     * Get the user model for Laravel Nova, use default User model available from Framework as fallback.
+     * Get the user model for Laravel Nova, use the default User model available from Framework as a fallback.
      *
      * @return class-string<\Illuminate\Foundation\Auth\User|\Illuminate\Database\Eloquent\Model>
      */
@@ -171,7 +171,7 @@ public static function userModelFromGuard(string $guard): ?string
     }
 
     /**
-     * Get the session auth guard for the model.
+     * Get the session authentication guard for the model.
      *
      * @param  class-string<\Illuminate\Database\Eloquent\Model>|\Illuminate\Database\Eloquent\Model  $model
      */
@@ -264,7 +264,7 @@ public static function eol(string $content): string
     }
 
     /**
-     * Expect given model to implements `Pivot` class or uses `AsPivot` trait.
+     * Expect the given model to implement `Pivot` class or use `AsPivot` trait.
      *
      * @param  (\Illuminate\Database\Eloquent\Model&\Illuminate\Database\Eloquent\Relations\Concerns\AsPivot)|\Illuminate\Database\Eloquent\Relations\Pivot  $pivot
      * @return (\Illuminate\Database\Eloquent\Model&\Illuminate\Database\Eloquent\Relations\Concerns\AsPivot)|\Illuminate\Database\Eloquent\Relations\Pivot
diff --git a/src/WithBadge.php b/src/WithBadge.php
@@ -9,17 +9,10 @@ trait WithBadge
     /**
      * The badge content for the menu item.
      *
-     * @var (\Closure():(\Laravel\Nova\Badge|string))|(callable():(\Laravel\Nova\Badge|string))|\Laravel\Nova\Badge|string|null
+     * @var (\Closure():(\Laravel\Nova\Badge|string|false))|(callable():(\Laravel\Nova\Badge|string|false))|\Laravel\Nova\Badge|string|false|null
      */
     public $badgeCallback;
 
-    /**
-     * The condition for showing the badge inside the menu item.
-     *
-     * @var (\Closure():bool)|bool
-     */
-    public $badgeCondition = true;
-
     /**
      * The type of badge that should represent the item.
      *
@@ -30,7 +23,7 @@ trait WithBadge
     /**
      * Set the content to be used for the item's badge.
      *
-     * @param  \Laravel\Nova\Badge|(callable():(\Laravel\Nova\Badge|string))|string  $badgeCallback
+     * @param  \Laravel\Nova\Badge|(callable():(\Laravel\Nova\Badge|string|false))|string  $badgeCallback
      * @return $this
      */
     public function withBadge(Badge|callable|string $badgeCallback, string $type = 'info')
@@ -51,43 +44,45 @@ public function withBadge(Badge|callable|string $badgeCallback, string $type = '
     /**
      * Set the content to be used for the item's badge if the condition matches.
      *
-     * @param  \Laravel\Nova\Badge|(callable():(\Laravel\Nova\Badge|string))|string  $badgeCallback
+     * @param  \Laravel\Nova\Badge|(callable():(\Laravel\Nova\Badge|string|false))|string  $badgeCallback
      * @param  (\Closure():(bool))|bool  $condition
      * @return $this
      */
     public function withBadgeIf(Badge|callable|string $badgeCallback, string $type, Closure|bool $condition)
     {
-        $this->badgeCondition = $condition;
-
-        $this->withBadge($badgeCallback, $type);
+        $this->withBadge(function () use ($badgeCallback, $condition) {
+            if (value($condition) === true) {
+                return \is_callable($badgeCallback) ? \call_user_func($badgeCallback) : $badgeCallback;
+            } else {
+                return false;
+            }
+        }, $type);
 
         return $this;
     }
 
     /**
      * Resolve the badge for the item.
+     *
+     * @throws \Exception
      */
     public function resolveBadge(): ?Badge
     {
-        if (value($this->badgeCondition)) {
-            if (\is_callable($this->badgeCallback)) {
-                /** @var \Laravel\Nova\Badge|string|null $result */
-                $result = \call_user_func($this->badgeCallback);
-
-                if (\is_null($result)) {
-                    throw new \Exception('A menu item badge must always have a value.');
-                }
-
-                if (! $result instanceof Badge) {
-                    return Badge::make($result, $this->badgeType);
-                }
+        if (! \is_callable($this->badgeCallback)) {
+            return $this->badgeCallback;
+        }
 
-                return $result;
-            }
+        /** @var \Laravel\Nova\Badge|string|false|null $result */
+        $result = \call_user_func($this->badgeCallback);
 
-            return $this->badgeCallback;
+        if (\is_null($result)) {
+            throw new \Exception('A menu item badge must always have a value.');
         }
 
-        return null;
+        return match (true) {
+            $result === false => null,
+            ! $result instanceof Badge => Badge::make($result, $this->badgeType),
+            default => $result,
+        };
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -485,6 +485,8 @@`
`485`	`485`
`486`	`486`	`/! @license DOMPurify 3.2.3 \| (c) Cure53 and other contributors \| Released under the Apache license 2.0 and Mozilla Public License 2.0 \| github.com/cure53/DOMPurify/blob/3.2.3/LICENSE /`
`487`	`487`
	`488`	`+/! Axios v1.8.4 Copyright (c) 2025 Matt Zabriskie and contributors /`
	`489`	`+`
`488`	`490`	`/*! Hammer.JS - v2.0.7 - 2016-04-22`
`489`	`491`	`* http://hammerjs.github.io/`
`490`	`492`	`*`