Skip to content

Commit

Permalink
Update version of "respect/coding-standard"
Browse files Browse the repository at this point in the history
With that update, we will be fully following PSR-12.

Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
  • Loading branch information
henriquemoody committed Jul 21, 2020
1 parent 34cbed2 commit 3145426
Show file tree
Hide file tree
Showing 280 changed files with 859 additions and 722 deletions.
3 changes: 1 addition & 2 deletions composer.json
Expand Up @@ -20,15 +20,14 @@
"symfony/polyfill-mbstring": "^1.2"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"egulias/email-validator": "^2.1",
"malukenho/docheader": "^0.1",
"mikey179/vfsstream": "^1.6",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-deprecation-rules": "^0.11.0",
"phpstan/phpstan-phpunit": "^0.11.0",
"phpunit/phpunit": "^7.5",
"respect/coding-standard": "^1.0",
"respect/coding-standard": "^2.1",
"squizlabs/php_codesniffer": "^3.5",
"symfony/validator": "^3.0||^4.0",
"zendframework/zend-validator": "^2.1"
Expand Down
2 changes: 2 additions & 0 deletions library/Exceptions/NestedValidationException.php
Expand Up @@ -16,6 +16,7 @@
use IteratorAggregate;
use RecursiveIteratorIterator;
use SplObjectStorage;

use function array_shift;
use function count;
use function current;
Expand All @@ -24,6 +25,7 @@
use function spl_object_hash;
use function sprintf;
use function str_repeat;

use const PHP_EOL;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Exceptions/ValidationException.php
Expand Up @@ -15,6 +15,7 @@

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

use function key;

/**
Expand Down
5 changes: 3 additions & 2 deletions library/Factory.php
Expand Up @@ -22,6 +22,7 @@
use Respect\Validation\Message\Formatter;
use Respect\Validation\Message\ParameterStringifier;
use Respect\Validation\Message\Stringifier\KeepOriginalStringName;

use function lcfirst;
use function sprintf;
use function trim;
Expand Down Expand Up @@ -132,7 +133,7 @@ public function rule(string $ruleName, array $arguments = []): Validatable
try {
/** @var Validatable $rule */
$rule = $this
->createReflectionClass($namespace.'\\'.ucfirst($ruleName), Validatable::class)
->createReflectionClass($namespace . '\\' . ucfirst($ruleName), Validatable::class)
->newInstanceArgs($arguments);

