deblan-mirror/respect-validation
deblan-mirror/respect-validation
1
0
Fork 0
mirror of https://github.com/Respect/Validation.git synced 2024-06-07 16:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply "SlevomatCodingStandard.Functions.StaticClosure"

Browse source 
Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
This commit is contained in:
Henrique Moody 2019-02-09 12:31:09 +01:00
parent d72d247ddc
commit 880103c55f
No known key found for this signature in database
GPG key ID: 221E9281655813A6
25 changed files with 59 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/Exceptions/ValidationException.php
View file

@ -171,7 +171,7 @@ class ValidationException extends InvalidArgumentException implements Exception
{
return preg_replace_callback(
'/{{(\w+)}}/',
function ($match) use ($vars) {
static function ($match) use ($vars) {
if (!isset($vars[$match[1]])) {
return $match[0];
}

4
library/Factory.php
View file

@ -106,7 +106,7 @@ final class Factory
self::$defaultInstance = new self(
self::DEFAULT_RULES_NAMESPACES,
self::DEFAULT_EXCEPTIONS_NAMESPACES,
function (string $message): string {
static function (string $message): string {
return $message;
}
);
@ -200,7 +200,7 @@ final class Factory
*/
private function filterNamespaces(array $namespaces, array $defaultNamespaces): array
{
$filter = function (string $namespace): string {
$filter = static function (string $namespace): string {
return trim($namespace, '\\');
};

2
library/Rules/ContainsAny.php
View file

@ -45,7 +45,7 @@ final class ContainsAny extends AbstractEnvelope
private function getRules(array $needles, bool $identical): array
{
return array_map(
function ($needle) use ($identical): Contains {
static function ($needle) use ($identical): Contains {
return new Contains($needle, $identical);
},
$needles

2
library/Rules/Domain.php
View file

@ -53,7 +53,7 @@ class Domain extends AbstractComposite
new Not(new StartsWith('-')),
new AnyOf(
new Not(new Contains('--')),
new Callback(function ($str) {
new Callback(static function ($str) {
return 1 == mb_substr_count($str, '--');
})
),

2
library/Rules/Sorted.php
View file

@ -31,7 +31,7 @@ class Sorted extends AbstractRule
public function __construct(callable $fn = null, bool $ascending = true)
{
$this->fn = $fn ?? function ($x) {
$this->fn = $fn ?? static function ($x) {
return $x;
};
$this->ascending = $ascending;

1
phpcs.xml.dist
View file

@ -52,6 +52,7 @@
<rule ref="SlevomatCodingStandard.ControlStructures.UselessTernaryOperator" />
<rule ref="SlevomatCodingStandard.Exceptions.DeadCatch" />
<rule ref="SlevomatCodingStandard.Exceptions.ReferenceThrowableOnly" />
<rule ref="SlevomatCodingStandard.Functions.StaticClosure" />
<rule ref="SlevomatCodingStandard.Functions.UselessParameterDefaultValue" />
<rule ref="SlevomatCodingStandard.Namespaces.DisallowGroupUse" />
<rule ref="SlevomatCodingStandard.Namespaces.NamespaceDeclaration" />

2
tests/integration/exception_update.phpt
View file

@ -10,7 +10,7 @@ require 'vendor/autoload.php';
use Respect\Validation\Factory;
use Respect\Validation\Validator as v;
Factory::setDefaultInstance(new Factory([], [], function (string $message): string {
Factory::setDefaultInstance(new Factory([], [], static function (string $message): string {
return '{{name}} não deve conter letras (a-z) ou dígitos (0-9)';
}));

2
tests/integration/issue-799.phpt
View file

@ -27,7 +27,7 @@ try {
try {
v::create()
->call(
function ($url) {
static function ($url) {
return parse_url($url);
},
v::arrayVal()->key('scheme', v::startsWith('https'))

2
tests/integration/rules/callableType.phpt
View file

@ -30,7 +30,7 @@ try {
}
try {
v::not(v::callableType())->assert(function (): void {
v::not(v::callableType())->assert(static function (): void {
});
} catch (NestedValidationException $exception) {
echo $exception->getFullMessage().PHP_EOL;

2
tests/integration/translator-assert.phpt
View file

@ -11,7 +11,7 @@ use Respect\Validation\Exceptions\NestedValidationException;
use Respect\Validation\Factory;
use Respect\Validation\Validator;
Factory::setDefaultInstance(new Factory([], [], function (string $message): string {
Factory::setDefaultInstance(new Factory([], [], static function (string $message): string {
$messages = [
'All of the required rules must pass for {{name}}'
=> 'Todas as regras requeridas devem passar para {{name}}',

2
tests/integration/translator-check.phpt
View file

@ -11,7 +11,7 @@ use Respect\Validation\Exceptions\ValidationException;
use Respect\Validation\Factory;
use Respect\Validation\Validator;
Factory::setDefaultInstance(new Factory([], [], function (string $message): string {
Factory::setDefaultInstance(new Factory([], [], static function (string $message): string {
$messages = [
'{{name}} must be of type string' => '{{name}} deve ser do tipo string',
];

12
tests/unit/Rules/AllOfTest.php
View file

@ -33,13 +33,13 @@ class AllOfTest extends TestCase
*/
public function validationShouldWorkIfAllRulesReturnTrue(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return true;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return true;
});
$o = new AllOf($valid1, $valid2, $valid3);
@ -117,13 +117,13 @@ class AllOfTest extends TestCase
*/
public function providerStaticDummyRules(): array
{
$theInvalidOne = new Callback(function () {
$theInvalidOne = new Callback(static function () {
return false;
});
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return true;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});

12
tests/unit/Rules/AnyOfTest.php
View file

@ -31,13 +31,13 @@ class AnyOfTest extends TestCase
*/
public function valid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
$o = new AnyOf($valid1, $valid2, $valid3);
@ -53,13 +53,13 @@ class AnyOfTest extends TestCase
*/
public function invalid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return false;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
$o = new AnyOf($valid1, $valid2, $valid3);

4
tests/unit/Rules/CallTest.php
View file

@ -74,7 +74,7 @@ final class CallTest extends TestCase
public function assertShouldThrowCallExceptionWhenCallableThrowsAnException(): void
{
$input = [];
$callable = function (): void {
$callable = static function (): void {
throw new Exception();
};
@ -148,7 +148,7 @@ final class CallTest extends TestCase
public function checkShouldThrowCallExceptionWhenCallableThrowsAnException(): void
{
$input = [];
$callable = function (): void {
$callable = static function (): void {
throw new Exception();
};

2
tests/unit/Rules/CallableTypeTest.php
View file

@ -37,7 +37,7 @@ final class CallableTypeTest extends RuleTestCase
return [
[
$rule,
function (): void {
static function (): void {
}
],
[$rule, 'trim'],

6
tests/unit/Rules/CallbackTest.php
View file

@ -38,7 +38,7 @@ final class CallbackTest extends RuleTestCase
[new Callback([$this, 'sampleCallbackUsedInsideThisTest']), 'test'],
[new Callback('is_string'), 'test'],
[
new Callback(function () {
new Callback(static function () {
return true;
}),
'wpoiur'
@ -58,13 +58,13 @@ final class CallbackTest extends RuleTestCase
{
return [
[
new Callback(function () {
new Callback(static function () {
return false;
}),
'w poiur'
],
[
new Callback(function () {
new Callback(static function () {
return false;
}),
''

2
tests/unit/Rules/MacAddressTest.php
View file

@ -63,7 +63,7 @@ final class MacAddressTest extends RuleTestCase
'resource' => [$sut, tmpfile()],
'callable' => [
$sut,
function (): void {
static function (): void {
}
],
];

12
tests/unit/Rules/NoneOfTest.php
View file

@ -31,13 +31,13 @@ class NoneOfTest extends TestCase
*/
public function valid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return false;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
$o = new NoneOf($valid1, $valid2, $valid3);
@ -53,13 +53,13 @@ class NoneOfTest extends TestCase
*/
public function invalid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return false;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return true;
});
$o = new NoneOf($valid1, $valid2, $valid3);

30
tests/unit/Rules/OneOfTest.php
View file

@ -31,13 +31,13 @@ class OneOfTest extends TestCase
*/
public function valid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
@ -68,13 +68,13 @@ class OneOfTest extends TestCase
*/
public function invalid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return false;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return false;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
$rule = new OneOf($valid1, $valid2, $valid3);
@ -89,13 +89,13 @@ class OneOfTest extends TestCase
*/
public function invalidMultipleAssert(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return true;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
$rule = new OneOf($valid1, $valid2, $valid3);
@ -111,13 +111,13 @@ class OneOfTest extends TestCase
*/
public function invalidMultipleCheck(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return true;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return false;
});
@ -134,13 +134,13 @@ class OneOfTest extends TestCase
*/
public function invalidMultipleCheckAllValid(): void
{
$valid1 = new Callback(function () {
$valid1 = new Callback(static function () {
return true;
});
$valid2 = new Callback(function () {
$valid2 = new Callback(static function () {
return true;
});
$valid3 = new Callback(function () {
$valid3 = new Callback(static function () {
return true;
});

2
tests/unit/Rules/ResourceTypeTest.php
View file

@ -56,7 +56,7 @@ final class ResourceTypeTest extends RuleTestCase
[$rule, []],
[
$rule,
function (): void {
static function (): void {
}
],
[$rule, new stdClass()],

2
tests/unit/Rules/ScalarValTest.php
View file

@ -53,7 +53,7 @@ final class ScalarValTest extends RuleTestCase
[$rule, []],
[
$rule,
function (): void {
static function (): void {
}
],
[$rule, new \stdClass()],

4
tests/unit/Rules/SortedTest.php
View file

@ -108,7 +108,7 @@ class SortedTest extends TestCase
'key' => 5,
],
];
$rule = new Sorted(function ($x) {
$rule = new Sorted(static function ($x) {
return $x['key'];
});
@ -135,7 +135,7 @@ class SortedTest extends TestCase
'key' => 5,
],
];
$rule = new Sorted(function ($x) {
$rule = new Sorted(static function ($x) {
return $x['key'];
});

2
tests/unit/Rules/StringValTest.php
View file

@ -57,7 +57,7 @@ final class StringValTest extends RuleTestCase
[$rule, []],
[
$rule,
function (): void {
static function (): void {
},
],
[$rule, new stdClass()],

2
tests/unit/Rules/TypeTest.php
View file

@ -49,7 +49,7 @@ class TypeTest extends RuleTestCase
[new Type('boolean'), false],
[
new Type('callable'),
function (): void {
static function (): void {
}
],
[new Type('double'), 0.8],

2
tests/unit/Rules/UploadedTest.php
View file

@ -42,7 +42,7 @@ final class UploadedTest extends RuleTestCase
uopz_set_return(
'is_uploaded_file',
function (string $filename): bool {
static function (string $filename): bool {
if (UploadedTest::UPLOADED_FILENAME === $filename) {
return true;
}