Return errors for attribute and attribute.locale

Author: ivanvermeyen

src/UniqueTranslationValidator.php

@@ -18,18 +18,18 @@ class UniqueTranslationValidator
      */
     public function validate($attribute, $value, $parameters, $validator) {
         $attributeParts = explode('.', $attribute);
-        $attribute = $attributeParts[0];
+        $name = $attributeParts[0];
         $locale = $attributeParts[1] ?? app()->getLocale();
         $table = $parameters[0] ?? null;
-        $column = $this->filterNullValues($parameters[1] ?? null) ?: $attribute;
+        $column = $this->filterNullValues($parameters[1] ?? null) ?: $name;
         $ignoreValue = $this->filterNullValues($parameters[2] ?? null);
         $ignoreColumn = $this->filterNullValues($parameters[3] ?? null);
 
         $isUnique = $this->isUnique($value, $locale, $table, $column, $ignoreValue, $ignoreColumn);
 
-        $validator->setCustomMessages([
-            'unique_translation' => trans('validation.unique'),
-        ]);
+        if ( ! $isUnique) {
+            $this->addErrorsToValidator($validator, $attribute, $parameters, $name, $locale);
+        }
 
         return $isUnique;
     }
@@ -110,4 +110,29 @@ protected function ignore($query, $column = null, $value = null)
 
         return $query;
     }
+
+    /**
+     * Add error messages to the validator.
+     *
+     * @param \Illuminate\Validation\Validator $validator
+     * @param string $attribute
+     * @param array $parameters
+     * @param string $name
+     * @param string $locale
+     *
+     * @return void
+     */
+    protected function addErrorsToValidator($validator, $attribute, $parameters, $name, $locale)
+    {
+        $message = trans('validation.unique');
+        $rule = 'unique_translation';
+
+        // This Validator method will format the placeholders:
+        // eg. "post_slug" will become "post slug".
+        $formattedMessage = $validator->makeReplacements($message, $attribute, $rule, $parameters);
+
+        $validator->errors()
+            ->add($name, $formattedMessage)
+            ->add("{$name}.{$locale}", $formattedMessage);
+    }
 }

tests/UniqueTranslationTest.php

@@ -52,7 +52,7 @@ public function it_checks_if_the_translation_for_the_current_locale_is_unique()
         $this->post('test', [
             'slug' => 'slug-en',
             'name' => 'name-en',
-        ])->assertSessionHasErrors(['slug', 'name']);
+        ])->assertSessionHasErrors(['slug', 'name', 'slug.en', 'name.en']);
 
         $this->post('test', [
             'slug' => 'slug-nl',
@@ -73,12 +73,12 @@ public function it_checks_if_the_translation_for_a_specific_locale_is_unique()
         $this->post('test', [
             'slug' => ['en' => 'slug-en'],
             'name' => ['en' => 'name-en'],
-        ])->assertSessionHasErrors(['slug.en', 'name.en']);
+        ])->assertSessionHasErrors(['slug', 'name', 'slug.en', 'name.en']);
 
         $this->post('test', [
             'slug' => ['nl' => 'slug-nl'],
             'name' => ['nl' => 'name-nl'],
-        ])->assertSessionHasErrors(['slug.nl', 'name.nl']);
+        ])->assertSessionHasErrors(['slug', 'name', 'slug.nl', 'name.nl']);
 
         $this->post('test', [
             'slug' => ['en' => 'different-slug-en'],
@@ -104,7 +104,7 @@ public function the_models_attribute_name_can_be_specified()
         $this->post('test-single', [
             'form_slug' => 'slug-en',
             'form_name' => 'name-en',
-        ])->assertSessionHasErrors(['form_slug', 'form_name']);
+        ])->assertSessionHasErrors(['form_slug', 'form_name', 'form_slug.en', 'form_name.en']);
 
         $rules = [
             'form_slug.*' => "{$this->rule}:{$this->table},slug",
@@ -116,7 +116,7 @@ public function the_models_attribute_name_can_be_specified()
         $this->post('test-array', [
             'form_slug' => ['nl' => 'slug-nl'],
             'form_name' => ['nl' => 'name-nl'],
-        ])->assertSessionHasErrors(['form_slug.nl', 'form_name.nl']);
+        ])->assertSessionHasErrors(['form_slug', 'form_name', 'form_slug.nl', 'form_name.nl']);
     }
 
     /** @test */
@@ -176,7 +176,7 @@ public function it_ignores_a_specific_attribute_with_the_given_value()
     }
 
     /** @test */
-    public function it_returns_the_correct_error_message()
+    public function it_returns_a_default_error_message()
     {
         $rules = [
             'form_slug' => "{$this->rule}:{$this->table},slug",
@@ -190,16 +190,28 @@ public function it_returns_the_correct_error_message()
             'form_name' => 'name-en',
         ]);
 
+        $expectedSlugError = trans('validation.unique', ['attribute' => 'form slug']);
+        $expectedNameError = trans('validation.unique', ['attribute' => 'form name']);
+
         $errors = session('errors');
+
         $returnedSlugError = $errors->first('form_slug');
         $returnedNameError = $errors->first('form_name');
-        $expectedSlugError = trans('validation.unique', ['attribute' => 'form slug']);
-        $expectedNameError = trans('validation.unique', ['attribute' => 'form name']);
 
         $this->assertNotEmpty($returnedSlugError);
         $this->assertNotEmpty($returnedNameError);
+
         $this->assertEquals($expectedSlugError, $returnedSlugError);
         $this->assertEquals($expectedNameError, $returnedNameError);
+
+        $returnedSlugArrayError = $errors->first('form_slug.en');
+        $returnedNameArrayError = $errors->first('form_name.en');
+
+        $this->assertNotEmpty($returnedSlugArrayError);
+        $this->assertNotEmpty($returnedNameArrayError);
+
+        $this->assertEquals($expectedSlugError, $returnedSlugArrayError);
+        $this->assertEquals($expectedNameError, $returnedNameArrayError);
     }
 
     /**