return $rule;
Expand Down Expand Up @@ -165,7 +166,7 @@ public function exception(Validatable $validatable, $input, array $extraParams =
foreach ($this->exceptionsNamespaces as $namespace) {
try {
return $this->createValidationException(
$namespace.'\\'.$ruleName.'Exception',
$namespace . '\\' . $ruleName . 'Exception',
$id,
$input,
$params,
Expand Down
1 change: 1 addition & 0 deletions library/Helpers/CanCompareValues.php
Expand Up @@ -17,6 +17,7 @@
use DateTimeImmutable;
use DateTimeInterface;
use Throwable;

use function is_numeric;
use function is_scalar;
use function is_string;
Expand Down
1 change: 1 addition & 0 deletions library/Helpers/CanValidateIterable.php
Expand Up @@ -15,6 +15,7 @@

use stdClass;
use Traversable;

use function is_array;

/**
Expand Down
3 changes: 2 additions & 1 deletion library/Helpers/Subdivisions.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Helpers;

use Respect\Validation\Exceptions\ComponentException;

use function file_exists;
use function file_get_contents;
use function json_decode;
Expand All @@ -28,7 +29,7 @@ final class Subdivisions

public function __construct(string $countryCode)
{
$filename = __DIR__.'/../../data/iso_3166-2/'.$countryCode.'.json';
$filename = __DIR__ . '/../../data/iso_3166-2/' . $countryCode . '.json';
if (!file_exists($filename)) {
throw new ComponentException(sprintf('"%s" is not a supported country code', $countryCode));
}
Expand Down
1 change: 1 addition & 0 deletions library/Message/Stringifier/KeepOriginalStringName.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Message\Stringifier;

use Respect\Validation\Message\ParameterStringifier;

use function is_string;
use function Respect\Stringifier\stringify;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/AbstractAge.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Helpers\CanValidateDateTime;

use function date;
use function date_parse_from_format;
use function is_scalar;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/AbstractComposite.php
Expand Up @@ -16,6 +16,7 @@
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Validatable;

use function array_filter;
use function array_map;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/AbstractRelated.php
Expand Up @@ -16,6 +16,7 @@
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Validatable;

use function is_scalar;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/AbstractSearcher.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Helpers\CanValidateUndefined;

use function in_array;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/AllOf.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\AllOfException;

use function count;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/AnyOf.php
Expand Up @@ -15,6 +15,7 @@

use Respect\Validation\Exceptions\AnyOfException;
use Respect\Validation\Exceptions\ValidationException;

use function count;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/ArrayVal.php
Expand Up @@ -15,6 +15,7 @@

use ArrayAccess;
use SimpleXMLElement;

use function is_array;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Attribute.php
Expand Up @@ -16,6 +16,7 @@
use ReflectionException;
use ReflectionProperty;
use Respect\Validation\Validatable;

use function is_object;
use function property_exists;

Expand Down
3 changes: 2 additions & 1 deletion library/Rules/Base.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\ComponentException;

use function is_null;
use function mb_strlen;
use function mb_substr;
Expand Down Expand Up @@ -62,6 +63,6 @@ public function validate($input): bool
{
$valid = mb_substr($this->chars, 0, $this->base);

return (bool) preg_match('@^['.$valid.']+$@', (string) $input);
return (bool) preg_match('@^[' . $valid . ']+$@', (string) $input);
}
}
1 change: 1 addition & 0 deletions library/Rules/BoolVal.php
Expand Up @@ -15,6 +15,7 @@

use function filter_var;
use function is_bool;

use const FILTER_NULL_ON_FAILURE;
use const FILTER_VALIDATE_BOOLEAN;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/Call.php
Expand Up @@ -16,6 +16,7 @@
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Validatable;
use Throwable;

use function call_user_func;
use function restore_error_handler;
use function set_error_handler;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Charset.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\ComponentException;

use function array_diff;
use function in_array;
use function mb_detect_encoding;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Countable.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Countable as CountableInterface;

use function is_array;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/CountryCode.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\ComponentException;

use function array_column;
use function array_keys;
use function implode;
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Cpf.php
Expand Up @@ -37,7 +37,7 @@ public function validate($input): bool
// Code ported from jsfromhell.com
$c = preg_replace('/\D/', '', $input);

if (mb_strlen($c) != 11 || preg_match('/^'.$c[0].'{11}$/', $c) || $c === '01234567890') {
if (mb_strlen($c) != 11 || preg_match('/^' . $c[0] . '{11}$/', $c) || $c === '01234567890') {
return false;
}

Expand Down
1 change: 1 addition & 0 deletions library/Rules/CreditCard.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\ComponentException;

use function array_keys;
use function implode;
use function is_scalar;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Date.php
Expand Up @@ -15,6 +15,7 @@

use Respect\Validation\Exceptions\ComponentException;
use Respect\Validation\Helpers\CanValidateDateTime;

use function date;
use function is_scalar;
use function preg_match;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/DateTime.php
Expand Up @@ -15,6 +15,7 @@

use DateTimeInterface;
use Respect\Validation\Helpers\CanValidateDateTime;

use function date;
use function is_scalar;
use function strtotime;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Directory.php
Expand Up @@ -15,6 +15,7 @@

use Directory as NativeDirectory;
use SplFileInfo;

use function is_dir;
use function is_scalar;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/Domain.php
Expand Up @@ -17,6 +17,7 @@
use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Validatable;

use function array_merge;
use function array_pop;
use function count;
Expand Down
2 changes: 2 additions & 0 deletions library/Rules/Email.php
Expand Up @@ -15,9 +15,11 @@

use Egulias\EmailValidator\EmailValidator;
use Egulias\EmailValidator\Validation\RFCValidation;

use function class_exists;
use function filter_var;
use function is_string;

use const FILTER_VALIDATE_EMAIL;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Even.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use function filter_var;

use const FILTER_VALIDATE_INT;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/Executable.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use SplFileInfo;

use function is_executable;
use function is_scalar;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/Exists.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use SplFileInfo;

use function file_exists;
use function is_string;

Expand Down
2 changes: 2 additions & 0 deletions library/Rules/Extension.php
Expand Up @@ -14,8 +14,10 @@
namespace Respect\Validation\Rules;

use SplFileInfo;

use function is_string;
use function pathinfo;

use const PATHINFO_EXTENSION;

/**
Expand Down
1 change: 1 addition & 0 deletions library/Rules/FalseVal.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use function filter_var;

use const FILTER_NULL_ON_FAILURE;
use const FILTER_VALIDATE_BOOLEAN;

Expand Down
1 change: 1 addition & 0 deletions library/Rules/File.php
Expand Up @@ -14,6 +14,7 @@
namespace Respect\Validation\Rules;

use SplFileInfo;

use function is_file;
use function is_string;

Expand Down
2 changes: 2 additions & 0 deletions library/Rules/FilterVar.php
Expand Up @@ -14,7 +14,9 @@
namespace Respect\Validation\Rules;

use Respect\Validation\Exceptions\ComponentException;

use function in_array;

use const FILTER_VALIDATE_BOOLEAN;
use const FILTER_VALIDATE_EMAIL;
use const FILTER_VALIDATE_FLOAT;
Expand Down
1 change: 1 addition & 0 deletions library/Rules/FloatVal.php
Expand Up @@ -15,6 +15,7 @@

use function filter_var;
use function is_float;

use const FILTER_VALIDATE_FLOAT;

/**
Expand Down
2 changes: 1 addition & 1 deletion library/Rules/Iban.php
Expand Up @@ -125,7 +125,7 @@ public function validate($input): bool

$checkDigits = substr($iban, 2, 2);
$bban = substr($iban, 4);
$rearranged = $bban.$countryCode.$checkDigits;
$rearranged = $bban . $countryCode . $checkDigits;

return bcmod($this->convertToInteger($rearranged), '97') === '1';
}
Expand Down
2 changes: 2 additions & 0 deletions library/Rules/Image.php
Expand Up @@ -15,9 +15,11 @@

use finfo;
use SplFileInfo;

use function is_file;
use function is_string;
use function mb_strpos;

use const FILEINFO_MIME_TYPE;

/**
Expand Down

0 comments on commit 3145426

Please sign in to comment.