deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-27 17:50:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactored one, all, most and none to oneOf, allOf, noneOf and mostOf

Browse source
This commit is contained in:
Alexandre Gomes Gaigalas 2010-11-09 01:35:19 -02:00
parent b403f67739
commit 234f74a058
15 changed files with 314 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
library/Respect/Validation/Rules/AllOf.php Normal file
View file

@ -0,0 +1,35 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\InvalidException;
class AllOf extends AbstractComposite
{
public function validate($input)
{
$validators = $this->getRules();
return count($validators) === count(array_filter(
$validators,
function($v) use($input) {
return $v->validate($input);
}
));
}
public function assert($input)
{
$exceptions = $this->validateRules($input);
if (!empty($exceptions))
throw new InvalidException($exceptions);
return true;
}
public function check($input)
{
foreach ($this->getRules() as $v)
$v->assert($input);
}
}

2
library/Respect/Validation/Rules/HasAttribute.php
View file

@ -7,7 +7,7 @@ use Respect\Validation\Exceptions\AttributeNotPresentException;
use Respect\Validation\Rules\All;
use Respect\Validation\Exceptions\ComponentException;
class HasAttribute extends All
class HasAttribute extends AllOf
{
protected $attribute = '';

2
library/Respect/Validation/Rules/HasKey.php
View file

@ -8,7 +8,7 @@ use Respect\Validation\Rules\All;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Validator;
class HasKey extends All
class HasKey extends AllOf
{
protected $key = '';

16
library/Respect/Validation/Rules/MostOf.php Normal file
View file

@ -0,0 +1,16 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\InvalidException;
class MostOf extends AtLeast
{
public function __construct()
{
$this->howMany = ceil(func_num_args() / 2);
$this->addRules(func_get_args());
}
}

34
library/Respect/Validation/Rules/NoneOf.php Normal file
View file

@ -0,0 +1,34 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\InvalidException;
class NoneOf extends AbstractComposite
{
public function validate($input)
{
$validators = $this->getRules();
return count($validators) === count(array_filter(
$validators,
function($v) use($input) {
return!$v->validate($input);
}
));
}
public function assert($input)
{
$exceptions = $this->validateRules($input);
if (count($this->getRules()) !== count($exceptions))
throw new InvalidException($exceptions);
return true;
}
public function check($input)
{
return $this->assert($input);
}
}

2
library/Respect/Validation/Rules/NumericBetween.php
View file

@ -17,7 +17,7 @@ class NumericBetween extends AbstractRule
{
$this->min = $min;
$this->max = $max;
$paramValidator = Validator::one(
$paramValidator = Validator::oneOf(
Validator::numeric(), Validator::nullValue()
);
if (!$paramValidator->validate($min))

32
library/Respect/Validation/Rules/OneOf.php Normal file
View file

@ -0,0 +1,32 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\Exceptions\InvalidException;
class OneOf extends AbstractComposite
{
public function assert($input)
{
$validators = $this->getRules();
$exceptions = $this->validateRules($input);
if (count($exceptions) === count($validators))
throw new InvalidException($exceptions);
return true;
}
public function validate($input)
{
foreach ($this->getRules() as $v)
if ($v->validate($input))
return true;
return false;
}
public function check($input)
{
return $this->assert($input);
}
}

2
library/Respect/Validation/Rules/StringLength.php
View file

@ -19,7 +19,7 @@ class StringLength extends AbstractRule
{
$this->min = $min;
$this->max = $max;
$paramValidator = Validator::one(
$paramValidator = Validator::oneOf(
Validator::numeric(), Validator::nullValue()
);
if (!$paramValidator->validate($min))

4
library/Respect/Validation/Validator.php
View file

@ -2,12 +2,12 @@
namespace Respect\Validation;
use Respect\Validation\Rules\All;
use Respect\Validation\Rules\AllOf;
use ReflectionClass;
use Respect\Validation\Exceptions\ComponentException;
use ReflectionException;
class Validator extends All
class Validator extends AllOf
{
protected $ruleName;

24
library/Respect/Validation/package.xml
View file

@ -10,8 +10,8 @@
<email>alexandre@gaigalas.net</email>
<active>yes</active>
</lead>
<date>2010-11-08</date>
<time>23:56:20</time>
<date>2010-11-09</date>
<time>01:35:08</time>
<version>
<release>0.1.0</release>
<api>0.1.0</api>
@ -53,7 +53,7 @@ First Version
<file baseinstalldir="Respect/Validation" md5sum="5693643da69c0f66822a1c7baf93be62" name="Rules/AbstractComposite.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="63d6808a8e387281aeb6ab09440f3031" name="Rules/AbstractDate.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="83fd3c49fbc10a04764096a984e2085a" name="Rules/AbstractRule.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="40162c72710f37669e1ad86c2da6191e" name="Rules/All.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="166932c321924d56c62df8072d219384" name="Rules/AllOf.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="23c30b601840727384cfb17006953809" name="Rules/Alnum.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="a2b0438a1afb33bdf313eca652dde257" name="Rules/Alpha.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="9ff1781442d2917ac2d058a74d5fabdd" name="Rules/Arr.php" role="php" />
@ -64,28 +64,28 @@ First Version
<file baseinstalldir="Respect/Validation" md5sum="9d090e73cbf02732384717c7f237b5f0" name="Rules/DateBetween.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="a0b265a1f7fdadddc7873086c423ff82" name="Rules/Digits.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="5ebc3ea7c4b1f970eb30ce4dfedf7f9c" name="Rules/Float.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="e4440f96d078c95bea25d5449df549f4" name="Rules/HasAttribute.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="6f8cc9b5671f80cd8f8faddb8314e896" name="Rules/HasKey.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="338a3af7fc5949cdd26faca14c276d53" name="Rules/HasAttribute.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="d22b5b199464825f080ef93541ebb853" name="Rules/HasKey.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="9034f4c1f69241ed53461de52a94cc7a" name="Rules/HasOptionalAttribute.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="409bd3ef97ec1e4d80fe237b45215ee1" name="Rules/HasOptionalKey.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="2df96e8e150278b96cf8b34ee1a71c4d" name="Rules/Hexa.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="9ea7eaa05496bfeee36a17db9c6f84c2" name="Rules/Instance.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="60417393f6f6ec334e7d165a7d56dc32" name="Rules/Ip.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="5956d091fe397a729f64251837b9b544" name="Rules/Most.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="99c7259c2dade2dbe5c943b648ac2608" name="Rules/None.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="316c4ec62f57e82c979efd4f362fbeac" name="Rules/MostOf.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="a24ceef48c4b534540466470564b91db" name="Rules/NoneOf.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="9857b6e3d989d407ef9555dda7e7eab7" name="Rules/NoWhitespace.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="968fe27a3d8cf167fb578e13f6655f19" name="Rules/NullValue.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="57d897bc3ecfe45264f4c88ca8130259" name="Rules/Numeric.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="9f5fe19a083b96b4a4a3b227b589b998" name="Rules/NumericBetween.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="db931f5c3717b5df0a16187414f9095f" name="Rules/NumericBetween.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="5050f1d9ce2276ee3b620092df134dfd" name="Rules/Object.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="d846e49e29b6695ffc1e686ccfd92844" name="Rules/One.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="8cf06c9f4366b1ea480a8033996d278b" name="Rules/OneOf.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="acba8599cb024751e51337a1211dd082" name="Rules/Regex.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="3fcd2d83507b2b03cbd45dd63db068c6" name="Rules/Sf.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="08fc800d76dcc0aa4e14ded47993aac2" name="Rules/StringLength.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="c25c184df18e7d20843c0b7d2eb9f68e" name="Rules/StringLength.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="cfd024a9bac6a8ace92f8ccf324bca17" name="Rules/StringNotEmpty.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="2b0f271b8ea0e870c937663be56e5bd4" name="Rules/Zend.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="ff9ba258245ed557bf3487b3270780cb" name="Validatable.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="1ca82d1a225c33d9e13324b9a13ba5f6" name="Validator.php" role="php" />
<file baseinstalldir="Respect/Validation" md5sum="f58eaf419950d54b71f14222ca284530" name="Validator.php" role="php" />
</dir>
</contents>
<dependencies>
@ -109,7 +109,7 @@ First Version
<release>alpha</release>
<api>alpha</api>
</stability>
<date>2010-11-08</date>
<date>2010-11-09</date>
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD Style</license>
<notes>
First Version

45
tests/library/Respect/Validation/Rules/AllOfTest.php Normal file
View file

@ -0,0 +1,45 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\ValidatorTestCase;
use Respect\Validation\Exceptions\InvalidException;
use Respect\Validation\Validator;
class AllOfTest extends \PHPUnit_Framework_TestCase
{
public function testValid()
{
$valid1 = new Callback(function() {
return true;
});
$valid2 = new Callback(function() {
return true;
});
$valid3 = new Callback(function() {
return true;
});
$o = new AllOf($valid1, $valid2, $valid3);
$this->assertTrue($o->assert('any'));
}
/**
* @expectedException Respect\Validation\Exceptions\InvalidException
*/
public function testInvalid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return true;
});
$valid3 = new Callback(function() {
return true;
});
$o = new AllOf($valid1, $valid2, $valid3);
$this->assertFalse($o->assert('any'));
}
}

44
tests/library/Respect/Validation/Rules/MostOfTest.php Normal file
View file

@ -0,0 +1,44 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\ValidatorTestCase;
use Respect\Validation\Exceptions\InvalidException;
class MostOfTest extends \PHPUnit_Framework_TestCase
{
public function testValid()
{
$valid1 = new Callback(function() {
return true;
});
$valid2 = new Callback(function() {
return true;
});
$valid3 = new Callback(function() {
return false;
});
$o = new MostOf($valid1, $valid2, $valid3);
$this->assertTrue($o->assert('any'));
}
/**
* @expectedException Respect\Validation\Exceptions\InvalidException
*/
public function testInvalid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return false;
});
$valid3 = new Callback(function() {
return true;
});
$o = new MostOf($valid1, $valid2, $valid3);
$this->assertFalse($o->assert('any'));
}
}

44
tests/library/Respect/Validation/Rules/NoneOfTest.php Normal file
View file

@ -0,0 +1,44 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\ValidatorTestCase;
use Respect\Validation\Exceptions\InvalidException;
class NoneOfTest extends \PHPUnit_Framework_TestCase
{
public function testValid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return false;
});
$valid3 = new Callback(function() {
return false;
});
$o = new NoneOf($valid1, $valid2, $valid3);
$this->assertTrue($o->assert('any'));
}
/**
* @expectedException Respect\Validation\Exceptions\InvalidException
*/
public function testInvalid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return false;
});
$valid3 = new Callback(function() {
return true;
});
$o = new NoneOf($valid1, $valid2, $valid3);
$this->assertFalse($o->assert('any'));
}
}

