From a542a21e9b26fe96754da1b53e67f4c830f6c03d Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Fri, 2 Oct 2009 20:59:29 +0200 Subject: [PATCH] Fix the Kolab_Server factory. Accepting arbitrary class names in the factory is not required. --- .../Kolab_Server/lib/Horde/Kolab/Server/Factory.php | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory.php index ee9a41e35..a1c9556c5 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory.php @@ -60,13 +60,9 @@ class Horde_Kolab_Server_Factory } catch (ReflectionException $e) { } - if (class_exists($driver)) { - $class = $driver; - } else { - $class = 'Horde_Kolab_Server_' . ucfirst(basename($driver)); - if (!class_exists($class)) { - throw new Horde_Kolab_Server_Exception('Server type definition "' . $class . '" missing.'); - } + $class = 'Horde_Kolab_Server_' . ucfirst(basename($driver)); + if (!class_exists($class)) { + throw new Horde_Kolab_Server_Exception('Server type definition "' . $class . '" missing.'); } $server = new $class($injector->getInstance('Horde_Kolab_Server_Structure'), @@ -115,13 +111,9 @@ class Horde_Kolab_Server_Factory } catch (ReflectionException $e) { } - if (class_exists($driver)) { - $class = $driver; - } else { - $class = 'Horde_Kolab_Server_Structure_' . ucfirst(basename($driver)); - if (!class_exists($class)) { - throw new Horde_Kolab_Server_Exception('Structure type definition "' . $class . '" missing.'); - } + $class = 'Horde_Kolab_Server_Structure_' . ucfirst(basename($driver)); + if (!class_exists($class)) { + throw new Horde_Kolab_Server_Exception('Structure type definition "' . $class . '" missing.'); } $structure = new $class($params); return $structure; -- 2.11.0