Browse Source

[ZF-4901, ZF-5587, ZF-5632] Zend_Validate*:

- added Zend_Config support for parameters to all validators
- added Array support for parameters to all validators

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18087 44c647ce-9c0f-0410-b52a-842ac1e357ba
thomas 16 years ago
parent
commit
87b436fa1f
1 changed files with 13 additions and 2 deletions
  1. 13 2
      library/Zend/Filter/StringToUpper.php

+ 13 - 2
library/Zend/Filter/StringToUpper.php

@@ -46,8 +46,19 @@ class Zend_Filter_StringToUpper implements Zend_Filter_Interface
      */
     public function __construct($options = null)
     {
-        if (is_array($options) && array_key_exists('encoding', $options)) {
-            $options = $options['encoding'];
+        if ($options instanceof Zend_Config) {
+            $options = $options->toArray();
+        } else if (!is_array($options)) {
+            $options = func_get_args();
+            $temp    = array();
+            if (!empty($options)) {
+                $temp['encoding'] = array_shift($options);
+            }
+            $options = $temp;
+        }
+
+        if (array_key_exists('encoding', $options)) {
+            $this->setEncoding($options);
         }
 
         $this->setEncoding($options);