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

Remove unnecessary validation from "Factory" class

Browse source 
The "ReflectionClass" throws an exception if the class cannot be found,
for that reason the validation with the "class_exists()" function was
unnecessary.

Signed-off-by: Henrique Moody <henriquemoody@gmail.com>
This commit is contained in:
Henrique Moody 2018-07-25 10:02:14 +02:00
parent eded93b0df
commit e4483b74f2
No known key found for this signature in database
GPG key ID: 221E9281655813A6
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/Factory.php
View file

@ -22,7 +22,6 @@ use Respect\Validation\Exceptions\ValidationException;
use function array_map;
use function array_merge;
use function array_unique;
use function class_exists;
use function lcfirst;
/**
@ -126,12 +125,13 @@ final class Factory
public function rule(string $ruleName, array $arguments = []): Validatable
{
foreach ($this->rulesNamespaces as $namespace) {
$className = sprintf('%s\\%s', $namespace, ucfirst($ruleName));
if (!class_exists($className)) {
try {
return $this
->createReflectionClass($namespace.'\\'.ucfirst($ruleName), Validatable::class)
->newInstanceArgs($arguments);
} catch (ReflectionException $exception) {
continue;
}
return $this->createReflectionClass($className, Validatable::class)->newInstanceArgs($arguments);
}
throw new ComponentException(sprintf('"%s" is not a valid rule name', $ruleName));
@ -159,15 +159,14 @@ final class Factory
$id = $params['name'] = $validatable->getName();
}
foreach ($this->exceptionsNamespaces as $namespace) {
$exceptionName = sprintf('%s\\%sException', $namespace, $ruleName);
if (!class_exists($exceptionName)) {
try {
return $this->createValidationException($namespace.'\\'.$ruleName.'Exception', $id, $input, $params);
} catch (ReflectionException $exception) {
continue;
}
return $this->createValidationException($exceptionName, $id, $input, $params);
}
return $this->createValidationException(ValidationException::class, $id, $input, $params);
return new ValidationException($input, $id, $params, $this->translator);
}
/**