|
4 | 4 |
|
5 | 5 | use Illuminate\Http\Request;
|
6 | 6 | use Illuminate\Routing\Router;
|
7 |
| -use Illuminate\Support\MessageBag; |
8 |
| -use Illuminate\Support\ViewErrorBag; |
9 | 7 | use Illuminate\Contracts\Http\Kernel;
|
10 | 8 | use Illuminate\Support\Facades\Blade;
|
11 | 9 | use Illuminate\Support\Facades\Session;
|
@@ -62,27 +60,17 @@ protected function shareValidationErrors()
|
62 | 60 | }
|
63 | 61 |
|
64 | 62 | Inertia::share('errors', function () {
|
65 |
| - $errors = Session::get('errors', new ViewErrorBag()); |
66 |
| - |
67 |
| - if (is_array($errors) && count($errors) > 0) { |
68 |
| - $errors = (new ViewErrorBag())->put('default', new MessageBag($errors)); |
69 |
| - } elseif ($errors instanceof MessageBag && $errors->any()) { |
70 |
| - $errors = (new ViewErrorBag())->put('default', $errors); |
71 |
| - } elseif (! $errors instanceof ViewErrorBag) { |
| 63 | + if (! Session::has('errors')) { |
72 | 64 | return (object) [];
|
73 | 65 | }
|
74 | 66 |
|
75 |
| - $formatted = collect($errors->getBags())->map(function (MessageBag $bag) { |
| 67 | + return (object) collect(Session::get('errors')->getBags())->map(function ($bag) { |
76 | 68 | return collect($bag->messages())->map(function ($errors) {
|
77 | 69 | return $errors[0];
|
78 | 70 | });
|
79 |
| - }); |
80 |
| - |
81 |
| - if ($formatted->count() === 1 && $formatted->has('default')) { |
82 |
| - return (object) $formatted->toArray()['default']; |
83 |
| - } |
84 |
| - |
85 |
| - return (object) $formatted->toArray(); |
| 71 | + })->pipe(function ($bags) { |
| 72 | + return $bags->has('default') ? $bags->get('default') : $bags; |
| 73 | + })->toArray(); |
86 | 74 | });
|
87 | 75 | }
|
88 | 76 | }
|
0 commit comments