Skip to content

Commit

Permalink
Make default templates non-static and protected
Browse files Browse the repository at this point in the history
The only reason why those templates are static is so users can overwrite
the exception messages. That was useful when we didn't have a handy
translator, but now that we can define a translator through the Factory,
this is not needed anymore.

Besides, having those properties public adds complexity to the code.

Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
  • Loading branch information
henriquemoody committed May 12, 2019
1 parent c522f62 commit f3bc390
Show file tree
Hide file tree
Showing 149 changed files with 153 additions and 153 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -115,7 +115,7 @@ final class HelloWorldException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a Hello World',
],
Expand Down
2 changes: 1 addition & 1 deletion docs/feature-guide.md
Expand Up @@ -280,7 +280,7 @@ use \Respect\Validation\Exceptions\ValidationException;

class MyRuleException extends ValidationException
{
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => 'Validation message if MyRule fails validation.',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AllOfException.php
Expand Up @@ -22,7 +22,7 @@ class AllOfException extends GroupedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::NONE => 'All of the required rules must pass for {{name}}',
self::SOME => 'These rules must pass for {{name}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AlnumException.php
Expand Up @@ -22,7 +22,7 @@ final class AlnumException extends FilteredValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain only letters (a-z) and digits (0-9)',
self::EXTRA => '{{name}} must contain only letters (a-z), digits (0-9) and {{additionalChars}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AlphaException.php
Expand Up @@ -22,7 +22,7 @@ final class AlphaException extends FilteredValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain only letters (a-z)',
self::EXTRA => '{{name}} must contain only letters (a-z) and {{additionalChars}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AlwaysInvalidException.php
Expand Up @@ -25,7 +25,7 @@ final class AlwaysInvalidException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} is always invalid',
self::SIMPLE => '{{name}} is not valid',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AlwaysValidException.php
Expand Up @@ -23,7 +23,7 @@ final class AlwaysValidException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} is always valid',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AnyOfException.php
Expand Up @@ -22,7 +22,7 @@ final class AnyOfException extends NestedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => 'At least one of these rules must pass for {{name}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ArrayTypeException.php
Expand Up @@ -24,7 +24,7 @@ final class ArrayTypeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be of type array',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ArrayValException.php
Expand Up @@ -23,7 +23,7 @@ final class ArrayValException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be an array value',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/AttributeException.php
Expand Up @@ -28,7 +28,7 @@ final class AttributeException extends NestedValidationException implements NonO
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::NOT_PRESENT => 'Attribute {{name}} must be present',
self::INVALID => 'Attribute {{name}} must be valid',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/Base64Exception.php
Expand Up @@ -23,7 +23,7 @@ final class Base64Exception extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be Base64-encoded',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/BaseException.php
Expand Up @@ -23,7 +23,7 @@ final class BaseException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a number in the base {{base}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/BetweenException.php
Expand Up @@ -22,7 +22,7 @@ final class BetweenException extends NestedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be between {{minValue}} and {{maxValue}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/BoolTypeException.php
Expand Up @@ -24,7 +24,7 @@ final class BoolTypeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be of type boolean',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/BoolValException.php
Expand Up @@ -23,7 +23,7 @@ final class BoolValException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a boolean value',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/BsnException.php
Expand Up @@ -23,7 +23,7 @@ final class BsnException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a BSN',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CallException.php
Expand Up @@ -22,7 +22,7 @@ final class CallException extends NestedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{input}} must be valid when executed with {{callable}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CallableTypeException.php
Expand Up @@ -23,7 +23,7 @@ final class CallableTypeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be callable',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CharsetException.php
Expand Up @@ -23,7 +23,7 @@ final class CharsetException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be in the {{charset}} charset',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CnhException.php
Expand Up @@ -23,7 +23,7 @@ final class CnhException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid CNH number',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CnpjException.php
Expand Up @@ -23,7 +23,7 @@ final class CnpjException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid CNPJ number',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ConsonantException.php
Expand Up @@ -23,7 +23,7 @@ final class ConsonantException extends FilteredValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain only consonants',
self::EXTRA => '{{name}} must contain only consonants and {{additionalChars}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ContainsAnyException.php
Expand Up @@ -21,7 +21,7 @@ final class ContainsAnyException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain at least one of the values {{needles}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ContainsException.php
Expand Up @@ -23,7 +23,7 @@ final class ContainsException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain the value {{containsValue}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ControlException.php
Expand Up @@ -23,7 +23,7 @@ final class ControlException extends FilteredValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain only control characters',
self::EXTRA => '{{name}} must contain only control characters and {{additionalChars}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CountableException.php
Expand Up @@ -23,7 +23,7 @@ final class CountableException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be countable',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CountryCodeException.php
Expand Up @@ -23,7 +23,7 @@ final class CountryCodeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid country',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CpfException.php
Expand Up @@ -23,7 +23,7 @@ final class CpfException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid CPF number',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CreditCardException.php
Expand Up @@ -27,7 +27,7 @@ final class CreditCardException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid Credit Card number',
self::BRANDED => '{{name}} must be a valid {{brand}} Credit Card number',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/CurrencyCodeException.php
Expand Up @@ -23,7 +23,7 @@ final class CurrencyCodeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid currency',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/DateException.php
Expand Up @@ -22,7 +22,7 @@ final class DateException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid date in the format {{sample}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/DateTimeException.php
Expand Up @@ -24,7 +24,7 @@ final class DateTimeException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid date/time',
self::FORMAT => '{{name}} must be a valid date/time in the format {{sample}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/DigitException.php
Expand Up @@ -22,7 +22,7 @@ final class DigitException extends FilteredValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must contain only digits (0-9)',
self::EXTRA => '{{name}} must contain only digits (0-9) and {{additionalChars}}',
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/DirectoryException.php
Expand Up @@ -22,7 +22,7 @@ final class DirectoryException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a directory',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/DomainException.php
Expand Up @@ -22,7 +22,7 @@ final class DomainException extends NestedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be a valid domain',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EachException.php
Expand Up @@ -23,7 +23,7 @@ final class EachException extends NestedValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => 'Each item in {{name}} must be valid',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EmailException.php
Expand Up @@ -27,7 +27,7 @@ final class EmailException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be valid email',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EndsWithException.php
Expand Up @@ -23,7 +23,7 @@ final class EndsWithException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must end with {{endValue}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EqualsException.php
Expand Up @@ -23,7 +23,7 @@ final class EqualsException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must equal {{compareTo}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EquivalentException.php
Expand Up @@ -21,7 +21,7 @@ final class EquivalentException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be equivalent to {{compareTo}}',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/EvenException.php
Expand Up @@ -25,7 +25,7 @@ final class EvenException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be an even number',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ExecutableException.php
Expand Up @@ -22,7 +22,7 @@ final class ExecutableException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must be an executable file',
],
Expand Down
2 changes: 1 addition & 1 deletion library/Exceptions/ExistsException.php
Expand Up @@ -22,7 +22,7 @@ final class ExistsException extends ValidationException
/**
* {@inheritDoc}
*/
public static $defaultTemplates = [
protected $defaultTemplates = [
self::MODE_DEFAULT => [
self::STANDARD => '{{name}} must exists',
],
Expand Down

0 comments on commit f3bc390

Please sign in to comment.