From 8b099463c8d7209e6612d7bdf7f11c7347dbe532 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 12 May 2026 16:39:08 -0400 Subject: [PATCH] refactor: Remove no longer needed code from Horde_Core_Ui_VarRenderer::factory() --- lib/Horde/Core/Ui/VarRenderer.php | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/lib/Horde/Core/Ui/VarRenderer.php b/lib/Horde/Core/Ui/VarRenderer.php index 8912edbf..16fa1185 100644 --- a/lib/Horde/Core/Ui/VarRenderer.php +++ b/lib/Horde/Core/Ui/VarRenderer.php @@ -56,26 +56,16 @@ public function __construct($params = []) public static function factory($driver, $params = []) { if (is_array($driver)) { - $app = $driver[0]; + $app = Horde_String::ucfirst($driver[0]); $driver = $driver[1]; } else { - $app = ''; + $app = 'Horde_Core'; } $driver = Horde_String::ucfirst(basename($driver)); - $class = (empty($app) ? 'Horde_Core' : $app) . '_Ui_VarRenderer_' . $driver; + $class = $app . '_Ui_VarRenderer_' . $driver; - $ok = class_exists($class); - - // TODO: Eliminate after renaming Horde_Ui_VarRenderer_* classes in other apps to {app}_Ui_VarRenderer_* - if (!$ok && !empty($app)) { - // fallback to legacy method (manual load) - $class = __CLASS__ . '_' . $driver; - include_once $GLOBALS['registry']->get('fileroot', $app) . '/lib/Ui/VarRenderer/' . $driver . '.php'; - $ok = class_exists($class); - } - - if (!$ok) { + if (!class_exists($class)) { throw new LogicException('Class definition of ' . $class . ' not found.'); }