Allow Horde\Util\Variables class in isValid() method

src/V3/AddressVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_String;
 use Horde_Form_Translation;

src/V3/AddresslinkVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -22,7 +23,7 @@
  */
 class AddresslinkVariable extends AddressVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/AssignVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -52,7 +53,7 @@ public function init(...$params)
         $this->_width = $params[5] ?? '200px';
     }
 
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/BaseVariable.php

@@ -14,6 +14,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde;
 use Horde_Form_Translation;
@@ -862,7 +863,7 @@ public function onSubmit($vars) {}
       *
       * @internal
      */
-    protected function isValid(Horde_Variables $vars, $value): bool
+    protected function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         $this->message = '<strong>Error:</strong> Variable::isValid() called - should be overridden<br />';
         return false;

src/V3/BooleanVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_String;
 use Horde_Form_Translation;
@@ -29,7 +30,7 @@ class BooleanVariable extends BaseVariable
       *
       * @api
      */
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/CaptchaVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 

src/V3/CategoryVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -34,7 +35,7 @@ protected function getInfoV3($vars)
         return $info;
     }
 
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if (empty($value) && $this->isRequired()) {
             return $this->invalid('This field is required.');

src/V3/CellphoneVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 

src/V3/ColorpickerVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class ColorpickerVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($this->isRequired() && empty($value)) {
             return $this->invalid('This field is required.');

src/V3/CountedtextVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_String;
 use Horde_Form_Translation;
@@ -46,7 +47,7 @@ public function init(...$params)
         $this->_chars = $chars;
     }
 
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         $length = Horde_String::length(trim($value));
         if ($this->isRequired() && $length <= 0) {

src/V3/CountryVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 use Horde_Nls;

src/V3/CreditcardVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class CreditcardVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if (empty($value) && $this->isRequired()) {
             return $this->invalid('This field is required.');

src/V3/DateVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Date;
 use Horde_Form_Translation;

src/V3/DatetimeVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -53,7 +54,7 @@ public function init(...$params)
         $this->_hms->init($show_seconds);
     }
 
-    public function isValid(Horde_Variables|array $vars, $date): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         /* Require all fields if one field is not empty */
         if ($this->isRequired() || $this->emptyDateArray($date) != 1 || !$this->emptyTimeArray($date)) {

src/V3/DblookupVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 use Horde_Db_Exception;

src/V3/DescriptionVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class DescriptionVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/EmailVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -99,7 +100,7 @@ public function init(...$params)
       *
       * @api
      */
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         // Split into individual addresses.
         $emails = $this->splitEmailAddresses($value);

src/V3/EmailconfirmVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class EmailconfirmVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($this->isRequired() && empty($value['original'])) {
             return $this->invalid('This field is required.');

src/V3/EnumVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -43,7 +44,7 @@ public function init(...$params)
         }
     }
 
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($this->isRequired() && $value == '' && !isset($this->_values[$value])) {
             return $this->invalid('This field is required.');

src/V3/FigletVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_String;
 use Horde_Form_Translation;
@@ -37,7 +38,7 @@ public function init(...$params)
         $this->_font = $params[1];
     }
 
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if (empty($value) && $this->isRequired()) {
             return $this->invalid('This field is required.');

src/V3/FileVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Util;
 use Horde_Form_Translation;
@@ -31,7 +32,7 @@ class FileVariable extends BaseVariable
       *
       * @api
      */
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($this->isRequired()) {
             try {

src/V3/HeaderVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class HeaderVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/HourminutesecondVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Date;
 use Horde_Form_Translation;
@@ -33,7 +34,7 @@ public function init(...$params)
         $this->_show_seconds = $params[0] ?? false;
     }
 
-    public function isValid(Horde_Variables|array $vars, $time): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if (!is_array($time)) {
             if ($this->isRequired()) {

src/V3/HtmlVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -15,7 +16,7 @@
  */
 class HtmlVariable extends BaseVariable
 {
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         return true;
     }

src/V3/ImageVariable.php

@@ -4,6 +4,7 @@
 
 use Horde\Util\ArrayUtils;
 use Horde;
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 use Horde_Browser_Exception;
@@ -119,7 +120,7 @@ public function onSubmit($vars)
       *
       * @api
      */
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($vars->get('remove_' . $this->getVarName())) {
             return true;

src/V3/IntVariable.php

@@ -2,6 +2,7 @@
 
 namespace Horde\Form\V3;
 
+use Horde\Util\Variables;
 use Horde_Variables;
 use Horde_Form_Translation;
 
@@ -28,7 +29,7 @@ class IntVariable extends BaseVariable
       *
       * @api
      */
-    public function isValid(Horde_Variables $vars, $value): bool
+    public function isValid(Horde_Variables|Variables $vars, $value): bool
     {
         if ($this->isRequired() && empty($value) && ((string) (int) $value !== $value)) {
             return $this->invalid('This field is required.');