L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zend MDL-22103 update Zend library to 1.10

Browse Source
This commit is contained in:
jerome mouneyrac
2010-07-05 09:19:42 +00:00
parent 49147814fc
commit 651aa5b565
639 changed files with 7329 additions and 4670 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zend/Zend/Validate/InArray.php
+85 -19
View File
@@ -1,5 +1,4 @@
<?php
/**
* Zend Framework
*
@@ -15,34 +14,31 @@
*
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id$
*/
/**
* @see Zend_Validate_Abstract
*/
require_once 'Zend/Validate/Abstract.php';
/**
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Zend_Validate_InArray extends Zend_Validate_Abstract
{
const NOT_IN_ARRAY = 'notInArray';
/**
* @var array
*/
protected $_messageTemplates = array(
self::NOT_IN_ARRAY => "'%value%' was not found in the haystack"
self::NOT_IN_ARRAY => "'%value%' was not found in the haystack",
);
/**
@@ -57,19 +53,54 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
*
* @var boolean
*/
protected $_strict;
protected $_strict = false;
/**
* Whether a recursive search should be done
*
* @var boolean
*/
protected $_recursive = false;
/**
* Sets validator options
*
* @param array $haystack
* @param boolean $strict
* @param array|Zend_Config $haystack
* @return void
*/
public function __construct(array $haystack, $strict = false)
public function __construct($options)
{
$this->setHaystack($haystack)
->setStrict($strict);
if ($options instanceof Zend_Config) {
$options = $options->toArray();
} else if (!is_array($options)) {
require_once 'Zend/Validate/Exception.php';
throw new Zend_Validate_Exception('Array expected as parameter');
} else {
$count = func_num_args();
$temp = array();
if ($count > 1) {
$temp['haystack'] = func_get_arg(0);
$temp['strict'] = func_get_arg(1);
$options = $temp;
} else {
$temp = func_get_arg(0);
if (!array_key_exists('haystack', $options)) {
$options = array();
$options['haystack'] = $temp;
} else {
$options = $temp;
}
}
}
$this->setHaystack($options['haystack']);
if (array_key_exists('strict', $options)) {
$this->setStrict($options['strict']);
}
if (array_key_exists('recursive', $options)) {
$this->setRecursive($options['recursive']);
}
}
/**
@@ -112,7 +143,29 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
*/
public function setStrict($strict)
{
$this->_strict = $strict;
$this->_strict = (boolean) $strict;
return $this;
}
/**
* Returns the recursive option
*
* @return boolean
*/
public function getRecursive()
{
return $this->_recursive;
}
/**
* Sets the recursive option
*
* @param boolean $recursive
* @return Zend_Validate_InArray Provides a fluent interface
*/
public function setRecursive($recursive)
{
$this->_recursive = (boolean) $recursive;
return $this;
}
@@ -128,11 +181,24 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
public function isValid($value)
{
$this->_setValue($value);
if (!in_array($value, $this->_haystack, $this->_strict)) {
$this->_error(self::NOT_IN_ARRAY);
return false;
if ($this->getRecursive()) {
$iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($this->_haystack));
foreach($iterator as $element) {
if ($this->_strict) {
if ($element === $value) {
return true;
}
} else if ($element == $value) {
return true;
}
}
} else {
if (in_array($value, $this->_haystack, $this->_strict)) {
return true;
}
}
return true;
}
$this->_error(self::NOT_IN_ARRAY);
return false;
}
}