Skip to content
This repository has been archived by the owner on Jul 16, 2023. It is now read-only.

Added functionality to ensure that only fields that is changed gets validated #259

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
},
"require": {
"php": ">=5.3.0",
"illuminate/support": "~4.1",
"illuminate/database": "~4.1",
"illuminate/validation": "~4.1"
"illuminate/support": "~5.0",
"illuminate/database": "~5.0",
"illuminate/validation": "~5.0"
},
"autoload": {
"psr-0": {
Expand Down
20 changes: 20 additions & 0 deletions src/LaravelBook/Ardent/Ardent.php
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,27 @@ public function validate(array $rules = array(), array $customMessages = array()

// check for overrides, then remove any empty rules
$rules = (empty($rules))? static::$rules : $rules;

// make sure primary key is validated
if (!isset($rules[$this->primaryKey])) {
$rules[$this->primaryKey] = 'unique:'.$this->table;
}

foreach ($rules as $field => $rls) {

// check if unique fields have been modified or not, if not, exclude them from validation
$uPos = strpos($rls, 'unique');

if ($uPos !== false) {
// didnt change
if ($this->$field == $this->getOriginal($field)) {
// remove the unique rule as field didnt change
$uEPos = strpos($rls, '|', $uPos);
$uEPos = $uEPos ? $uEPos : strlen($rls);
$rules[$field] = substr($rls, 0, $uPos) . substr($rls, $uEPos);
}
}

if ($rls == '') {
unset($rules[$field]);
}
Expand Down