Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Merge branch 'feature/4165' into develop
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#4165
  • Loading branch information
@weierophinney
weierophinney committed Apr 12, 2013
112 parents 06503d1 + bfc0ac0 + 0337874 + ac4e5a4 + 74ad4e1 + 8037ddd + c91b8cb + 442a604 + ce86130 + 6a17c00 + 3be35a1 + b101693 + 38a8855 + 2503264 + 1330305 + c63994b + 0cebe75 + 88437dd + 335a7e0 + 49f818c + 94c6248 + babc2b3 + c5537ad + a278174 + ee91e56 + f730475 + e954d31 + aa83987 + 4272527 + 760e014 + 8f9644f + 89ddc85 + ef5a070 + af19258 + 363ebe6 + 774ea64 + db99c7e + fb3727c + d8ea42f + a5c0289 + 9730940 + ebc1a56 + 1d8cf16 + 09b3859 + efe96d1 + acf177c + 7a7f261 + df4c86b + 4d14dd3 + d0b7057 + c858228 + 8855a3f + 956acc6 + 085a083 + 99b3987 + 59e9d17 + edd16d1 + 17ad876 + 401ed50 + f43d222 + 73ebfdd + da15c07 + 4652c73 + 6a7b288 + 93b11b3 + d67242e + be0deed + c16475f + 68c3d64 + 537f455 + e79de85 + 0cbbdec + 3e0855f + a7a27db + a851ed1 + 86bf6e9 + 9fcf3f0 + c6deb01 + 811568b + 7222979 + 61e594a + 3e10b67 + ecabb9a + 8cdd2bc + 779ae47 + 5ef112f + 7ea9722 + e951b83 + 37c7404 + e730f97 + 43752c5 + ba32611 + 7c15be9 + e3a9518 + cc9ba24 + 5fbd138 + 8bab1da + fa276b4 + 3615cdf + 663ba3c + f0e4074 + c39cf5f + bfa79e5 + 3951384 + 428584d + 9dccbe3 + bc78b89 + 918afd4 + 3ed20dd + ef30a66 + 870c487 + 7f3bb0e commit 4cc8b20
Show file tree
Hide file tree
Showing 9 changed files with 485 additions and 10 deletions.
14 changes: 10 additions & 4 deletions src/BaseInputFilter.php
View file
Expand Up @@ -187,8 +187,10 @@ protected function validateInputs(array $inputs)
&& $input->isRequired()
&& $input->allowEmpty()
) {
$this->validInputs[$name] = $input;
continue;
if (!$input->allowEmpty()) {
$this->validInputs[$name] = $input;
continue;
}
}

// key exists, is null, input is not required; valid
Expand Down Expand Up @@ -223,14 +225,18 @@ protected function validateInputs(array $inputs)
}

// key exists, empty string, input is required, allows empty; valid
// if continueIfEmpty is false, otherwise validation continues
if ($dataExists
&& '' === $this->data[$name]
&& $input instanceof InputInterface
&& $input instanceof EmptyContextInterface
&& $input->isRequired()
&& $input->allowEmpty()
) {
$this->validInputs[$name] = $input;
continue;
if (!$input->continueIfEmpty()) {
$this->validInputs[$name] = $input;
continue;
}
}

// key exists, is array representing file, no file present, input not
Expand Down
17 changes: 17 additions & 0 deletions src/EmptyContextInterface.php
View file
@@ -0,0 +1,17 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\InputFilter;

interface EmptyContextInterface
{
public function setContinueIfEmpty($continueIfEmpty);

public function continueIfEmpty();
}
4 changes: 3 additions & 1 deletion src/Factory.php
View file
Expand Up @@ -153,9 +153,11 @@ public function createInput($inputSpecification)
$input->setRequired(!$value);
}
break;
case 'continue_if_empty':
$input->setContinueIfEmpty($inputSpecification['continue_if_empty']);
break;
case 'error_message':
$input->setErrorMessage($value);
break;
case 'fallback_value':
$input->setFallbackValue($value);
break;
Expand Down
331 changes: 331 additions & 0 deletions src/Factory.php.orig
View file
@@ -0,0 +1,331 @@
<?php
/**
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

namespace Zend\InputFilter;

use Traversable;
use Zend\Filter\FilterChain;
use Zend\Stdlib\ArrayUtils;
use Zend\Validator\ValidatorChain;
use Zend\Validator\ValidatorInterface;

class Factory
{
protected $defaultFilterChain;
protected $defaultValidatorChain;

/**
* Set default filter chain to use
*
* @param FilterChain $filterChain
* @return Factory
*/
public function setDefaultFilterChain(FilterChain $filterChain)
{
$this->defaultFilterChain = $filterChain;
return $this;
}

