Method validate() should always return a boolean

This commit is contained in:
Henrique Moody 2018-01-28 15:41:31 +01:00
parent aa7d84c3ea
commit ccf60f0ee3
No known key found for this signature in database
GPG key ID: 221E9281655813A6
116 changed files with 117 additions and 117 deletions

View file

@ -242,7 +242,7 @@ use Respect\Validation\Rules\AbstractRule;
class MyRule extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
// Do something here with the $input and return a boolean value
}

View file

@ -35,7 +35,7 @@ abstract class AbstractFilterRule extends AbstractRule
return str_replace(str_split($this->additionalChars), '', $input);
}
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -82,7 +82,7 @@ abstract class AbstractRelated extends AbstractRule
return $this->decision('check', $hasReference, $input);
}
public function validate($input)
public function validate($input): bool
{
$hasReference = $this->hasReference($input);
if ($this->mandatory && !$hasReference) {

View file

@ -56,7 +56,7 @@ abstract class AbstractWrapper extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return $this->validatable->validate($input);
}

View file

@ -41,7 +41,7 @@ class AllOf extends AbstractComposite
return true;
}
public function validate($input)
public function validate($input): bool
{
foreach ($this->getRules() as $rule) {
if (!$rule->validate($input)) {

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class AlwaysInvalid extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return false;
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class AlwaysValid extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return true;
}

View file

@ -30,7 +30,7 @@ class AnyOf extends AbstractComposite
return true;
}
public function validate($input)
public function validate($input): bool
{
foreach ($this->getRules() as $v) {
if ($v->validate($input)) {

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class ArrayType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_array($input);
}

View file

@ -18,7 +18,7 @@ use SimpleXMLElement;
class ArrayVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_array($input) || $input instanceof ArrayAccess || $input instanceof SimpleXMLElement;
}

View file

@ -33,7 +33,7 @@ class Base extends AbstractRule
$this->base = $base;
}
public function validate($input)
public function validate($input): bool
{
$valid = mb_substr($this->chars, 0, $this->base);

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Base64 extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_string($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class BoolType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_bool($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class BoolVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_bool(filter_var($input, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE));
}

View file

@ -25,7 +25,7 @@ class Bsn extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!ctype_digit($input)) {
return false;

View file

@ -21,7 +21,7 @@ class CallableType extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return is_callable($input);
}

View file

@ -33,7 +33,7 @@ class Callback extends AbstractRule
$this->arguments = $arguments;
}
public function validate($input)
public function validate($input): bool
{
$params = $this->arguments;
array_unshift($params, $input);

View file

@ -35,7 +35,7 @@ class Charset extends AbstractRule
$this->charset = $charset;
}
public function validate($input)
public function validate($input): bool
{
$detectedEncoding = mb_detect_encoding($input, $this->charset, true);

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Cnh extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Cnpj extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -24,7 +24,7 @@ class Contains extends AbstractRule
$this->identical = $identical;
}
public function validate($input)
public function validate($input): bool
{
if ($this->identical) {
return $this->validateIdentical($input);

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Countable extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_array($input) || $input instanceof \Countable;
}

View file

@ -317,7 +317,7 @@ class CountryCode extends AbstractRule
return $countryList;
}
public function validate($input)
public function validate($input): bool
{
return in_array(
mb_strtoupper($input),

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Cpf extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
// Code ported from jsfromhell.com
$c = preg_replace('/\D/', '', $input);

View file

@ -58,7 +58,7 @@ class CreditCard extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
$input = preg_replace('([^0-9])', '', $input);

View file

@ -204,7 +204,7 @@ class CurrencyCode extends AbstractRule
'ZWL', // Zimbabwe Dollar
];
public function validate($input)
public function validate($input): bool
{
return in_array(mb_strtoupper($input), $this->currencyCodes, true);
}

View file

@ -24,7 +24,7 @@ class DateTime extends AbstractRule
$this->format = $format;
}
public function validate($input)
public function validate($input): bool
{
if ($input instanceof DateTimeInterface) {
return true;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Directory extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if ($input instanceof \SplFileInfo) {
return $input->isDir();

View file

@ -57,7 +57,7 @@ class Domain extends AbstractComposite
return true;
}
public function validate($input)
public function validate($input): bool
{
foreach ($this->checks as $chk) {
if (!$chk->validate($input)) {

View file

@ -79,7 +79,7 @@ class Each extends IterableType
return true;
}
public function validate($input)
public function validate($input): bool
{
if (!parent::validate($input)) {
return false;

View file

@ -33,7 +33,7 @@ class Email extends AbstractRule
return $this->emailValidator;
}
public function validate($input)
public function validate($input): bool
{
$emailValidator = $this->getEmailValidator();
if (!$emailValidator instanceof EmailValidator) {

View file

@ -24,7 +24,7 @@ class EndsWith extends AbstractRule
$this->identical = $identical;
}
public function validate($input)
public function validate($input): bool
{
if ($this->identical) {
return $this->validateIdentical($input);

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Even extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return 0 === (int) $input % 2;
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Executable extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if ($input instanceof \SplFileInfo) {
return $input->isExecutable();

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Exists extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if ($input instanceof \SplFileInfo) {
$input = $input->getPathname();

View file

@ -38,7 +38,7 @@ class Extension extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if ($input instanceof SplFileInfo) {
return $input->getExtension() == $this->extension;

View file

@ -33,7 +33,7 @@ class Factor extends AbstractRule
$this->dividend = (int) $dividend;
}
public function validate($input)
public function validate($input): bool
{
// Every integer is a factor of zero, and zero is the only integer that
// has zero for a factor.

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class FalseVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (false === $input) { // PHP 5.3 workaround
return true;

View file

@ -21,7 +21,7 @@ class Fibonacci extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!is_numeric($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class File extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if ($input instanceof \SplFileInfo) {
return $input->isFile();

View file

@ -21,7 +21,7 @@ class Finite extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return is_numeric($input) && is_finite((float) $input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class FloatType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_float($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class FloatVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_float(filter_var($input, FILTER_VALIDATE_FLOAT));
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class HexRgbColor extends Xdigit
{
public function validate($input)
public function validate($input): bool
{
if (!is_string($input)) {
return false;

View file

@ -25,7 +25,7 @@ class Image extends AbstractRule
$this->fileInfo = $fileInfo ?: new finfo(FILEINFO_MIME_TYPE);
}
public function validate($input)
public function validate($input): bool
{
if ($input instanceof SplFileInfo) {
$input = $input->getPathname();

View file

@ -24,7 +24,7 @@ class Imei extends AbstractRule
*
* @return bool
*/
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -54,7 +54,7 @@ class In extends AbstractRule
return false !== mb_strpos($this->haystack, $inputString, 0, mb_detect_encoding($inputString));
}
public function validate($input)
public function validate($input): bool
{
if ($this->compareIdentical) {
return $this->validateIdentical($input);

View file

@ -21,7 +21,7 @@ class Infinite extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return is_numeric($input) && is_infinite((float) $input);
}

View file

@ -27,7 +27,7 @@ class Instance extends AbstractRule
return parent::reportError($input, $extraParams);
}
public function validate($input)
public function validate($input): bool
{
return $input instanceof $this->instanceName;
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class IntType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_int($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class IntVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_numeric($input) && (int) $input == $input;
}

View file

@ -98,7 +98,7 @@ class Ip extends AbstractRule
$range['mask'] = sprintf('%032b', ip2long(long2ip(~(2 ** (32 - $input[1]) - 1))));
}
public function validate($input)
public function validate($input): bool
{
return $this->verifyAddress($input) && $this->verifyNetwork($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class IterableType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_array($input) ||
$input instanceof \stdClass ||

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Json extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_string($input) || '' === $input) {
return false;

View file

@ -140,7 +140,7 @@ class KeySet extends AllOf
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!$this->hasValidStructure($input)) {
return false;

View file

@ -92,7 +92,7 @@ class KeyValue extends AbstractRule
return true;
}
public function validate($input)
public function validate($input): bool
{
try {
$rule = $this->getRule($input);

View file

@ -551,7 +551,7 @@ class LanguageCode extends AbstractRule
return $languageList;
}
public function validate($input)
public function validate($input): bool
{
if (!is_string($input) || '' === $input) {
return false;

View file

@ -25,7 +25,7 @@ class LeapDate extends AbstractRule
$this->format = $format;
}
public function validate($input)
public function validate($input): bool
{
if (is_string($input)) {
$date = DateTimeImmutable::createFromFormat($this->format, $input);

View file

@ -17,7 +17,7 @@ use DateTimeInterface;
class LeapYear extends AbstractRule
{
public function validate($year)
public function validate($year): bool
{
if (is_numeric($year)) {
$year = (int) $year;

View file

@ -46,7 +46,7 @@ class Length extends AbstractRule
}
}
public function validate($input)
public function validate($input): bool
{
$length = $this->extractLength($input);

View file

@ -22,7 +22,7 @@ use Respect\Validation\Rules\AbstractRule;
*/
class PlIdentityCard extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!preg_match('/^[A-Z0-9]{9}$/', $input)) {
return false;

View file

@ -22,7 +22,7 @@ use Respect\Validation\Rules\AbstractRule;
*/
final class PlVatin extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Lowercase extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return $input === mb_strtolower($input, mb_detect_encoding($input));
}

View file

@ -21,7 +21,7 @@ class Luhn extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!(new Digit())->validate($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class MacAddress extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return !empty($input) && preg_match('/^(([0-9a-fA-F]{2}-){5}|([0-9a-fA-F]{2}:){5})[0-9a-fA-F]{2}$/', $input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Max extends AbstractInterval
{
public function validate($input)
public function validate($input): bool
{
if ($this->inclusive) {
return $this->filterInterval($input) <= $this->filterInterval($this->interval);

View file

@ -46,7 +46,7 @@ class Mimetype extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if ($input instanceof SplFileInfo) {
$input = $input->getPathname();

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Min extends AbstractInterval
{
public function validate($input)
public function validate($input): bool
{
if ($this->inclusive) {
return $this->filterInterval($input) >= $this->filterInterval($this->interval);

View file

@ -32,7 +32,7 @@ class MinimumAge extends AbstractRule
$this->format = $format;
}
public function validate($input)
public function validate($input): bool
{
if ($input instanceof DateTimeInterface) {
$birthday = new DateTimeImmutable('now - '.$this->age.' year');

View file

@ -22,7 +22,7 @@ class Multiple extends AbstractRule
$this->multipleOf = $multipleOf;
}
public function validate($input)
public function validate($input): bool
{
if (0 == $this->multipleOf) {
return 0 == $input;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Negative extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return $input < 0;
}

View file

@ -28,7 +28,7 @@ class NfeAccessKey extends AbstractRule
*
* @return bool
*/
public function validate($aK)
public function validate($aK): bool
{
if (44 !== mb_strlen($aK)) {
return false;

View file

@ -25,7 +25,7 @@ final class Nif extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!is_string($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class NoWhitespace extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (is_null($input)) {
return true;

View file

@ -27,7 +27,7 @@ class NoneOf extends AbstractComposite
return true;
}
public function validate($input)
public function validate($input): bool
{
foreach ($this->getRules() as $rule) {
if ($rule->validate($input)) {

View file

@ -32,9 +32,9 @@ class Not extends AbstractRule
return parent::setName($name);
}
public function validate($input)
public function validate($input): bool
{
return false == $this->rule->validate($input);
return false === $this->rule->validate($input);
}
public function assert($input)

View file

@ -17,7 +17,7 @@ use stdClass;
class NotBlank extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (is_numeric($input)) {
return 0 != $input;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class NotEmpty extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (is_string($input)) {
$input = trim($input);

View file

@ -19,7 +19,7 @@ class NotOptional extends AbstractRule
{
use UndefinedHelper;
public function validate($input)
public function validate($input): bool
{
return false === $this->isUndefined($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class NullType extends NotEmpty
{
public function validate($input)
public function validate($input): bool
{
return is_null($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Number extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_numeric($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class NumericVal extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_numeric($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class ObjectType extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_object($input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Odd extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return 0 !== (int) $input % 2;
}

View file

@ -34,7 +34,7 @@ class OneOf extends AbstractComposite
return true;
}
public function validate($input)
public function validate($input): bool
{
$rulesPassedCount = 0;
foreach ($this->getRules() as $rule) {

View file

@ -38,7 +38,7 @@ class Optional extends AbstractWrapper
return parent::check($input);
}
public function validate($input)
public function validate($input): bool
{
if ($this->isUndefined($input)) {
return true;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class PerfectSquare extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_numeric($input) && floor(sqrt((float) $input)) == sqrt((float) $input);
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Pesel extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!preg_match('/^\d{11}$/', (string) $input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class PhpLabel extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return is_string($input) && preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $input);
}

View file

@ -24,7 +24,7 @@ class Pis extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Positive extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
return $input > 0;
}

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class PrimeNumber extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (!is_numeric($input) || $input <= 1) {
return false;

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Readable extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if ($input instanceof \SplFileInfo) {
return $input->isReadable();

View file

@ -22,7 +22,7 @@ class Regex extends AbstractRule
$this->regex = $regex;
}
public function validate($input)
public function validate($input): bool
{
if (!is_scalar($input)) {
return false;

View file

@ -21,7 +21,7 @@ class ResourceType extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return is_resource($input);
}

View file

@ -21,7 +21,7 @@ class ScalarVal extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
return is_scalar($input);
}

View file

@ -65,7 +65,7 @@ class Sf extends AbstractRule
throw $this->reportError((string) $violations);
}
public function validate($input)
public function validate($input): bool
{
$violations = $this->returnViolationsForConstraint($input, $this->constraint);
if (count($violations)) {

View file

@ -102,7 +102,7 @@ class Size extends AbstractRule
/**
* {@inheritdoc}
*/
public function validate($input)
public function validate($input): bool
{
if ($input instanceof SplFileInfo) {
return $this->isValidSize($input->getSize());

View file

@ -15,7 +15,7 @@ namespace Respect\Validation\Rules;
class Slug extends AbstractRule
{
public function validate($input)
public function validate($input): bool
{
if (mb_strstr($input, '--')) {
return false;

View file

@ -24,7 +24,7 @@ class Sorted extends AbstractRule
$this->ascending = $ascending;
}
public function validate($input)
public function validate($input): bool
{
$count = count($input);
if ($count < 2) {

Some files were not shown because too many files have changed in this diff Show more