mirror of
https://github.com/Respect/Validation.git
synced 2024-06-27 17:50:13 +02:00
Namespace use cleanup
This commit is contained in:
parent
dc8a07c091
commit
fa11c79339
|
@ -2,12 +2,11 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AllOf;
|
||||
use ReflectionProperty;
|
||||
use ReflectionException;
|
||||
use Respect\Validation\Validatable;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
use Respect\Validation\Exceptions\ValidationException;
|
||||
use Respect\Validation\Validatable;
|
||||
use \ReflectionProperty;
|
||||
use \ReflectionException;
|
||||
|
||||
abstract class AbstractRelated extends AbstractRule implements Validatable
|
||||
{
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Traversable;
|
||||
use Respect\Validation\Validatable;
|
||||
use Respect\Validation\Exceptions\ValidationException;
|
||||
use Traversable;
|
||||
|
||||
abstract class AbstractVector extends AbstractRule
|
||||
{
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\AllOfException;
|
||||
|
||||
class AllOf extends AbstractComposite
|
||||
{
|
||||
|
||||
|
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\AlnumException;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
|
||||
class Alnum extends Alpha
|
||||
{
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\AlphaException;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
|
||||
class Alpha extends AbstractRule
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\ArrException;
|
||||
use \ArrayObject;
|
||||
use ArrayAccess;
|
||||
use Traversable;
|
||||
|
||||
class Arr extends AbstractRule
|
||||
{
|
||||
|
||||
public function validate($input)
|
||||
{
|
||||
return is_array($input) || $input instanceof ArrayObject;
|
||||
return is_array($input)
|
||||
|| ($input instanceof ArrayAccess && $input instanceof Traversable);
|
||||
}
|
||||
|
||||
}
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\AtLeastException;
|
||||
|
||||
class AtLeast extends AbstractComposite
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\AttributeException;
|
||||
use Respect\Validation\Exceptions\ValidationException;
|
||||
use \ReflectionProperty;
|
||||
use ReflectionProperty;
|
||||
|
||||
class Attribute extends AbstractRelated
|
||||
{
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\BetweenException;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
use Respect\Validation\Exceptions\ValidationException;
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\CallbackException;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
|
||||
class Callback extends AbstractRule
|
||||
|
|
|
@ -2,9 +2,7 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\DateException;
|
||||
use DateTime;
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
|
||||
class Date extends AbstractRule
|
||||
{
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\DigitsException;
|
||||
|
||||
class Digits extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\EachException;
|
||||
|
||||
class Each extends AbstractVector
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\FloatException;
|
||||
|
||||
class Float extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\HexaException;
|
||||
|
||||
class Hexa extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\InstanceException;
|
||||
|
||||
class Instance extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\IpException;
|
||||
|
||||
class Ip extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,10 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\KeyException;
|
||||
use Respect\Validation\Exceptions\ValidationException;
|
||||
use \ReflectionProperty;
|
||||
|
||||
class Key extends AbstractRelated
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\MaxException;
|
||||
|
||||
class Max extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\MinException;
|
||||
|
||||
class Min extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\MostOfException;
|
||||
|
||||
class MostOf extends AtLeast
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\NoWhitespaceException;
|
||||
|
||||
class NoWhitespace extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\NoneOfException;
|
||||
|
||||
class NoneOf extends AbstractComposite
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\NotEmptyException;
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
|
||||
class NotEmpty extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\NullValueException;
|
||||
|
||||
class NullValue extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\NumericException;
|
||||
|
||||
class Numeric extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\ObjectException;
|
||||
|
||||
class Object extends AbstractRule
|
||||
{
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Exceptions\OneOfException;
|
||||
|
||||
class OneOf extends AbstractComposite
|
||||
{
|
||||
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\RegexException;
|
||||
|
||||
class Regex extends AbstractRule
|
||||
{
|
||||
|
||||
|
@ -28,5 +25,4 @@ class Regex extends AbstractRule
|
|||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
|
@ -3,9 +3,6 @@
|
|||
namespace Respect\Validation\Rules;
|
||||
|
||||
use ReflectionClass;
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\CallbackException;
|
||||
use Respect\Validation\Exceptions\SfException;
|
||||
use Symfony\Component\Validator\ConstraintViolation;
|
||||
|
||||
class Sf extends AbstractRule
|
||||
|
|
|
@ -2,12 +2,7 @@
|
|||
|
||||
namespace Respect\Validation\Rules;
|
||||
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\StringLengthException;
|
||||
use Respect\Validation\Validator;
|
||||
use Respect\Validation\Exceptions\NotNumericException;
|
||||
use Respect\Validation\Exceptions\ComponentException;
|
||||
use Respect\Validation\Exceptions\InvalidException;
|
||||
|
||||
class StringLength extends AbstractRule
|
||||
{
|
||||
|
@ -19,9 +14,7 @@ class StringLength extends AbstractRule
|
|||
{
|
||||
$this->min = $min;
|
||||
$this->max = $max;
|
||||
$paramValidator = Validator::oneOf(
|
||||
Validator::numeric(), Validator::nullValue()
|
||||
);
|
||||
$paramValidator = new OneOf(new Numeric, new NullValue);
|
||||
if (!$paramValidator->validate($min))
|
||||
throw new ComponentException(
|
||||
sprintf('%s is not a valid numeric length', $min)
|
||||
|
|
|
@ -3,9 +3,6 @@
|
|||
namespace Respect\Validation\Rules;
|
||||
|
||||
use ReflectionClass;
|
||||
use Respect\Validation\Rules\AbstractRule;
|
||||
use Respect\Validation\Exceptions\CallbackException;
|
||||
use Respect\Validation\Exceptions\ZendException;
|
||||
|
||||
class Zend extends AbstractRule
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue