[GENERIC] Zend_Validate:

- erased old notes

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18412 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Validate/Between.php

@@ -101,12 +101,6 @@ class Zend_Validate_Between extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (!is_array($options)) {
-            $count = func_num_args();
-            if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
-            }
-
             $options = func_get_args();
             $temp['min'] = array_shift($options);
             if (!empty($options)) {

library/Zend/Validate/Date.php

@@ -79,12 +79,6 @@ class Zend_Validate_Date extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (!is_array($options)) {
-            $count = func_num_args();
-            if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
-            }
-
             $options = func_get_args();
             $temp['format'] = array_shift($options);
             if (!empty($options)) {

library/Zend/Validate/Db/Abstract.php

@@ -95,10 +95,7 @@ abstract class Zend_Validate_Db_Abstract extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (func_num_args() > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE);
-
-            $options = func_get_args();
+            $options       = func_get_args();
             $temp['table'] = array_shift($options);
             $temp['field'] = array_shift($options);
             if (!empty($options)) {

library/Zend/Validate/EmailAddress.php

@@ -132,12 +132,6 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (!is_array($options)) {
-            $count = func_num_args();
-            if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
-            }
-
             $options = func_get_args();
             $temp['allow'] = array_shift($options);
             if (!empty($options)) {

library/Zend/Validate/File/Count.php

@@ -115,8 +115,6 @@ class Zend_Validate_File_Count extends Zend_Validate_Abstract
         }
 
         if (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple arguments are deprecated in favor of an array of named arguments', E_USER_NOTICE);
             $options['min'] = func_get_arg(0);
             $options['max'] = func_get_arg(1);
         }

library/Zend/Validate/File/Extension.php

@@ -81,8 +81,6 @@ class Zend_Validate_File_Extension extends Zend_Validate_Abstract
         }
 
         if (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple arguments to constructor are deprecated in favor of options array', E_USER_NOTICE);
             $case = func_get_arg(1);
             $this->setCase($case);
         }

library/Zend/Validate/File/FilesSize.php

@@ -81,9 +81,6 @@ class Zend_Validate_File_FilesSize extends Zend_Validate_File_Size
         }
 
         if (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE);
-
             $argv = func_get_args();
             array_shift($argv);
             $options['max'] = array_shift($argv);

library/Zend/Validate/File/Hash.php

@@ -75,8 +75,6 @@ class Zend_Validate_File_Hash extends Zend_Validate_Abstract
         }
 
         if (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE);
             $options['algorithm'] = func_get_arg(1);
         }
 

library/Zend/Validate/File/ImageSize.php

@@ -127,8 +127,6 @@ class Zend_Validate_File_ImageSize extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } elseif (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE);
             if (!is_array($options)) {
                 $options = array('minwidth' => $options);
             }

library/Zend/Validate/File/Size.php

@@ -112,8 +112,6 @@ class Zend_Validate_File_Size extends Zend_Validate_Abstract
         }
 
         if (1 < func_num_args()) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//          trigger_error('Multiple constructor options are deprecated in favor of a single options array', E_USER_NOTICE);
             $argv = func_get_args();
             array_shift($argv);
             $options['max'] = array_shift($argv);

library/Zend/Validate/Hostname.php

@@ -321,12 +321,6 @@ class Zend_Validate_Hostname extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (!is_array($options)) {
-            $count = func_num_args();
-            if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
-            }
-
             $options = func_get_args();
             $temp['allow'] = array_shift($options);
             if (!empty($options)) {

library/Zend/Validate/InArray.php

@@ -77,10 +77,8 @@ class Zend_Validate_InArray extends Zend_Validate_Abstract
             throw new Zend_Validate_Exception('Array expected as parameter');
         } else {
             $count = func_num_args();
-            $temp = array();
+            $temp  = array();
             if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
                 $temp['haystack'] = func_get_arg(0);
                 $temp['strict']   = func_get_arg(1);
                 $options = $temp;

library/Zend/Validate/StringLength.php

@@ -87,13 +87,7 @@ class Zend_Validate_StringLength extends Zend_Validate_Abstract
         if ($options instanceof Zend_Config) {
             $options = $options->toArray();
         } else if (!is_array($options)) {
-            $count = func_num_args();
-            if ($count > 1) {
-// @todo: Preperation for 2.0... needs to be cleared with the dev-team
-//              trigger_error('Support for multiple arguments is deprecated in favor of a single options array', E_USER_NOTICE);
-            }
-
-            $options = func_get_args();
+            $options     = func_get_args();
             $temp['min'] = array_shift($options);
             if (!empty($options)) {
                 $temp['max'] = array_shift($options);