/**
* Get default filter chain, if any
*
* @return null|FilterChain
*/
public function getDefaultFilterChain()
{
return $this->defaultFilterChain;
}

/**
* Clear the default filter chain (i.e., don't inject one into new inputs)
*
* @return void
*/
public function clearDefaultFilterChain()
{
$this->defaultFilterChain = null;
}

/**
* Set default validator chain to use
*
* @param ValidatorChain $validatorChain
* @return Factory
*/
public function setDefaultValidatorChain(ValidatorChain $validatorChain)
{
$this->defaultValidatorChain = $validatorChain;
return $this;
}

/**
* Get default validator chain, if any
*
* @return null|ValidatorChain
*/
public function getDefaultValidatorChain()
{
return $this->defaultValidatorChain;
}

/**
* Clear the default validator chain (i.e., don't inject one into new inputs)
*
* @return void
*/
public function clearDefaultValidatorChain()
{
$this->defaultValidatorChain = null;
}

/**
* Factory for input objects
*
* @param array|Traversable $inputSpecification
* @throws Exception\InvalidArgumentException
* @throws Exception\RuntimeException
* @return InputInterface|InputFilterInterface
*/
public function createInput($inputSpecification)
{
if (!is_array($inputSpecification) && !$inputSpecification instanceof Traversable) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects an array or Traversable; received "%s"',
__METHOD__,
(is_object($inputSpecification) ? get_class($inputSpecification) : gettype($inputSpecification))
));
}
if ($inputSpecification instanceof Traversable) {
$inputSpecification = ArrayUtils::iteratorToArray($inputSpecification);
}

$class = 'Zend\InputFilter\Input';
if (isset($inputSpecification['type'])) {
$class = $inputSpecification['type'];
if (!class_exists($class)) {
throw new Exception\RuntimeException(sprintf(
'Input factory expects the "type" to be a valid class; received "%s"',
$class
));
}
}
$input = new $class();

if ($input instanceof InputFilterInterface) {
return $this->createInputFilter($inputSpecification);
}

if (!$input instanceof InputInterface) {
throw new Exception\RuntimeException(sprintf(
'Input factory expects the "type" to be a class implementing %s; received "%s"',
'Zend\InputFilter\InputInterface',
$class
));
}

if ($this->defaultFilterChain) {
$input->setFilterChain(clone $this->defaultFilterChain);
}
if ($this->defaultValidatorChain) {
$input->setValidatorChain(clone $this->defaultValidatorChain);
}

foreach ($inputSpecification as $key => $value) {
switch ($key) {
case 'name':
$input->setName($value);
break;
case 'required':
$input->setRequired($value);
if (!isset($inputSpecification['allow_empty'])) {
$input->setAllowEmpty(!$value);
}
break;
case 'allow_empty':
$input->setAllowEmpty($value);
if (!isset($inputSpecification['required'])) {
$input->setRequired(!$value);
}
break;
<<<<<<< HEAD
case 'error_message':
$input->setErrorMessage($value);
=======
case 'continue_if_empty':
$input->setContinueIfEmpty($inputSpecification['continue_if_empty']);
>>>>>>> zburnham/validate_empty_with_context
break;
case 'fallback_value':
$input->setFallbackValue($value);
break;
case 'filters':
if ($value instanceof FilterChain) {
$input->setFilterChain($value);
break;
}
if (!is_array($value) && !$value instanceof Traversable) {
throw new Exception\RuntimeException(sprintf(
'%s expects the value associated with "filters" to be an array/Traversable of filters or filter specifications, or a FilterChain; received "%s"',
__METHOD__,
(is_object($value) ? get_class($value) : gettype($value))
));
}
$this->populateFilters($input->getFilterChain(), $value);
break;
case 'validators':
if ($value instanceof ValidatorChain) {
$input->setValidatorChain($value);
break;
}
if (!is_array($value) && !$value instanceof Traversable) {
throw new Exception\RuntimeException(sprintf(
'%s expects the value associated with "validators" to be an array/Traversable of validators or validator specifications, or a ValidatorChain; received "%s"',
__METHOD__,
(is_object($value) ? get_class($value) : gettype($value))
));
}
$this->populateValidators($input->getValidatorChain(), $value);
break;
default:
// ignore unknown keys
break;
}
}

