Skip to content

fix: Correct Horde_Form_Type::isValid() signature #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amulet1 wants to merge 1 commit into from
Closed

fix: Correct Horde_Form_Type::isValid() signature #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions lib/Horde/Form/Type.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = '<strong>Error:</strong> Horde_Form_Type::isValid() called - should be overridden<br />';
return false;
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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;
}
Expand All @@ -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.");
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand All @@ -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.");
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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;

Expand All @@ -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.");
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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'])) {
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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.");
Expand All @@ -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;
}
Expand Down
Loading