44
tests/library/Respect/Validation/Rules/OneOfTest.php Normal file
View file

@ -0,0 +1,44 @@
<?php
namespace Respect\Validation\Rules;
use Respect\Validation\ValidatorTestCase;
use Respect\Validation\Exceptions\InvalidException;
class OneOfTest extends \PHPUnit_Framework_TestCase
{
public function testValid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return true;
});
$valid3 = new Callback(function() {
return false;
});
$o = new OneOf($valid1, $valid2, $valid3);
$this->assertTrue($o->assert('any'));
}
/**
* @expectedException Respect\Validation\Exceptions\InvalidException
*/
public function testInvalid()
{
$valid1 = new Callback(function() {
return false;
});
$valid2 = new Callback(function() {
return false;
});
$valid3 = new Callback(function() {
return false;
});
$o = new OneOf($valid1, $valid2, $valid3);
$this->assertFalse($o->assert('any'));
}
}

4
tests/library/Respect/Validation/ValidatorTest.php
View file

@ -32,7 +32,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
public function testValidatorComposite()
{
$v = Validator::one(
$v = Validator::oneOf(
Validator::stringNotEmpty(),
Validator::dateBetween('+2 years', '+3 years')
)->validate('now');
@ -69,7 +69,7 @@ class ValidatorTest extends \PHPUnit_Framework_TestCase
$target->name = 'Alexandre';
$validator = Validator::object()
->one(
->oneOf(
Validator::hasAttribute('screen_name',
Validator::alnum('_')->noWhitespace()),
Validator::hasAttribute('id', Validator::numeric())