Support array-based error bags + use data provider

Author: claudiodekker

src/ServiceProvider.php

@@ -64,7 +64,13 @@ protected function shareValidationErrors()
         Inertia::share('errors', function () {
             $errors = Session::get('errors', new ViewErrorBag());
 
-            if (is_array($errors) && count($errors) > 0) {
+            if (is_array($errors) && count($errors) > 0 && is_array($errors[array_keys($errors)[0]])) {
+                $errors = tap(new ViewErrorBag(), function ($bag) use ($errors) {
+                    foreach ($errors as $key => $messages) {
+                        $bag->put($key, new MessageBag($messages));
+                    }
+                });
+            } elseif (is_array($errors) && count($errors) > 0) {
                 $errors = (new ViewErrorBag())->put('default', new MessageBag($errors));
             } elseif ($errors instanceof MessageBag && $errors->any()) {
                 $errors = (new ViewErrorBag())->put('default', $errors);

tests/ServiceProviderTest.php

@@ -75,26 +75,40 @@ public function test_validation_errors_are_not_registered_when_already_registere
         $this->assertSame('This is a validation error', Inertia::getShared('errors'));
     }
 
-    public function test_validation_errors_can_be_an_array()
+    public function basicValidationErrorsProvider()
     {
-        Session::put('errors', [
+        $array = [
+            'name' => 'The name field is required.',
+            'email' => [
+                'The email must be a valid email address.',
+            ],
+        ];
+
+        $messageBag = new MessageBag([
             'name' => 'The name field is required.',
             'email' => 'The email must be a valid email address.',
         ]);
 
-        $errors = Inertia::getShared('errors')();
+        $viewErrorBag = (new ViewErrorBag())->put('default', new MessageBag([
+            'name' => [
+                'The name field is required.',
+            ],
+            'email' => 'The email must be a valid email address.',
+        ]));
 
-        $this->assertIsObject($errors);
-        $this->assertSame('The name field is required.', $errors->name);
-        $this->assertSame('The email must be a valid email address.', $errors->email);
+        return [
+            [$array],
+            [$messageBag],
+            [$viewErrorBag],
+        ];
     }
 
-    public function test_validation_exceptions_can_be_a_message_bag()
+    /**
+     * @dataProvider basicValidationErrorsProvider
+     */
+    public function test_validation_errors_are_returned_in_the_correct_format($errors)
     {
-        Session::put('errors', new MessageBag([
-            'name' => 'The name field is required.',
-            'email' => 'The email must be a valid email address.',
-        ]));
+        Session::put('errors', $errors);
 
         $errors = Inertia::getShared('errors')();
 
@@ -103,26 +117,44 @@ public function test_validation_exceptions_can_be_a_message_bag()
         $this->assertSame('The email must be a valid email address.', $errors->email);
     }
 
-    public function test_validation_exceptions_can_be_an_error_bag()
+    public function multipleErrorBagsValidationErrorsProvider()
     {
-        Session::put('errors', (new ViewErrorBag())->put('default', new MessageBag([
-            'name' => 'The name field is required.',
-            'email' => 'The email must be a valid email address.',
-        ])));
-
-        $errors = Inertia::getShared('errors')();
-
-        $this->assertIsObject($errors);
-        $this->assertSame('The name field is required.', $errors->name);
-        $this->assertSame('The email must be a valid email address.', $errors->email);
+        $array = [
+            'default' => [
+                'name' => [
+                    'The name field is required.',
+                ],
+                'email' => 'The email must be a valid email address.',
+            ],
+            'example' => [
+                'name' => 'The name field is required.',
+                'email' => 'The email must be a valid email address.',
+            ],
+        ];
+
+        $viewErrorBag = tap(new ViewErrorBag(), function ($errorBag) {
+            $errorBag->put('default', new MessageBag([
+                'name' => 'The name field is required.',
+                'email' => 'The email must be a valid email address.',
+            ]));
+            $errorBag->put('example', new MessageBag([
+                'name' => 'The name field is required.',
+                'email' => [
+                    'The email must be a valid email address.',
+                ],
+            ]));
+        });
+
+        return [
+            [$array],
+            [$viewErrorBag],
+        ];
     }
 
-    public function test_validation_exceptions_can_be_multiple_error_bags()
+    /** @dataProvider multipleErrorBagsValidationErrorsProvider */
+    public function test_validation_exceptions_can_have_multiple_error_bags($errors)
     {
-        Session::put('errors', tap(new ViewErrorBag(), function ($errorBags) {
-            $errorBags->put('default', new MessageBag(['name' => 'The name field is required.']));
-            $errorBags->put('example', new MessageBag(['email' => 'The email must be a valid email address.']));
-        }));
+        Session::put('errors', $errors);
 
         $errors = Inertia::getShared('errors')();