Skip to content

Added attribute names support. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mattwells wants to merge 1 commit into from
Closed

Added attribute names support. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Laracasts/Validation/FactoryInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ interface FactoryInterface {
* @param array $formData
* @param array $rules
* @param array $messages
* @param array $attributeNames
* @return ValidatorInterface
*/
public function make(array $formData, array $rules, array $messages = []);
public function make(array $formData, array $rules, array $messages = [], array $attributeNames = []);

}
}
18 changes: 16 additions & 2 deletions src/Laracasts/Validation/FormValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ abstract class FormValidator {
*/
protected $messages = [];

/**
* @var array
*/
protected $attributeNames = [];

/**
* @param ValidatorFactory $validator
*/
Expand All @@ -42,7 +47,8 @@ public function validate($formData)
$this->validation = $this->validator->make(
$formData,
$this->getValidationRules(),
$this->getValidationMessages()
$this->getValidationMessages(),
$this->getAttributeNames()
);

if ($this->validation->fails())
Expand Down Expand Up @@ -70,13 +76,21 @@ public function getValidationErrors()
}

/**
* @return mixed
* @return array
*/
public function getValidationMessages()
{
return $this->messages;
}

/**
* @return array
*/
public function getAttributeNames()
{
return $this->attributeNames;
}

/**
* Normalize the provided data to an array.
*
Expand Down
9 changes: 7 additions & 2 deletions src/Laracasts/Validation/LaravelValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,16 @@ function __construct(Validator $validator)
* @param array $formData
* @param array $rules
* @param array $messages
* @param array $attributeNames
* @return \Illuminate\Validation\Validator
*/
public function make(array $formData, array $rules, array $messages = [])
public function make(array $formData, array $rules, array $messages = [], array $attributeNames = [])
{
return $this->validator->make($formData, $rules, $messages);
$validator = $this->validator->make($formData, $rules, $messages);

$attributeNames && $validator->setAttributeNames($attributeNames);

return $validator;
}

}