diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 7f8c5dff..50cf6b52 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -66,8 +66,6 @@
options]]>
options]]>
options]]>
- options]]>
- options]]>
@@ -448,20 +446,6 @@
-
-
-
-
-
- options['inclusive']]]>
-
-
-
-
-
-
-
-
@@ -1360,29 +1344,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1541,29 +1502,6 @@
options['type']]]>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Between.php b/src/Between.php
deleted file mode 100644
index 1026e52c..00000000
--- a/src/Between.php
+++ /dev/null
@@ -1,220 +0,0 @@
-
- */
- protected $messageTemplates = [
- self::NOT_BETWEEN => "The input is not between '%min%' and '%max%', inclusively",
- self::NOT_BETWEEN_STRICT => "The input is not strictly between '%min%' and '%max%'",
- self::VALUE_NOT_NUMERIC => "The min ('%min%') and max ('%max%') values are numeric, but the input is not",
- self::VALUE_NOT_STRING => "The min ('%min%') and max ('%max%') values are non-numeric strings, "
- . 'but the input is not a string',
- ];
-
- /**
- * Additional variables available for validation failure messages
- *
- * @var array
- */
- protected $messageVariables = [
- 'min' => ['options' => 'min'],
- 'max' => ['options' => 'max'],
- ];
-
- /**
- * Options for the between validator
- *
- * @var array
- */
- protected $options = [
- 'inclusive' => true, // Whether to do inclusive comparisons, allowing equivalence to min and/or max
- 'min' => 0,
- 'max' => PHP_INT_MAX,
- ];
-
- /**
- * Sets validator options
- * Accepts the following option keys:
- * 'min' => scalar, minimum border
- * 'max' => scalar, maximum border
- * 'inclusive' => boolean, inclusive border values
- *
- * @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
- */
- public function __construct($options = null)
- {
- if ($options instanceof Traversable) {
- $options = ArrayUtils::iteratorToArray($options);
- }
- if (! is_array($options)) {
- $temp = [];
- /** @psalm-var array $options */
- $options = func_get_args();
- $temp['min'] = array_shift($options);
- if (! empty($options)) {
- $temp['max'] = array_shift($options);
- }
-
- if (! empty($options)) {
- $temp['inclusive'] = array_shift($options);
- }
-
- $options = $temp;
- }
-
- if (! array_key_exists('min', $options) || ! array_key_exists('max', $options)) {
- throw new Exception\InvalidArgumentException("Missing option: 'min' and 'max' have to be given");
- }
-
- if (
- (isset($options['min']) && is_numeric($options['min']))
- && (isset($options['max']) && is_numeric($options['max']))
- ) {
- $this->numeric = true;
- } elseif (
- (isset($options['min']) && is_string($options['min']))
- && (isset($options['max']) && is_string($options['max']))
- ) {
- $this->numeric = false;
- } else {
- throw new Exception\InvalidArgumentException(
- "Invalid options: 'min' and 'max' should be of the same scalar type"
- );
- }
-
- parent::__construct($options);
- }
-
- /**
- * Returns the min option
- *
- * @return mixed
- */
- public function getMin()
- {
- return $this->options['min'];
- }
-
- /**
- * Sets the min option
- *
- * @return $this Provides a fluent interface
- */
- public function setMin(mixed $min)
- {
- $this->options['min'] = $min;
- return $this;
- }
-
- /**
- * Returns the max option
- *
- * @return mixed
- */
- public function getMax()
- {
- return $this->options['max'];
- }
-
- /**
- * Sets the max option
- *
- * @return $this Provides a fluent interface
- */
- public function setMax(mixed $max)
- {
- $this->options['max'] = $max;
- return $this;
- }
-
- /**
- * Returns the inclusive option
- *
- * @return bool
- */
- public function getInclusive()
- {
- return $this->options['inclusive'];
- }
-
- /**
- * Sets the inclusive option
- *
- * @param bool $inclusive
- * @return $this Provides a fluent interface
- */
- public function setInclusive($inclusive)
- {
- $this->options['inclusive'] = $inclusive;
- return $this;
- }
-
- /**
- * Returns true if and only if $value is between min and max options, inclusively
- * if inclusive option is true.
- *
- * @param mixed $value
- * @return bool
- */
- public function isValid($value)
- {
- $this->setValue($value);
-
- if ($this->numeric && ! is_numeric($value)) {
- $this->error(self::VALUE_NOT_NUMERIC);
- return false;
- }
- if (! $this->numeric && ! is_string($value)) {
- $this->error(self::VALUE_NOT_STRING);
- return false;
- }
-
- if ($this->getInclusive()) {
- if ($this->getMin() > $value || $value > $this->getMax()) {
- $this->error(self::NOT_BETWEEN);
- return false;
- }
- } else {
- if ($this->getMin() >= $value || $value >= $this->getMax()) {
- $this->error(self::NOT_BETWEEN_STRICT);
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/src/GreaterThan.php b/src/GreaterThan.php
deleted file mode 100644
index eb5cf997..00000000
--- a/src/GreaterThan.php
+++ /dev/null
@@ -1,158 +0,0 @@
- "The input is not greater than '%min%'",
- self::NOT_GREATER_INCLUSIVE => "The input is not greater than or equal to '%min%'",
- ];
-
- /** @var array */
- protected $messageVariables = [
- 'min' => 'min',
- ];
-
- /**
- * Minimum value
- *
- * @var mixed
- */
- protected $min;
-
- /**
- * Whether to do inclusive comparisons, allowing equivalence to max
- *
- * If false, then strict comparisons are done, and the value may equal
- * the min option
- *
- * @var bool
- */
- protected $inclusive;
-
- /**
- * Sets validator options
- *
- * @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
- */
- public function __construct($options = null)
- {
- if ($options instanceof Traversable) {
- $options = ArrayUtils::iteratorToArray($options);
- }
- if (! is_array($options)) {
- $options = func_get_args();
- $temp['min'] = array_shift($options);
-
- if (! empty($options)) {
- $temp['inclusive'] = array_shift($options);
- }
-
- $options = $temp;
- }
-
- if (! array_key_exists('min', $options)) {
- throw new Exception\InvalidArgumentException("Missing option 'min'");
- }
-
- if (! array_key_exists('inclusive', $options)) {
- $options['inclusive'] = false;
- }
-
- $this->setMin($options['min'])
- ->setInclusive($options['inclusive']);
-
- parent::__construct($options);
- }
-
- /**
- * Returns the min option
- *
- * @return mixed
- */
- public function getMin()
- {
- return $this->min;
- }
-
- /**
- * Sets the min option
- *
- * @return $this Provides a fluent interface
- */
- public function setMin(mixed $min)
- {
- $this->min = $min;
- return $this;
- }
-
- /**
- * Returns the inclusive option
- *
- * @return bool
- */
- public function getInclusive()
- {
- return $this->inclusive;
- }
-
- /**
- * Sets the inclusive option
- *
- * @param bool $inclusive
- * @return $this Provides a fluent interface
- */
- public function setInclusive($inclusive)
- {
- $this->inclusive = $inclusive;
- return $this;
- }
-
- /**
- * Returns true if and only if $value is greater than min option
- *
- * @param mixed $value
- * @return bool
- */
- public function isValid($value)
- {
- $this->setValue($value);
-
- if ($this->inclusive) {
- if ($this->min > $value) {
- $this->error(self::NOT_GREATER_INCLUSIVE);
- return false;
- }
- } else {
- if ($this->min >= $value) {
- $this->error(self::NOT_GREATER);
- return false;
- }
- }
-
- return true;
- }
-}
diff --git a/src/LessThan.php b/src/LessThan.php
deleted file mode 100644
index 751099e4..00000000
--- a/src/LessThan.php
+++ /dev/null
@@ -1,163 +0,0 @@
- "The input is not less than '%max%'",
- self::NOT_LESS_INCLUSIVE => "The input is not less or equal than '%max%'",
- ];
-
- /**
- * Additional variables available for validation failure messages
- *
- * @var array
- */
- protected $messageVariables = [
- 'max' => 'max',
- ];
-
- /**
- * Maximum value
- *
- * @var mixed
- */
- protected $max;
-
- /**
- * Whether to do inclusive comparisons, allowing equivalence to max
- *
- * If false, then strict comparisons are done, and the value may equal
- * the max option
- *
- * @var bool
- */
- protected $inclusive;
-
- /**
- * Sets validator options
- *
- * @param array|Traversable $options
- * @throws Exception\InvalidArgumentException
- */
- public function __construct($options = null)
- {
- if ($options instanceof Traversable) {
- $options = ArrayUtils::iteratorToArray($options);
- }
- if (! is_array($options)) {
- $options = func_get_args();
- $temp['max'] = array_shift($options);
-
- if (! empty($options)) {
- $temp['inclusive'] = array_shift($options);
- }
-
- $options = $temp;
- }
-
- if (! array_key_exists('max', $options)) {
- throw new Exception\InvalidArgumentException("Missing option 'max'");
- }
-
- if (! array_key_exists('inclusive', $options)) {
- $options['inclusive'] = false;
- }
-
- $this->setMax($options['max'])
- ->setInclusive($options['inclusive']);
-
- parent::__construct($options);
- }
-
- /**
- * Returns the max option
- *
- * @return mixed
- */
- public function getMax()
- {
- return $this->max;
- }
-
- /**
- * Sets the max option
- *
- * @return $this Provides a fluent interface
- */
- public function setMax(mixed $max)
- {
- $this->max = $max;
- return $this;
- }
-
- /**
- * Returns the inclusive option
- *
- * @return bool
- */
- public function getInclusive()
- {
- return $this->inclusive;
- }
-
- /**
- * Sets the inclusive option
- *
- * @param bool $inclusive
- * @return $this Provides a fluent interface
- */
- public function setInclusive($inclusive)
- {
- $this->inclusive = $inclusive;
- return $this;
- }
-
- /**
- * Returns true if and only if $value is less than max option, inclusively
- * when the inclusive option is true
- *
- * @param mixed $value
- * @return bool
- */
- public function isValid($value)
- {
- $this->setValue($value);
-
- if ($this->inclusive) {
- if ($value > $this->max) {
- $this->error(self::NOT_LESS_INCLUSIVE);
- return false;
- }
- } else {
- if ($value >= $this->max) {
- $this->error(self::NOT_LESS);
- return false;
- }
- }
-
- return true;
- }
-}