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

Fix wrong behaviour on Size rule

Browse source 
The validation was made only on `validate()` method, but it was
necessary to overwrite `assert()` and `check()` to replace the filename
by the size.
The `Size` rule now doesn't extends `Between` class, and instead it
extends `AbstractRule` and performs the validation only on `validate()`
method like many other rules.
This commit is contained in:
Henrique Moody 2015-07-20 13:42:08 -03:00
parent f6c68bf086
commit 4f8faab765
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
library/Rules/Size.php
View file

@ -19,7 +19,7 @@ use SplFileInfo;
*
* @author Henrique Moody <henriquemoody@gmail.com>
*/
class Size extends Between
class Size extends AbstractRule
{
/**
* @var string
@ -37,19 +37,10 @@ class Size extends Between
*/
public function __construct($minSize = null, $maxSize = null)
{
$minSizeBytes = $minSize;
if (null !== $minSizeBytes) {
$minSizeBytes = $this->toBytes($minSize);
}
$this->minSize = $minSize;
$maxSizeBytes = $maxSize;
if (null !== $maxSizeBytes) {
$maxSizeBytes = $this->toBytes($maxSize);
}
$this->minValue = $minSize ? $this->toBytes($minSize) : null;
$this->maxSize = $maxSize;
parent::__construct($minSizeBytes, $maxSizeBytes, true);
$this->maxValue = $maxSize ? $this->toBytes($maxSize) : null;
}
/**
@ -78,19 +69,37 @@ class Size extends Between
return $value;
}
/**
* @param int $size
*
* @return bool
*/
private function isValidSize($size)
{
if (null !== $this->minValue && null !== $this->maxValue) {
return ($size >= $this->minValue && $size <= $this->maxValue);
}
if (null !== $this->minValue) {
return ($size >= $this->minValue);
}
return ($size <= $this->maxValue);
}
/**
* {@inheritdoc}
*/
public function validate($input)
{
if ($input instanceof SplFileInfo) {
return parent::validate($input->getSize());
return $this->isValidSize($input->getSize());
}
if (!is_string($input)) {
return false;
if (is_string($input)) {
return $this->isValidSize(filesize($input));
}
return parent::validate(filesize($input));
return false;
}
}