From 22712abe04abdf7da54ab21f9eb38aeed1a51e16 Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Mon, 30 Mar 2009 04:38:34 +0000 Subject: [PATCH] Upcase server class names. --- framework/Kolab_Server/lib/Horde/Kolab/Server.php | 2 +- .../lib/Horde/Kolab/Server/{file.php => File.php} | 2 +- .../lib/Horde/Kolab/Server/{ldap.php => Ldap.php} | 2 +- .../lib/Horde/Kolab/Server/{test.php => Test.php} | 2 +- framework/Kolab_Server/package.xml | 16 ++++++++-------- .../Horde/Kolab/Server/{ldapTest.php => LdapTest.php} | 0 .../Kolab_Server/test/Horde/Kolab/Server/ServerTest.php | 4 ++-- .../Horde/Kolab/Server/{testTest.php => TestTest.php} | 0 8 files changed, 14 insertions(+), 14 deletions(-) rename framework/Kolab_Server/lib/Horde/Kolab/Server/{file.php => File.php} (98%) rename framework/Kolab_Server/lib/Horde/Kolab/Server/{ldap.php => Ldap.php} (99%) rename framework/Kolab_Server/lib/Horde/Kolab/Server/{test.php => Test.php} (99%) rename framework/Kolab_Server/test/Horde/Kolab/Server/{ldapTest.php => LdapTest.php} (100%) rename framework/Kolab_Server/test/Horde/Kolab/Server/{testTest.php => TestTest.php} (100%) diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server.php b/framework/Kolab_Server/lib/Horde/Kolab/Server.php index 5cbb1ebb3..a8091ad73 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server.php @@ -90,7 +90,7 @@ abstract class Horde_Kolab_Server */ static public function &factory($driver, $params = array()) { - $class = 'Horde_Kolab_Server_' . basename($driver); + $class = 'Horde_Kolab_Server_' . ucfirst(basename($driver)); if (class_exists($class)) { $db = new $class($params); return $db; diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/File.php similarity index 98% rename from framework/Kolab_Server/lib/Horde/Kolab/Server/file.php rename to framework/Kolab_Server/lib/Horde/Kolab/Server/File.php index 6d087ff14..6a32d5a7f 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/file.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/File.php @@ -26,7 +26,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Server */ -class Horde_Kolab_Server_file extends Horde_Kolab_Server_test +class Horde_Kolab_Server_File extends Horde_Kolab_Server_Test { /** diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php similarity index 99% rename from framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php rename to framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php index e261cbef5..becf7c383 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/ldap.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Ldap.php @@ -26,7 +26,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Server */ -class Horde_Kolab_Server_ldap extends Horde_Kolab_Server +class Horde_Kolab_Server_Ldap extends Horde_Kolab_Server { /** diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php similarity index 99% rename from framework/Kolab_Server/lib/Horde/Kolab/Server/test.php rename to framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php index daa908651..8f907b844 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/test.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Test.php @@ -25,7 +25,7 @@ * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Server */ -class Horde_Kolab_Server_test extends Horde_Kolab_Server_ldap +class Horde_Kolab_Server_Test extends Horde_Kolab_Server_Ldap { /** diff --git a/framework/Kolab_Server/package.xml b/framework/Kolab_Server/package.xml index aae96b098..cfb2ba4ca 100644 --- a/framework/Kolab_Server/package.xml +++ b/framework/Kolab_Server/package.xml @@ -49,11 +49,11 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - + + - + @@ -84,10 +84,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + - + @@ -132,10 +132,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - + + - + diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/LdapTest.php similarity index 100% rename from framework/Kolab_Server/test/Horde/Kolab/Server/ldapTest.php rename to framework/Kolab_Server/test/Horde/Kolab/Server/LdapTest.php diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php index 266af3392..6a532d235 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/ServerTest.php @@ -56,7 +56,7 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase $this->assertFail('No error!'); } catch (Horde_Kolab_Server_Exception $e) { $this->assertEquals($e->getMessage(), - 'Server type definition "Horde_Kolab_Server_dummy" missing.'); + 'Server type definition "Horde_Kolab_Server_Dummy" missing.'); } } @@ -110,7 +110,7 @@ class Horde_Kolab_Server_ServerTest extends PHPUnit_Framework_TestCase * @license http://www.fsf.org/copyleft/lgpl.html LGPL * @link http://pear.horde.org/index.php?package=Kolab_Server */ -class Horde_Kolab_Server_none extends Horde_Kolab_Server +class Horde_Kolab_Server_None extends Horde_Kolab_Server { /** * Stub for reading object data. diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php similarity index 100% rename from framework/Kolab_Server/test/Horde/Kolab/Server/testTest.php rename to framework/Kolab_Server/test/Horde/Kolab/Server/TestTest.php -- 2.11.0