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/StringLength.php
+33 -9
View File
@@ -14,7 +14,7 @@
*
* @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$
*/
@@ -27,7 +27,7 @@ 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_StringLength extends Zend_Validate_Abstract
@@ -42,7 +42,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
protected $_messageTemplates = array(
self::INVALID => "Invalid type given, value should be a string",
self::TOO_SHORT => "'%value%' is less than %min% characters long",
self::TOO_LONG => "'%value%' is greater than %max% characters long"
self::TOO_LONG => "'%value%' is more than %max% characters long",
);
/**
@@ -79,15 +79,39 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
/**
* Sets validator options
*
* @param integer $min
* @param integer $max
* @param integer|array|Zend_Config $options
* @return void
*/
public function __construct($min = 0, $max = null, $encoding = null)
public function __construct($options = array())
{
$this->setMin($min);
$this->setMax($max);
$this->setEncoding($encoding);
if ($options instanceof Zend_Config) {
$options = $options->toArray();
} else if (!is_array($options)) {
$options = func_get_args();
$temp['min'] = array_shift($options);
if (!empty($options)) {
$temp['max'] = array_shift($options);
}
if (!empty($options)) {
$temp['encoding'] = array_shift($options);
}
$options = $temp;
}
if (!array_key_exists('min', $options)) {
$options['min'] = 0;
}
$this->setMin($options['min']);
if (array_key_exists('max', $options)) {
$this->setMax($options['max']);
}
if (array_key_exists('encoding', $options)) {
$this->setEncoding($options['encoding']);
}
}
/**