Permalink
Browse files

File Validators refactored

  • Loading branch information...
1 parent 02f8f7a commit 3f85f5fd7074e372208b23ac3d18ef24812a8c73 @cgmartin committed Oct 2, 2012
@@ -52,9 +52,11 @@ public function isValid($context = null)
return $this->isValid;
}
+ /**
+ * @return void
+ */
protected function injectNotEmptyValidator()
{
$this->notEmptyValidator = true;
- // TODO: Could do something like automatically add the Upload validator here
}
}
@@ -309,6 +309,9 @@ public function getMessages()
return $validator->getMessages();
}
+ /**
+ * @return void
+ */
protected function injectNotEmptyValidator()
{
if ((!$this->isRequired() && $this->allowEmpty()) || $this->notEmptyValidator) {
@@ -1,252 +0,0 @@
-<?php
-/**
- * Zend Framework (http://framework.zend.com/)
- *
- * @link http://github.com/zendframework/zf2 for the canonical source repository
- * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license http://framework.zend.com/license/new-bsd New BSD License
- * @package Zend_Validator
- */
-
-namespace Zend\Validator\File;
-
-use Zend\Validator\AbstractValidator;
-use Zend\Validator\Exception;
-
-/**
- * Validator for counting all given files
- *
- * @category Zend
- * @package Zend_Validator
- */
-class Count extends AbstractValidator
-{
- /**#@+
- * @const string Error constants
- */
- const TOO_MANY = 'fileCountTooMany';
- const TOO_FEW = 'fileCountTooFew';
- /**#@-*/
-
- /**
- * @var array Error message templates
- */
- protected $messageTemplates = array(
- self::TOO_MANY => "Too many files, maximum '%max%' are allowed but '%count%' are given",
- self::TOO_FEW => "Too few files, minimum '%min%' are expected but '%count%' are given",
- );
-
- /**
- * @var array Error message template variables
- */
- protected $messageVariables = array(
- 'min' => array('options' => 'min'),
- 'max' => array('options' => 'max'),
- 'count' => 'count'
- );
-
- /**
- * Actual filecount
- *
- * @var integer
- */
- protected $count;
-
- /**
- * Internal file array
- * @var array
- */
- protected $files;
-
- /**
- * Options for this validator
- *
- * @var array
- */
- protected $options = array(
- 'min' => null, // Minimum file count, if null there is no minimum file count
- 'max' => null, // Maximum file count, if null there is no maximum file count
- );
-
- /**
- * Sets validator options
- *
- * Min limits the file count, when used with max=null it is the maximum file count
- * It also accepts an array with the keys 'min' and 'max'
- *
- * If $options is a integer, it will be used as maximum file count
- * As Array is accepts the following keys:
- * 'min': Minimum filecount
- * 'max': Maximum filecount
- *
- * @param integer|array|\Traversable $options Options for the adapter
- */
- public function __construct($options = null)
- {
- if (is_string($options) || is_numeric($options)) {
- $options = array('max' => $options);
- }
-
- if (1 < func_num_args()) {
- $options['min'] = func_get_arg(0);
- $options['max'] = func_get_arg(1);
- }
-
- parent::__construct($options);
- }
-
- /**
- * Returns the minimum file count
- *
- * @return integer
- */
- public function getMin()
- {
- return $this->options['min'];
- }
-
- /**
- * Sets the minimum file count
- *
- * @param integer|array $min The minimum file count
- * @return Count Provides a fluent interface
- * @throws Exception\InvalidArgumentException When min is greater than max
- */
- public function setMin($min)
- {
- if (is_array($min) and isset($min['min'])) {
- $min = $min['min'];
- }
-
- if (!is_string($min) and !is_numeric($min)) {
- throw new Exception\InvalidArgumentException('Invalid options to validator provided');
- }
-
- $min = (integer) $min;
- if (($this->getMax() !== null) && ($min > $this->getMax())) {
- throw new Exception\InvalidArgumentException("The minimum must be less than or equal to the maximum file count, but $min >"
- . " {$this->getMax()}");
- }
-
- $this->options['min'] = $min;
- return $this;
- }
-
- /**
- * Returns the maximum file count
- *
- * @return integer
- */
- public function getMax()
- {
- return $this->options['max'];
- }
-
- /**
- * Sets the maximum file count
- *
- * @param integer|array $max The maximum file count
- * @return Count Provides a fluent interface
- * @throws Exception\InvalidArgumentException When max is smaller than min
- */
- public function setMax($max)
- {
- if (is_array($max) and isset($max['max'])) {
- $max = $max['max'];
- }
-
- if (!is_string($max) and !is_numeric($max)) {
- throw new Exception\InvalidArgumentException('Invalid options to validator provided');
- }
-
- $max = (integer) $max;
- if (($this->getMin() !== null) && ($max < $this->getMin())) {
- throw new Exception\InvalidArgumentException("The maximum must be greater than or equal to the minimum file count, but "
- . "$max < {$this->getMin()}");
- }
-
- $this->options['max'] = $max;
- return $this;
- }
-
- /**
- * Adds a file for validation
- *
- * @param string|array $file
- * @return Count
- */
- public function addFile($file)
- {
- if (is_string($file)) {
- $file = array($file);
- }
-
- if (is_array($file)) {
- foreach ($file as $name) {
- if (!isset($this->files[$name]) && !empty($name)) {
- $this->files[$name] = $name;
- }
- }
- }
-
- return $this;
- }
-
- /**
- * Returns true if and only if the file count of all checked files is at least min and
- * not bigger than max (when max is not null). Attention: When checking with set min you
- * must give all files with the first call, otherwise you will get an false.
- *
- * @param string|array $value Filenames to check for count
- * @param array $file File data from \Zend\File\Transfer\Transfer
- * @return boolean
- */
- public function isValid($value, $file = null)
- {
- if (($file !== null) && !array_key_exists('destination', $file)) {
- $file['destination'] = dirname($value);
- }
-
- if (($file !== null) && array_key_exists('tmp_name', $file)) {
- $value = $file['destination'] . DIRECTORY_SEPARATOR . $file['name'];
- }
-
- if (($file === null) || !empty($file['tmp_name'])) {
- $this->addFile($value);
- }
-
- $this->count = count($this->files);
- if (($this->getMax() !== null) && ($this->count > $this->getMax())) {
- return $this->throwError($file, self::TOO_MANY);
- }
-
- if (($this->getMin() !== null) && ($this->count < $this->getMin())) {
- return $this->throwError($file, self::TOO_FEW);
- }
-
- return true;
- }
-
- /**
- * Throws an error of the given type
- *
- * @param string $file
- * @param string $errorType
- * @return false
- */
- protected function throwError($file, $errorType)
- {
- if ($file !== null) {
- if (is_array($file)) {
- if (array_key_exists('name', $file)) {
- $this->value = $file['name'];
- }
- } elseif (is_string($file)) {
- $this->value = $file;
- }
- }
-
- $this->error($errorType);
- return false;
- }
-}
@@ -29,9 +29,9 @@ class Crc32 extends Hash
* @var array Error message templates
*/
protected $messageTemplates = array(
- self::DOES_NOT_MATCH => "File '%value%' does not match the given crc32 hashes",
+ self::DOES_NOT_MATCH => "File does not match the given crc32 hashes",
self::NOT_DETECTED => "A crc32 hash could not be evaluated for the given file",
- self::NOT_FOUND => "File '%value%' is not readable or does not exist",
+ self::NOT_FOUND => "File is not readable or does not exist",
);
/**
@@ -81,25 +81,26 @@ public function addCrc32($options)
/**
* Returns true if and only if the given file confirms the set hash
*
- * @param string $value Filename to check for hash
- * @param array $file File data from \Zend\File\Transfer\Transfer
+ * @param string|array $value Filename to check for hash
* @return boolean
*/
- public function isValid($value, $file = null)
+ public function isValid($value)
{
- if ($file === null) {
- $file = array('name' => basename($value));
- }
+ $file = (isset($value['tmp_name'])) ? $value['tmp_name'] : $value;
+ $filename = (isset($value['name'])) ? $value['name'] : basename($file);
+ $this->setValue($filename);
// Is file readable ?
- if (false === stream_resolve_include_path($value)) {
- return $this->throwError($file, self::NOT_FOUND);
+ if (false === stream_resolve_include_path($file)) {
+ $this->error(self::NOT_FOUND);
+ return false;
}
$hashes = array_unique(array_keys($this->getHash()));
- $filehash = hash_file('crc32', $value);
+ $filehash = hash_file('crc32', $file);
if ($filehash === false) {
- return $this->throwError($file, self::NOT_DETECTED);
+ $this->error(self::NOT_DETECTED);
+ return false;
}
foreach ($hashes as $hash) {
@@ -108,6 +109,7 @@ public function isValid($value, $file = null)
}
}
- return $this->throwError($file, self::DOES_NOT_MATCH);
+ $this->error(self::DOES_NOT_MATCH);
+ return false;
}
}
Oops, something went wrong.

0 comments on commit 3f85f5f

Please sign in to comment.