Skip to content

Commit

Permalink
Move Template to the Message namespace
Browse files Browse the repository at this point in the history
That way, everything related to messages would stay in the same
namespace.

Signed-off-by: Henrique Moody <[email protected]>
  • Loading branch information
henriquemoody committed Feb 9, 2024
1 parent b1555fb commit 02b70bf
Show file tree
Hide file tree
Showing 158 changed files with 157 additions and 158 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ declare(strict_types=1);

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} must be a Hello World',
Expand Down
2 changes: 1 addition & 1 deletion docs/06-custom-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ validate method will be executed. Here's how the class should look:
namespace My\Validation\Rules;

use Respect\Validation\Rules\AbstractRule;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} is something',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ValidationException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
namespace Respect\Validation\Exceptions;

use InvalidArgumentException;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Formatter;
use Respect\Validation\Message\Template;

use function count;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

declare(strict_types=1);

namespace Respect\Validation\Attributes;
namespace Respect\Validation\Message;

use Attribute;
use Respect\Validation\Validatable;
Expand Down
1 change: 0 additions & 1 deletion library/Message/TemplateCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
namespace Respect\Validation\Message;

use ReflectionClass;
use Respect\Validation\Attributes\Template;

final class TemplateCollector
{
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/AllOf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\ExceptionClass;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Message\Template;

use function count;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Alnum.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function ctype_alnum;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Alpha.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function ctype_alpha;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/AlwaysInvalid.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} is always invalid',
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/AlwaysValid.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} is always valid',
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/AnyOf.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\ExceptionClass;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Message\Template;

use function count;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/ArrayType.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_array;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/ArrayVal.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Respect\Validation\Rules;

use ArrayAccess;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;
use SimpleXMLElement;

use function is_array;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Message\Template;

use function mb_strlen;
use function mb_substr;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Base64.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_string;
use function mb_strlen;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Between.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Helpers\CanCompareValues;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} must be between {{minValue}} and {{maxValue}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/BoolType.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_bool;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/BoolVal.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function filter_var;
use function is_bool;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Bsn.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function ctype_digit;
use function intval;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Call.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Message\Template;
use Respect\Validation\Validatable;
use Throwable;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/CallableType.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_callable;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Callback.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function array_merge;
use function call_user_func_array;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Charset.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Message\Template;

use function array_diff;
use function in_array;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Cnh.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_scalar;
use function mb_strlen;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Cnpj.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function array_map;
use function array_sum;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Consonant.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function preg_match;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Contains.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function in_array;
use function is_array;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/ContainsAny.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function array_map;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Control.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function ctype_cntrl;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Countable.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Respect\Validation\Rules;

use Countable as CountableInterface;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_array;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/CountryCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Message\Template;

use function array_column;
use function array_keys;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Cpf.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function intval;
use function mb_strlen;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/CreditCard.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Message\Template;

use function array_keys;
use function implode;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/CurrencyCode.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

#[Template(
'{{name}} must be a valid currency',
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Date.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Helpers\CanValidateDateTime;
use Respect\Validation\Message\Template;

use function date;
use function is_scalar;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/DateTime.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
namespace Respect\Validation\Rules;

use DateTimeInterface;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Helpers\CanValidateDateTime;
use Respect\Validation\Message\Template;

use function date;
use function is_scalar;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Decimal.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function is_numeric;
use function is_string;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Digit.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function ctype_digit;

Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Directory.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Respect\Validation\Rules;

use Directory as NativeDirectory;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;
use SplFileInfo;

use function is_dir;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Domain.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\ExceptionClass;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Message\Template;
use Respect\Validation\Validatable;

use function array_merge;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Each.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Attributes\ExceptionClass;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Exceptions\EachException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Helpers\CanValidateIterable;
use Respect\Validation\Message\Template;
use Respect\Validation\Validatable;

#[ExceptionClass(EachException::class)]
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\RFCValidation;
use Respect\Validation\Attributes\Template;
use Respect\Validation\Message\Template;

use function class_exists;
use function filter_var;
Expand Down
Loading

0 comments on commit 02b70bf

Please sign in to comment.