Return a validator provided by the fields instance. Need the password…

… fields though as they aren't normally in the blueprint.

src/Http/Requests/UserRegisterRequest.php

@@ -5,7 +5,6 @@
 use Illuminate\Contracts\Validation\Validator;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\URL;
-use Illuminate\Support\Facades\Validator as ValidatorFacade;
 use Illuminate\Support\Traits\Localizable;
 use Illuminate\Validation\Rules\Password;
 use Illuminate\Validation\ValidationException;
@@ -59,22 +58,20 @@ public function processedValues()
     public function validator()
     {
         $blueprint = User::blueprint();
+        $blueprint->ensureField('password', ['display' => __('Password')]);
+        $blueprint->ensureField('password_confirmation', ['display' => __('Password Confirmation')]);
 
         $fields = $blueprint->fields();
         $this->submittedValues = $this->valuesWithoutAssetFields($fields);
         $this->blueprintFields = $fields->addValues($this->submittedValues);
 
-        $fieldRules = $this->blueprintFields
+        return $this->blueprintFields
             ->validator()
             ->withRules([
                 'email' => ['required', 'email', new UniqueUserValue],
                 'password' => ['required', 'confirmed', Password::default()],
             ])
-            ->rules();
-
-        // should this not return ->validator() from fieldrules?
-        // tests would need updated to expect labels instead of handles
-        return ValidatorFacade::make($this->submittedValues, $fieldRules);
+            ->validator();
     }
 
     public function validateResolved()

tests/Tags/User/RegisterFormTest.php

@@ -139,8 +139,8 @@ public function it_wont_register_user_and_renders_errors()
         preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
 
         $expected = [
-            'The email field is required.',
-            'The password field is required.',
+            'The Email Address field is required.',
+            'The Password field is required.',
         ];
 
         $this->assertEmpty($success[1]);
@@ -191,8 +191,8 @@ public function it_wont_register_user_and_renders_custom_validation_errors()
         preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
 
         $expected = [
-            trans('validation.min.string', ['attribute' => 'password', 'min' => 8]), // 'The password must be at least 8 characters.',
-            trans('validation.required', ['attribute' => 'age']), // 'The age field is required.',
+            trans('validation.min.string', ['attribute' => 'Password', 'min' => 8]), // 'The password must be at least 8 characters.',
+            trans('validation.required', ['attribute' => 'Over 18 years of age?']), // 'The age field is required.',
         ];
 
         $this->assertEmpty($success[1]);
@@ -311,8 +311,8 @@ public function it_wont_register_user_and_follow_custom_redirect_with_errors()
         preg_match_all('/<p class="inline-error">(.+)<\/p>/U', $output, $inlineErrors);
 
         $expected = [
-            'The email field is required.',
-            'The password field is required.',
+            'The Email Address field is required.',
+            'The Password field is required.',
         ];
 
         $this->assertEmpty($success[1]);