From f001a3aad7b0c262828d777d4a0ca003f03f1d4d Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 13 Jun 2025 12:57:44 -0400 Subject: [PATCH] fix: Correct Horde_Form_Type::isValid() signature The $message parameter is string and it should be passed by reference. See commit 070af2 --- lib/Horde/Form/Type.php | 88 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/Horde/Form/Type.php b/lib/Horde/Form/Type.php index 976ed77..50de94a 100644 --- a/lib/Horde/Form/Type.php +++ b/lib/Horde/Form/Type.php @@ -52,7 +52,7 @@ public function init(...$params) {} public function onSubmit(...$params) {} - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $message = 'Error: Horde_Form_Type::isValid() called - should be overridden
'; return false; @@ -78,7 +78,7 @@ public function getInfo($vars, $var, $info) class Horde_Form_Type_spacer extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -95,7 +95,7 @@ public function about() class Horde_Form_Type_header extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -112,7 +112,7 @@ public function about() class Horde_Form_Type_description extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -132,7 +132,7 @@ public function about() */ class Horde_Form_Type_html extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -156,7 +156,7 @@ public function init(...$params) $this->_fraction = $params[0] ?? null; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value) && ((string) (float) $value !== $value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -237,7 +237,7 @@ public function about() */ class Horde_Form_Type_int extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value) && ((string) (int) $value !== $value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -264,7 +264,7 @@ public function about() class Horde_Form_Type_octal extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value) && ((string) (int) $value !== $value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -291,7 +291,7 @@ public function about() class Horde_Form_Type_intlist extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (empty($value) && $var->isRequired()) { $message = Horde_Form_Translation::t("This field is required."); @@ -353,7 +353,7 @@ public function init(...$params) $this->_maxlength = $params[2] ?? null; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -470,7 +470,7 @@ public function init(...$params) $this->_size = $params[0] ?? 15; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (!strlen(trim($value))) { if ($var->isRequired()) { @@ -520,7 +520,7 @@ public function about() class Horde_Form_Type_ipaddress extends Horde_Form_Type_text { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -561,7 +561,7 @@ public function about() class Horde_Form_Type_ip6address extends Horde_Form_Type_text { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -678,7 +678,7 @@ public function init(...$params) $this->_chars = $chars; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -830,7 +830,7 @@ public function about() class Horde_Form_Type_addresslink extends Horde_Form_Type_address { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -990,7 +990,7 @@ public function about() class Horde_Form_Type_file extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired()) { try { @@ -1122,7 +1122,7 @@ public function onSubmit(...$params) * @param something $message Not clear what this field does */ - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($vars->get('remove_' . $var->getVarName())) { return true; @@ -1429,7 +1429,7 @@ public function about() class Horde_Form_Type_boolean extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -1470,7 +1470,7 @@ public function init(...$params) $this->values = $params[0] ?? null; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -1589,7 +1589,7 @@ public function init(...$params) /** */ - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { // Split into individual addresses. $emails = $this->splitEmailAddresses($value); @@ -2245,7 +2245,7 @@ public function init(...$params) $this->_new_input = $params[3] ?? false; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -2293,7 +2293,7 @@ public function about() class Horde_Form_Type_emailConfirm extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value['original'])) { $message = Horde_Form_Translation::t("This field is required."); @@ -2333,7 +2333,7 @@ public function about() class Horde_Form_Type_password extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -2360,7 +2360,7 @@ public function about() class Horde_Form_Type_passwordconfirm extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value['original'])) { $message = Horde_Form_Translation::t("This field is required."); @@ -2419,7 +2419,7 @@ public function init(...$params) } } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && $value == '' && !isset($this->_values[$value])) { $message = Horde_Form_Translation::t("This field is required."); @@ -2506,7 +2506,7 @@ public function onSubmit(...$params) } } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && (empty($value['1']) || empty($value['2']))) { $message = Horde_Form_Translation::t("This field is required."); @@ -2583,7 +2583,7 @@ public function init(...$params) parent::init($values); } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (is_array($value)) { foreach ($value as $val) { @@ -2694,7 +2694,7 @@ public function init(...$params) } } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ((!is_null($this->_values) && count($this->_values) == 0) || is_null($value) || count($value) == 0) { @@ -2747,7 +2747,7 @@ public function init(...$params) $this->_format = $params[0] ?? '%a %d %B'; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $valid = true; @@ -2822,7 +2822,7 @@ public function about() class Horde_Form_Type_time extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value) && ((string) (float) $value !== $value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -2861,7 +2861,7 @@ public function init(...$params) $this->_show_seconds = $params[0] ?? false; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $time = $vars->get($var->getVarName()); if (!$this->_show_seconds && count($time) && !isset($time['second'])) { @@ -2989,7 +2989,7 @@ public function init(...$params) $this->_end_year = $end_year; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (!$var->isRequired()) { return true; @@ -3074,7 +3074,7 @@ public function init(...$params) $this->_format_out = $format_out; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $date = $vars->get($var->getVarName()); $empty = $this->emptyDateArray($date); @@ -3306,7 +3306,7 @@ public function init(...$params) $this->_show_seconds = $show_seconds; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { $date = $vars->get($var->getVarName()); if (!$this->_show_seconds && !isset($date['second'])) { @@ -3455,7 +3455,7 @@ public function about() class Horde_Form_Type_colorpicker extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -3494,7 +3494,7 @@ public function getSounds() return $this->_sounds; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if ($var->isRequired() && empty($value)) { $message = Horde_Form_Translation::t("This field is required."); @@ -3546,7 +3546,7 @@ public function init(...$params) $this->_header = $header; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -3664,7 +3664,7 @@ public function init(...$params) $this->_icon = $icon; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -3718,7 +3718,7 @@ public function init(...$params) $this->_width = $params[5] ?? '200px'; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -3834,7 +3834,7 @@ public function about() class Horde_Form_Type_creditcard extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (empty($value) && $var->isRequired()) { $message = Horde_Form_Translation::t("This field is required."); @@ -3936,7 +3936,7 @@ public function about() class Horde_Form_Type_obrowser extends Horde_Form_Type { - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return true; } @@ -4012,7 +4012,7 @@ public function init(...$params) $this->_font = $params[1]; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (empty($value) && $var->isRequired()) { $message = Horde_Form_Translation::t("This field is required."); @@ -4096,7 +4096,7 @@ public function about() return ['name' => Horde_Form_Translation::t("Category")]; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { if (empty($value) && $var->isRequired()) { $message = Horde_Form_Translation::t("This field is required."); @@ -4122,7 +4122,7 @@ public function init(...$params) $this->message = $params[0] ?? ''; } - public function isValid($var, $vars, $value, $message) + public function isValid($var, $vars, $value, &$message) { return false; }