From: Gunnar Wrobel Date: Tue, 16 Mar 2010 08:21:47 +0000 (+0100) Subject: Remove unnecessary interface definition. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=84d46b09bb33a689a8a3e279b6392c95e67840b2;p=horde.git Remove unnecessary interface definition. --- diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite.php new file mode 100644 index 000000000..5b286e285 --- /dev/null +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite.php @@ -0,0 +1,129 @@ + + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Kolab_Server + */ + +/** + * A simple composition of server functionality. + * + * Copyright 2008-2010 The Horde Project (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. + * + * @category Kolab + * @package Kolab_Server + * @author Gunnar Wrobel + * @license http://www.fsf.org/copyleft/lgpl.html LGPL + * @link http://pear.horde.org/index.php?package=Kolab_Server + */ +class Horde_Kolab_Server_Composite +{ + /** + * The server. + * + * @var Horde_Kolab_Server_Interface + */ + private $_server; + + /** + * The structure handler for this server. + * + * @var Horde_Kolab_Server_Structure_Interface + */ + private $_structure; + + /** + * The search handler for this server. + * + * @var Horde_Kolab_Server_Search_Interface + */ + private $_search; + + /** + * The object handler for this server. + * + * @var Horde_Kolab_Server_Objects_Interface + */ + private $_objects; + + /** + * The schema handler for this server. + * + * @var Horde_Kolab_Server_Schema_Interface + */ + private $_schema; + + /** + * Construct a new Horde_Kolab_Server object. + * + * @param array $params Parameter array. + */ + public function __construct( + Horde_Kolab_Server_Interface $server, + Horde_Kolab_Server_Objects_Interface $objects, + Horde_Kolab_Server_Structure_Interface $structure, + Horde_Kolab_Server_Search_Interface $search, + Horde_Kolab_Server_Schema_Interface $schema + ) { + $this->_server = $server; + $this->_objects = $objects; + $this->_structure = $structure; + $this->_search = $search; + $this->_schema = $schema; + + $structure->setComposite($this); + $search->setComposite($this); + $schema->setComposite($this); + $objects->setComposite($this); + } + + /** + * Retrieve an object attribute. + * + * @param string $key The name of the attribute. + * + * @return mixed The atribute value. + * + * @throws Horde_Kolab_Server_Exception If the attribute does not exist. + */ + public function __get($key) + { + $public = array('server', 'objects', 'structure', 'search', 'schema'); + if (in_array($key, $public)) { + $priv_key = '_' . $key; + return $this->$priv_key; + } + throw new Horde_Kolab_Server_Exception( + sprintf('Attribute %s not supported!', $key) + ); + } + + /** + * Connect to the server. Use this method if the user name you can provide + * does not match a GUID. In this case it will be required to map this user + * name first. + * + * @param string $user The user name. + * @param string $pass The password. + * + * @return NULL. + * + * @throws Horde_Kolab_Server_Exception If the connection failed. + */ + public function connect($user = null, $pass = null) + { + /** Bind anonymously first. */ + $this->server->connectGuid(); + $guid = $this->search->searchGuidForUidOrMail($user); + $this->server->connectGuid($guid, $pass); + } +} diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Base.php deleted file mode 100644 index 5043287e3..000000000 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Base.php +++ /dev/null @@ -1,130 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server - */ - -/** - * A simple composition of server functionality. - * - * Copyright 2008-2010 The Horde Project (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. - * - * @category Kolab - * @package Kolab_Server - * @author Gunnar Wrobel - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server - */ -class Horde_Kolab_Server_Composite_Base -implements Horde_Kolab_Server_Composite_Interface -{ - /** - * The server. - * - * @var Horde_Kolab_Server_Interface - */ - private $_server; - - /** - * The structure handler for this server. - * - * @var Horde_Kolab_Server_Structure_Interface - */ - private $_structure; - - /** - * The search handler for this server. - * - * @var Horde_Kolab_Server_Search_Interface - */ - private $_search; - - /** - * The object handler for this server. - * - * @var Horde_Kolab_Server_Objects_Interface - */ - private $_objects; - - /** - * The schema handler for this server. - * - * @var Horde_Kolab_Server_Schema_Interface - */ - private $_schema; - - /** - * Construct a new Horde_Kolab_Server object. - * - * @param array $params Parameter array. - */ - public function __construct( - Horde_Kolab_Server_Interface $server, - Horde_Kolab_Server_Objects_Interface $objects, - Horde_Kolab_Server_Structure_Interface $structure, - Horde_Kolab_Server_Search_Interface $search, - Horde_Kolab_Server_Schema_Interface $schema - ) { - $this->_server = $server; - $this->_objects = $objects; - $this->_structure = $structure; - $this->_search = $search; - $this->_schema = $schema; - - $structure->setComposite($this); - $search->setComposite($this); - $schema->setComposite($this); - $objects->setComposite($this); - } - - /** - * Retrieve an object attribute. - * - * @param string $key The name of the attribute. - * - * @return mixed The atribute value. - * - * @throws Horde_Kolab_Server_Exception If the attribute does not exist. - */ - public function __get($key) - { - $public = array('server', 'objects', 'structure', 'search', 'schema'); - if (in_array($key, $public)) { - $priv_key = '_' . $key; - return $this->$priv_key; - } - throw new Horde_Kolab_Server_Exception( - sprintf('Attribute %s not supported!', $key) - ); - } - - /** - * Connect to the server. Use this method if the user name you can provide - * does not match a GUID. In this case it will be required to map this user - * name first. - * - * @param string $user The user name. - * @param string $pass The password. - * - * @return NULL. - * - * @throws Horde_Kolab_Server_Exception If the connection failed. - */ - public function connect($user = null, $pass = null) - { - /** Bind anonymously first. */ - $this->server->connectGuid(); - $guid = $this->search->searchGuidForUidOrMail($user); - $this->server->connectGuid($guid, $pass); - } -} diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Interface.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Interface.php deleted file mode 100644 index d7e1bba11..000000000 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Composite/Interface.php +++ /dev/null @@ -1,43 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server - */ - -/** - * Marks composite server instances. - * - * Copyright 2008-2010 The Horde Project (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. - * - * @category Kolab - * @package Kolab_Server - * @author Gunnar Wrobel - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Server - */ -interface Horde_Kolab_Server_Composite_Interface -{ - /** - * Connect to the server. Use this method if the user name you can provide - * does not match a DN. In this case it will be required to map this user - * name first. - * - * @param string $user The user name. - * @param string $pass The password. - * - * @return NULL. - * - * @throws Horde_Kolab_Server_Exception If the connection failed. - */ - public function connect($user = null, $pass = null); -} diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Base.php index 74969e4f6..2d3c685e2 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Base.php @@ -129,7 +129,7 @@ implements Horde_Kolab_Server_Factory_Interface */ public function getComposite() { - $composite = new Horde_Kolab_Server_Composite_Base( + $composite = new Horde_Kolab_Server_Composite( $this->getServer(), $this->getObjects(), $this->getStructure(), diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Injector.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Injector.php index e8ce9fd65..55a6bffc3 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Injector.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Factory/Injector.php @@ -114,7 +114,6 @@ implements Horde_Kolab_Server_Factory_Interface $this->_setupStructure(); $this->_setupConnection(); $this->_setupServer(); - $this->_setupComposite(); } /** @@ -204,19 +203,6 @@ implements Horde_Kolab_Server_Factory_Interface } /** - * Setup the machinery to create a Horde_Kolab_Server_Composite server. - * - * @return NULL - */ - private function _setupComposite() - { - $this->_injector->bindImplementation( - 'Horde_Kolab_Server_Composite_Interface', - 'Horde_Kolab_Server_Composite_Base' - ); - } - - /** * Return the conn server connection that should be used. * * @return Horde_Kolab_Server The Horde_Kolab_Server connection. @@ -338,7 +324,7 @@ implements Horde_Kolab_Server_Factory_Interface public function getComposite() { return $this->_injector->getInstance( - 'Horde_Kolab_Server_Composite_Interface' + 'Horde_Kolab_Server_Composite' ); } } \ No newline at end of file diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Objectclass.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Objectclass.php index fbd3f14be..ec6fc69ff 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Objectclass.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Attribute/Objectclass.php @@ -37,7 +37,7 @@ extends Horde_Kolab_Server_Object_Attribute_Decorator */ public function __construct( Horde_Kolab_Server_Object_Interface $object, - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->_attribute = new Horde_Kolab_Server_Object_Attribute_Required( new Horde_Kolab_Server_Object_Attribute_Locked( diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php index 6b7c385a7..75bcebe8c 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Base.php @@ -51,7 +51,7 @@ implements Horde_Kolab_Server_Object_Interface * @param string $guid GUID of the object. */ public function __construct( - Horde_Kolab_Server_Composite_Interface $composite, + Horde_Kolab_Server_Composite $composite, $guid = null ) { $this->_composite = $composite; diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Factory.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Factory.php index 4d8dd892b..277b8c035 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Factory.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Factory.php @@ -42,7 +42,7 @@ class Horde_Kolab_Server_Object_Factory */ static public function factory( $type, $uid, - Horde_Kolab_Server_Composite_Interface $storage, + Horde_Kolab_Server_Composite $storage, $data = null ) { if (class_exists($type)) { diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php index ef57eab0f..3eb882eb9 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Base.php @@ -45,7 +45,7 @@ implements Horde_Kolab_Server_Objects_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->_composite = $composite; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Interface.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Interface.php index 0d6e2a376..6176f24ca 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Interface.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Objects/Interface.php @@ -34,7 +34,7 @@ interface Horde_Kolab_Server_Objects_Interface * server handler. */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ); /** diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Base.php index 7c5ee8da3..3a83700c5 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Base.php @@ -44,7 +44,7 @@ implements Horde_Kolab_Server_Schema_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->_composite = $composite; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Decorator/Cache.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Decorator/Cache.php index 33e4b5500..bf5782cc0 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Decorator/Cache.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Decorator/Cache.php @@ -54,7 +54,7 @@ implements Horde_Kolab_Server_Schema_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->composite = $composite; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Interface.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Interface.php index c66c2f890..4a3526e69 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Interface.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Schema/Interface.php @@ -34,7 +34,7 @@ interface Horde_Kolab_Server_Schema_Interface * server handler. */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ); /** diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Base.php index f969c681e..a329788f0 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Base.php @@ -53,7 +53,7 @@ implements Horde_Kolab_Server_Search_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->_composite = $composite; $this->_searches = $this->_getSearchOperations(); diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Interface.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Interface.php index de986519d..5bcd26d76 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Interface.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Search/Interface.php @@ -34,7 +34,7 @@ interface Horde_Kolab_Server_Search_Interface * server handler. */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ); /** diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Base.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Base.php index d894080c8..e4cf30f92 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Base.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Base.php @@ -89,7 +89,7 @@ implements Horde_Kolab_Server_Structure_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ) { $this->_composite = $composite; } diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Interface.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Interface.php index d82f1670c..ec674c769 100644 --- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Interface.php +++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Structure/Interface.php @@ -69,7 +69,7 @@ interface Horde_Kolab_Server_Structure_Interface * @return NULL */ public function setComposite( - Horde_Kolab_Server_Composite_Interface $composite + Horde_Kolab_Server_Composite $composite ); /** diff --git a/framework/Kolab_Server/package.xml b/framework/Kolab_Server/package.xml index 0b87c8d87..ca01edcd6 100644 --- a/framework/Kolab_Server/package.xml +++ b/framework/Kolab_Server/package.xml @@ -75,10 +75,7 @@ - - - - + @@ -419,8 +416,7 @@ - - + diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConfigurationTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConfigurationTest.php index e4c3bdfcc..67792713b 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConfigurationTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConfigurationTest.php @@ -126,7 +126,7 @@ extends Horde_Kolab_Server_LdapTestCase array('basedn' => '') ); $this->assertType( - 'Horde_Kolab_Server_Composite_Interface', + 'Horde_Kolab_Server_Composite', $factory->getComposite() ); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php index 10d4b5b11..092b83418 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/ConstructorTest.php @@ -127,7 +127,7 @@ extends Horde_Kolab_Server_LdapTestCase $this->search, $this->schema, array('basedn' => 'test') ); $this->assertType( - 'Horde_Kolab_Server_Composite_Interface', + 'Horde_Kolab_Server_Composite', $factory->getComposite() ); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/InjectorTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/InjectorTest.php index b32bb9258..41cb69e97 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/InjectorTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/InjectorTest.php @@ -153,7 +153,7 @@ extends Horde_Kolab_Server_LdapTestCase $this->skipIfNoLdap(); $factory = $this->_getFactory(array('basedn' => 'test')); $this->assertType( - 'Horde_Kolab_Server_Composite_Interface', + 'Horde_Kolab_Server_Composite', $factory->getComposite() ); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/KolabTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/KolabTest.php index e9880bda0..5b4bf0a6c 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/KolabTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Factory/KolabTest.php @@ -180,7 +180,7 @@ extends Horde_Kolab_Server_LdapTestCase $this->conn_factory, array('basedn' => 'test') ); $this->assertType( - 'Horde_Kolab_Server_Composite_Interface', + 'Horde_Kolab_Server_Composite', $factory->getComposite() ); } diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php index 83cb88819..8ce7ad287 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/KolabTest.php @@ -35,7 +35,7 @@ class Horde_Kolab_Server_Class_Server_Structure_KolabTest extends PHPUnit_Framew public function setUp() { $server = $this->getMock('Horde_Kolab_Server_Interface'); - $this->composite = new Horde_Kolab_Server_Composite_Base( + $this->composite = new Horde_Kolab_Server_Composite( $server, $this->getMock('Horde_Kolab_Server_Objects_Interface'), new Horde_Kolab_Server_Structure_Kolab(), diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php index bde26fd5b..5778ea439 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/Class/Server/Structure/LdapTest.php @@ -35,7 +35,7 @@ class Horde_Kolab_Server_Class_Server_Structure_LdapTest extends Horde_Kolab_Ser public function setUp() { $server = $this->getMock('Horde_Kolab_Server_Interface'); - $this->composite = new Horde_Kolab_Server_Composite_Base( + $this->composite = new Horde_Kolab_Server_Composite( $server, $this->getMock('Horde_Kolab_Server_Objects_Interface'), new Horde_Kolab_Server_Structure_Ldap(), diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php b/framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php index 0ab0c493c..d0da67699 100644 --- a/framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php +++ b/framework/Kolab_Server/test/Horde/Kolab/Server/TestCase.php @@ -42,13 +42,13 @@ class Horde_Kolab_Server_TestCase extends PHPUnit_Framework_TestCase protected function getComposite() { return $this->getMock( - 'Horde_Kolab_Server_Composite_Interface' + 'Horde_Kolab_Server_Composite', array(), array(), '', false, false ); } protected function getMockedComposite() { - return new Horde_Kolab_Server_Composite_Base( + return new Horde_Kolab_Server_Composite( $this->getMock('Horde_Kolab_Server_Interface'), $this->getMock('Horde_Kolab_Server_Objects_Interface'), $this->getMock('Horde_Kolab_Server_Structure_Interface'),