return $input;
}

/**
* Factory for input filters
*
* @param array|Traversable $inputFilterSpecification
* @throws Exception\InvalidArgumentException
* @throws Exception\RuntimeException
* @return InputFilterInterface
*/
public function createInputFilter($inputFilterSpecification)
{
if (!is_array($inputFilterSpecification) && !$inputFilterSpecification instanceof Traversable) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects an array or Traversable; received "%s"',
__METHOD__,
(is_object($inputFilterSpecification) ? get_class($inputFilterSpecification) : gettype($inputFilterSpecification))
));
}
if ($inputFilterSpecification instanceof Traversable) {
$inputFilterSpecification = ArrayUtils::iteratorToArray($inputFilterSpecification);
}

$class = 'Zend\InputFilter\InputFilter';
if (isset($inputFilterSpecification['type']) && is_string($inputFilterSpecification['type'])) {
$class = $inputFilterSpecification['type'];
if (!class_exists($class)) {
throw new Exception\RuntimeException(sprintf(
'Input factory expects the "type" to be a valid class; received "%s"',
$class
));
}
unset($inputFilterSpecification['type']);
}
$inputFilter = new $class();

if (!$inputFilter instanceof InputFilterInterface) {
throw new Exception\RuntimeException(sprintf(
'InputFilter factory expects the "type" to be a class implementing %s; received "%s"',
'Zend\InputFilter\InputFilterInterface', $class));
}

if ($inputFilter instanceof CollectionInputFilter) {
if (isset($inputFilterSpecification['input_filter'])) {
$inputFilter->setInputFilter($inputFilterSpecification['input_filter']);
}
if (isset($inputFilterSpecification['count'])) {
$inputFilter->setCount($inputFilterSpecification['count']);
}
return $inputFilter;
}

foreach ($inputFilterSpecification as $key => $value) {

if (($value instanceof InputInterface)
|| ($value instanceof InputFilterInterface)
) {
$input = $value;
} else {
$input = $this->createInput($value);
}

$inputFilter->add($input, $key);
}

return $inputFilter;
}

protected function populateFilters(FilterChain $chain, $filters)
{
foreach ($filters as $filter) {
if (is_object($filter) || is_callable($filter)) {
$chain->attach($filter);
continue;
}

if (is_array($filter)) {
if (!isset($filter['name'])) {
throw new Exception\RuntimeException(
'Invalid filter specification provided; does not include "name" key'
);
}
$name = $filter['name'];
$options = array();
if (isset($filter['options'])) {
$options = $filter['options'];
}
$chain->attachByName($name, $options);
continue;
}

throw new Exception\RuntimeException(
'Invalid filter specification provided; was neither a filter instance nor an array specification'
);
}
}

protected function populateValidators(ValidatorChain $chain, $validators)
{
foreach ($validators as $validator) {
if ($validator instanceof ValidatorInterface) {
$chain->attach($validator);
continue;
}

if (is_array($validator)) {
if (!isset($validator['name'])) {
throw new Exception\RuntimeException(
'Invalid validator specification provided; does not include "name" key'
);
}
$name = $validator['name'];
$options = array();
if (isset($validator['options'])) {
$options = $validator['options'];
}
$breakChainOnFailure = false;
if (isset($validator['break_chain_on_failure'])) {
$breakChainOnFailure = $validator['break_chain_on_failure'];
}
$chain->attachByName($name, $options, $breakChainOnFailure);
continue;
}

throw new Exception\RuntimeException(
'Invalid validator specification provided; was neither a validator instance nor an array specification'
);
}
}
}

0 comments on commit 4cc8b20

Please sign in to comment.