From 22f239be6e58dc77938c58bcdb6ba0a1952774de Mon Sep 17 00:00:00 2001 From: Gunnar Wrobel Date: Tue, 14 Dec 2010 09:50:55 +0100 Subject: [PATCH] Remove group parameter. How did I get the idea to add the group handler here? Sometime I hate my logic. --- .../lib/Horde/Kolab/Storage/Driver.php | 7 ------- .../lib/Horde/Kolab/Storage/Driver/Base.php | 22 +--------------------- .../lib/Horde/Kolab/Storage/Driver/Cclient.php | 17 ----------------- .../lib/Horde/Kolab/Storage/Driver/Imap.php | 4 +--- .../lib/Horde/Kolab/Storage/Driver/Pear.php | 3 +-- .../test/Horde/Kolab/Storage/AclTest.php | 3 +-- .../Kolab/Storage/Unit/Driver/CclientTest.php | 7 ------- .../Horde/Kolab/Storage/Unit/Driver/ImapTest.php | 7 ------- .../Horde/Kolab/Storage/Unit/Driver/MockTest.php | 8 -------- .../Horde/Kolab/Storage/Unit/Driver/PearTest.php | 7 ------- 10 files changed, 4 insertions(+), 81 deletions(-) diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php index 8ae25f5de..585640d1a 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver.php @@ -222,11 +222,4 @@ interface Horde_Kolab_Storage_Driver * @return Horde_Kolab_Storage_Driver_Namespace The initialized namespace handler. */ public function getNamespace(); - - /** - * Get the group handler for this connection. - * - * @return Horde_Group The group handler. - */ - public function getGroupHandler(); } \ No newline at end of file diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php index 2213d097f..57f76416d 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php @@ -29,13 +29,6 @@ abstract class Horde_Kolab_Storage_Driver_Base implements Horde_Kolab_Storage_Driver { /** - * The group handler for this connection. - * - * @var Horde_Group - */ - private $_groups; - - /** * Additional connection parameters. * * @var array @@ -45,12 +38,10 @@ implements Horde_Kolab_Storage_Driver /** * Constructor. * - * @param Horde_Group $groups The groups handler. * @param array $params Connection parameters. */ - public function __construct(Horde_Group $groups, $params = array()) + public function __construct($params = array()) { - $this->_groups = $groups; $this->_params = $params; } @@ -81,15 +72,4 @@ implements Horde_Kolab_Storage_Driver } return new Horde_Kolab_Storage_Driver_Namespace_Fixed(); } - - /** - * Get the group handler for this connection. - * - * @return Horde_Group The group handler. - */ - public function getGroupHandler() - { - return $this->_groups; - } - } \ No newline at end of file diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php index f0087c004..97b6ab0d2 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php @@ -29,23 +29,6 @@ class Horde_Kolab_Storage_Driver_Cclient extends Horde_Kolab_Storage_Driver_Base { /** - * The group handler for this connection. - * - * @var Horde_Group - */ - private $_groups; - - /** - * Constructor. - * - * @param array $params Connection parameters. - */ - public function __construct(Horde_Group $groups) - { - $this->_groups = $groups; - } - - /** * Return the id of the user currently authenticated. * * @return string The id of the user that opened the IMAP connection. diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php index 538ef7bb1..57e9ba07a 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php @@ -39,16 +39,14 @@ extends Horde_Kolab_Storage_Driver_Base * Constructor. * * @param Horde_Imap_Client_Base $imap The IMAP connection handler. - * @param Horde_Group $groups The groups handler. * @param array $params Connection parameters. */ public function __construct( Horde_Imap_Client_Base $imap, - Horde_Group $groups, $params = array() ) { $this->_imap = $imap; - parent::__construct($groups, $params); + parent::__construct($params); } /** diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php index 7cfadce87..2c46d1bc0 100644 --- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php +++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php @@ -44,11 +44,10 @@ extends Horde_Kolab_Storage_Driver_Base */ public function __construct( Net_IMAP $imap, - Horde_Group $groups, $params = array() ) { $this->_imap = $imap; - parent::__construct($groups, $params); + parent::__construct($params); } /** diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php index 605f5ccd4..b18338243 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php @@ -36,8 +36,7 @@ class Horde_Kolab_Storage_AclTest extends PHPUnit_Framework_TestCase { $this->_storage = $this->getMock('Horde_Kolab_Storage', array(), array(), '', false, false); $this->_imap = $this->getMock('Horde_Imap_Client_Socket', array(), array(), '', false, false); - $this->groups = $this->getMock('Horde_Group', array(), array(), '', false, false); - $this->_connection = new Horde_Kolab_Storage_Driver_Imap($this->_imap, $this->groups); + $this->_connection = new Horde_Kolab_Storage_Driver_Imap($this->_imap); $this->_imap->expects($this->any()) ->method('getNamespaces') ->will( diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php index c1dd2da4a..b0f494968 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php @@ -35,15 +35,9 @@ require_once dirname(__FILE__) . '/../../Autoload.php'; class Horde_Kolab_Storage_Unit_Driver_CclientTest extends PHPUnit_Framework_TestCase { - public function setUp() - { - $this->group = new Horde_Group_Mock(); - } - public function testGetNamespaceReturnsNamespaceHandler() { $driver = new Horde_Kolab_Storage_Driver_Cclient( - $this->group, array() ); $this->assertType( @@ -55,7 +49,6 @@ extends PHPUnit_Framework_TestCase public function testGetNamespaceReturnsExpectedNamespaces() { $driver = new Horde_Kolab_Storage_Driver_Cclient( - $this->group, array() ); $namespaces = array(); diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php index 70feffa30..2174b13a5 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php @@ -35,16 +35,10 @@ require_once dirname(__FILE__) . '/../../Autoload.php'; class Horde_Kolab_Storage_Unit_Driver_ImapTest extends PHPUnit_Framework_TestCase { - public function setUp() - { - $this->group = new Horde_Group_Mock(); - } - public function testGetNamespaceReturnsNamespaceHandler() { $driver = new Horde_Kolab_Storage_Driver_Imap( $this->_getNamespaceMock(), - $this->group, array() ); $this->assertType( @@ -57,7 +51,6 @@ extends PHPUnit_Framework_TestCase { $driver = new Horde_Kolab_Storage_Driver_Imap( $this->_getNamespaceMock(), - $this->group, array() ); $namespaces = array(); diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/MockTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/MockTest.php index fc57f3c56..f1de0014f 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/MockTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/MockTest.php @@ -35,11 +35,6 @@ require_once dirname(__FILE__) . '/../../Autoload.php'; class Horde_Kolab_Storage_Unit_Driver_MockTest extends PHPUnit_Framework_TestCase { - public function setUp() - { - $this->group = new Horde_Group_Mock(); - } - public function testGetAnnotationReturnsAnnotationValue() { $this->markTestIncomplete(); @@ -47,7 +42,6 @@ extends PHPUnit_Framework_TestCase $data = array(); $data['INBOX/Contacts']['annotations']['/vendor/kolab/folder-type']['value.shared'] = 'contact.default'; $driver = new Horde_Kolab_Storage_Driver_Mock( - $this->group, $data ); $this->assertEquals( @@ -59,7 +53,6 @@ extends PHPUnit_Framework_TestCase public function testGetNamespaceReturnsNamespaceHandler() { $driver = new Horde_Kolab_Storage_Driver_Mock( - $this->group, array() ); $this->assertType( @@ -71,7 +64,6 @@ extends PHPUnit_Framework_TestCase public function testGetNamespaceReturnsExpectedNamespaces() { $driver = new Horde_Kolab_Storage_Driver_Mock( - $this->group, array() ); $namespaces = array(); diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php index fcb630c29..ba5bfa3a1 100644 --- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php +++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php @@ -35,16 +35,10 @@ require_once dirname(__FILE__) . '/../../Autoload.php'; class Horde_Kolab_Storage_Unit_Driver_PearTest extends PHPUnit_Framework_TestCase { - public function setUp() - { - $this->group = new Horde_Group_Mock(); - } - public function testGetNamespaceReturnsNamespaceHandler() { $driver = new Horde_Kolab_Storage_Driver_Pear( $this->_getNamespaceMock(), - $this->group, array() ); $this->assertType( @@ -57,7 +51,6 @@ extends PHPUnit_Framework_TestCase { $driver = new Horde_Kolab_Storage_Driver_Pear( $this->_getNamespaceMock(), - $this->group, array() ); $namespaces = array(); -- 2.11.0