summaryrefslogtreecommitdiff
path: root/src/Http
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2019-07-10 13:34:15 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2019-07-10 13:34:15 +0200
commit6743106d9a8c760580690aab704f908766731801 (patch)
tree36dd2333d4148cb593e9f7fb3790740605cd1f12 /src/Http
parent6d5ada252202bfb29eba884cf9567e969d798607 (diff)
Replaced validation with `respect/validation`
Diffstat (limited to 'src/Http')
-rw-r--r--src/Http/Validation/Rules/In.php21
-rw-r--r--src/Http/Validation/Rules/NotIn.php15
-rw-r--r--src/Http/Validation/Validates.php154
-rw-r--r--src/Http/Validation/ValidationServiceProvider.php3
-rw-r--r--src/Http/Validation/Validator.php61
5 files changed, 79 insertions, 175 deletions
diff --git a/src/Http/Validation/Rules/In.php b/src/Http/Validation/Rules/In.php
new file mode 100644
index 00000000..d585cc3d
--- /dev/null
+++ b/src/Http/Validation/Rules/In.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+use Respect\Validation\Rules\In as RespectIn;
+
+class In extends RespectIn
+{
+ /**
+ * @param mixed $haystack
+ * @param bool $compareIdentical
+ */
+ public function __construct($haystack, $compareIdentical = false)
+ {
+ if (!is_array($haystack)) {
+ $haystack = explode(',', $haystack);
+ }
+
+ parent::__construct($haystack, $compareIdentical);
+ }
+}
diff --git a/src/Http/Validation/Rules/NotIn.php b/src/Http/Validation/Rules/NotIn.php
new file mode 100644
index 00000000..7f223c42
--- /dev/null
+++ b/src/Http/Validation/Rules/NotIn.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Engelsystem\Http\Validation\Rules;
+
+class NotIn extends In
+{
+ /**
+ * @param mixed $input
+ * @return bool
+ */
+ public function validate($input)
+ {
+ return !parent::validate($input);
+ }
+}
diff --git a/src/Http/Validation/Validates.php b/src/Http/Validation/Validates.php
deleted file mode 100644
index 2e3a1a73..00000000
--- a/src/Http/Validation/Validates.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Engelsystem\Http\Validation;
-
-use InvalidArgumentException;
-
-class Validates
-{
- /**
- * @param mixed $value
- * @return bool
- */
- public function accepted($value): bool
- {
- return in_array($value, ['true', '1', 'y', 'yes', 'on', 1, true], true);
- }
-
- /**
- * @param string $value
- * @param array $parameters ['min', 'max']
- * @return bool
- */
- public function between($value, $parameters): bool
- {
- $this->validateParameterCount(2, $parameters, __FUNCTION__);
- $size = $this->getSize($value);
-
- return $size >= $parameters[0] && $size <= $parameters[1];
- }
-
- /**
- * @param mixed $value
- * @return bool
- */
- public function bool($value): bool
- {
- return in_array($value, ['1', 1, true, '0', 0, false], true);
- }
-
- /**
- * @param mixed $value
- * @param array $parameters ['1,2,3,56,7']
- * @return bool
- */
- public function in($value, $parameters): bool
- {
- $this->validateParameterCount(1, $parameters, __FUNCTION__);
-
- return in_array($value, explode(',', $parameters[0]));
- }
-
- /**
- * @param mixed $value
- * @return bool
- */
- public function int($value): bool
- {
- return filter_var($value, FILTER_VALIDATE_INT) !== false;
- }
-
- /**
- * @param string $value
- * @param array $parameters ['max']
- * @return bool
- */
- public function max($value, $parameters): bool
- {
- $this->validateParameterCount(1, $parameters, __FUNCTION__);
- $size = $this->getSize($value);
-
- return $size <= $parameters[0];
- }
-
- /**
- * @param string $value
- * @param array $parameters ['min']
- * @return bool
- */
- public function min($value, $parameters)
- {
- $this->validateParameterCount(1, $parameters, __FUNCTION__);
- $size = $this->getSize($value);
-
- return $size >= $parameters[0];
- }
-
- /**
- * @param mixed $value
- * @param array $parameters ['1,2,3,56,7']
- * @return bool
- */
- public function notIn($value, $parameters): bool
- {
- $this->validateParameterCount(1, $parameters, __FUNCTION__);
-
- return !$this->in($value, $parameters);
- }
-
- /**
- * @param mixed $value
- * @return bool
- */
- public function numeric($value): bool
- {
- return is_numeric($value);
- }
-
- /**
- * @param mixed $value
- * @return bool
- */
- public function required($value): bool
- {
- if (
- is_null($value)
- || (is_string($value) && trim($value) === '')
- ) {
- return false;
- }
-
- return true;
- }
-
- /**
- * @param mixed $value
- * @return int|float
- */
- protected function getSize($value)
- {
- if (is_numeric($value)) {
- return $value;
- }
-
- return mb_strlen($value);
- }
-
- /**
- * @param int $count
- * @param array $parameters
- * @param string $rule
- *
- * @throws InvalidArgumentException
- */
- protected function validateParameterCount(int $count, array $parameters, string $rule)
- {
- if (count($parameters) < $count) {
- throw new InvalidArgumentException(sprintf(
- 'The rule "%s" requires at least %d parameters',
- $rule,
- $count
- ));
- }
- }
-}
diff --git a/src/Http/Validation/ValidationServiceProvider.php b/src/Http/Validation/ValidationServiceProvider.php
index 2f1c6359..14530ae6 100644
--- a/src/Http/Validation/ValidationServiceProvider.php
+++ b/src/Http/Validation/ValidationServiceProvider.php
@@ -10,9 +10,6 @@ class ValidationServiceProvider extends ServiceProvider
{
public function register()
{
- $validates = $this->app->make(Validates::class);
- $this->app->instance(Validates::class, $validates);
-
$validator = $this->app->make(Validator::class);
$this->app->instance(Validator::class, $validator);
$this->app->instance('validator', $validator);
diff --git a/src/Http/Validation/Validator.php b/src/Http/Validation/Validator.php
index a9235a5f..0bd846bd 100644
--- a/src/Http/Validation/Validator.php
+++ b/src/Http/Validation/Validator.php
@@ -4,25 +4,23 @@ namespace Engelsystem\Http\Validation;
use Illuminate\Support\Str;
use InvalidArgumentException;
+use Respect\Validation\Exceptions\ComponentException;
+use Respect\Validation\Validator as RespectValidator;
class Validator
{
- /** @var Validates */
- protected $validate;
-
/** @var string[] */
protected $errors = [];
/** @var array */
protected $data = [];
- /**
- * @param Validates $validate
- */
- public function __construct(Validates $validate)
- {
- $this->validate = $validate;
- }
+ /** @var array */
+ protected $mapping = [
+ 'accepted' => 'TrueVal',
+ 'int' => 'IntVal',
+ 'required' => 'NotEmpty',
+ ];
/**
* @param array $data
@@ -35,23 +33,30 @@ class Validator
$this->data = [];
foreach ($rules as $key => $values) {
+ $v = new RespectValidator();
+ $v->with('\\Engelsystem\\Http\\Validation\\Rules', true);
+
+ $value = isset($data[$key]) ? $data[$key] : null;
+
foreach (explode('|', $values) as $parameters) {
$parameters = explode(':', $parameters);
$rule = array_shift($parameters);
$rule = Str::camel($rule);
+ $rule = $this->map($rule);
- if (!method_exists($this->validate, $rule)) {
- throw new InvalidArgumentException('Unknown validation rule: ' . $rule);
+ try {
+ call_user_func_array([$v, $rule], $parameters);
+ } catch (ComponentException $e) {
+ throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
}
- $value = isset($data[$key]) ? $data[$key] : null;
- if (!$this->validate->{$rule}($value, $parameters, $data)) {
- $this->errors[$key][] = implode('.', ['validation', $key, $rule]);
-
- continue;
+ if ($v->validate($value)) {
+ $this->data[$key] = $value;
+ } else {
+ $this->errors[$key][] = implode('.', ['validation', $key, $this->mapBack($rule)]);
}
- $this->data[$key] = $value;
+ $v->removeRules();
}
}
@@ -59,6 +64,26 @@ class Validator
}
/**
+ * @param string $rule
+ * @return string
+ */
+ protected function map($rule)
+ {
+ return $this->mapping[$rule] ?? $rule;
+ }
+
+ /**
+ * @param string $rule
+ * @return string
+ */
+ protected function mapBack($rule)
+ {
+ $mapping = array_flip($this->mapping);
+
+ return $mapping[$rule] ?? $rule;
+ }
+
+ /**
* @return array
*/
public function getData(): array