Skip to content

V3 improvements #28

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

Merged
amulet1 merged 2 commits into from
May 8, 2026
Merged

V3 improvements #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8db8ef0
refactor: Improve createVariable() logic
amulet1 May 8, 2026
7e140f2
fix(v3): Reproduce legacy type names in getTypeName()
amulet1 May 8, 2026
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
14 changes: 8 additions & 6 deletions lib/Horde/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,15 @@ public static function createVariable(
) {
$arr = explode(':', $type, 2);
if (count($arr) == 2) {
$app = $arr[0];
$app = ucfirst($arr[0]);
$name = $arr[1];
} else {
$app = 'Horde';
$name = $arr[0];
}

$class = $app . '\\Form\\V3\\' . ucfirst($name) . 'Variable';
$name = ucfirst($name);
$class = $app . '\\Form\\V3\\' . $name . 'Variable';
$modern = class_exists($class);
if ($modern) {
$var = new $class(
Expand All @@ -221,11 +222,12 @@ public static function createVariable(
);
} elseif (self::$legacy) {
$class = $app . '_Form_Type_' . $name;
if (!class_exists($class)) {
throw new Horde_Exception(sprintf('Nonexistent class "%s" for field type "%s"', $class, $name));
}
$var = new $class();
$var = class_exists($class) ? new $class() : null;
} else {
$var = null;
}

if ($var === null) {
throw new Horde_Exception(sprintf('Nonexistent class "%s" for field type "%s"', $class, $name));
}

Expand Down
9 changes: 8 additions & 1 deletion src/V3/BaseVariable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,14 @@ public function getType()
*/
public function getTypeName(): string
{
return mb_strtolower(str_replace('Horde\Form\V3\\', '', substr($this::class, 0, -8)));
$parts = explode('\\', $this::class);
$app = strtolower($parts[0]);
$name = strtolower(substr($parts[count($parts) - 1], 0, -8));
if ($app !== 'horde') {
// legacy
$name = $app . '_form_type_' . $name;
}
return $name;
}

/**
Expand Down
Loading