Skip to content
Merged
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
22 changes: 22 additions & 0 deletions src/Rules/Defaults.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

namespace Rakit\Validation\Rules;

use Rakit\Validation\Rule;

class Defaults extends Rule
{

protected $message = "The :attribute default is :default";

protected $fillable_params = ['default'];

public function check($value)
{
$this->requireParameters($this->fillable_params);

$default = $this->parameter('default');
return $default;
}

}
33 changes: 32 additions & 1 deletion src/Validation.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Rakit\Validation\Rules\Required;
use Closure;
use Rakit\Validation\Rules\Defaults;

class Validation
{
Expand All @@ -19,6 +20,9 @@ class Validation
protected $aliases = [];

protected $messageSeparator = ':';

protected $validData = [];
protected $invalidData = [];

public function __construct(Validator $validator, array $inputs, array $rules, array $messages = array())
{
Expand Down Expand Up @@ -72,21 +76,34 @@ protected function validateAttribute(Attribute $attribute)
$value = $this->getValue($attributeKey);
$isEmptyValue = $this->isEmptyValue($value);

$isValid = true;
foreach($rules as $ruleValidator) {
if ($isEmptyValue && $ruleValidator instanceof Defaults) {
$value = $ruleValidator->check(null);
$isEmptyValue = $this->isEmptyValue($value);
continue;
}

if ($isEmptyValue AND $this->ruleIsOptional($attribute, $ruleValidator)) {
continue;
}

$valid = $ruleValidator->check($value);

if (!$valid) {
$isValid = false;
$this->addError($attribute, $value, $ruleValidator);

if ($ruleValidator->isImplicit()) {
break;
}
}
}

if ($isValid) {
$this->validData[$attributeKey] = $value;
} else {
$this->invalidData[$attributeKey] = $value;
}
}

protected function isArrayAttribute(Attribute $attribute)
Expand Down Expand Up @@ -421,5 +438,19 @@ protected function resolveInputAttributes(array $inputs)

return $resolvedInputs;
}

public function getValidatedData() {
return array_merge($this->validData, $this->invalidData);
}

public function getValidData()
{
return $this->validData;
}

public function getInvalidData()
{
return $this->invalidData;
}

}
2 changes: 2 additions & 0 deletions src/Validator.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ protected function registerBaseValidators()
'callback' => new Rules\Callback,
'before' => new Rules\Before,
'after' => new Rules\After,
'defaults' => new Rules\Defaults,
'default' => new Rules\Defaults, // alias of defaults
];

foreach($baseValidator as $key => $validator) {
Expand Down
20 changes: 20 additions & 0 deletions tests/Rules/DefaultsTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

use Rakit\Validation\Rules\Defaults;

class DefaultsTest extends PHPUnit_Framework_TestCase
{

public function setUp()
{
$this->rule = new Defaults;
}

public function testDefaults()
{
$this->assertEquals($this->rule->fillParameters([10])->check(null), 10);
$this->assertEquals($this->rule->fillParameters(['something'])->check(null), 'something');
$this->assertEquals($this->rule->fillParameters([[1,2,3]])->check('anything'), [1,2,3]);
}

}
40 changes: 40 additions & 0 deletions tests/ValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -709,4 +709,44 @@ public function testSetAttributeAliases()
$this->assertEquals($errors->first('something:numeric'), 'Baz baz');
$this->assertEquals($errors->first('comments.0.text:required'), 'Qux qux');
}

public function testUsingDefaults()
{
$validation = $this->validator->validate([
'is_active' => null,
'is_published' => 'invalid-value'
], [
'is_active' => 'defaults:0|required|in:0,1',
'is_enabled' => 'defaults:1|required|in:0,1',
'is_published' => 'required|in:0,1'
]);

$this->assertFalse($validation->passes());

$errors = $validation->errors();
$this->assertNull($errors->first('is_active'));
$this->assertNull($errors->first('is_enabled'));
$this->assertNotNull($errors->first('is_published'));

// Getting (all) validated data
$validatedData = $validation->getValidatedData();
$this->assertEquals($validatedData, [
'is_active' => '0',
'is_enabled' => '1',
'is_published' => 'invalid-value'
]);

// Getting only valid data
$validData = $validation->getValidData();
$this->assertEquals($validData, [
'is_active' => '0',
'is_enabled' => '1'
]);

// Getting only invalid data
$invalidData = $validation->getInvalidData();
$this->assertEquals($invalidData, [
'is_published' => 'invalid-value',
]);
}
}