Fix Horde_Group usage.

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 08ee395..2213d09 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Base.php
@@ -45,10 +45,10 @@ implements Horde_Kolab_Storage_Driver
     /**
      * Constructor.
      *
-     * @param Group $groups The groups handler.
-     * @param array $params Connection parameters.
+     * @param Horde_Group $groups  The groups handler.
+     * @param array $params        Connection parameters.
      */
-    public function __construct(Group $groups, $params = array())
+    public function __construct(Horde_Group $groups, $params = array())
     {
         $this->_groups = $groups;
         $this->_params = $params;

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 e4a3419..f0087c0 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Cclient.php
@@ -40,9 +40,8 @@ extends Horde_Kolab_Storage_Driver_Base
      *
      * @param array  $params Connection parameters.
      */
-    public function __construct(
-        Group $groups
-    ) {
+    public function __construct(Horde_Group $groups)
+    {
         $this->_groups = $groups;
     }
 

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 1dc0e8c..538ef7b 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Imap.php
@@ -39,12 +39,12 @@ extends Horde_Kolab_Storage_Driver_Base
      * Constructor.
      *
      * @param Horde_Imap_Client_Base $imap   The IMAP connection handler.
-     * @param Group                  $groups The groups handler.
+     * @param Horde_Group            $groups The groups handler.
      * @param array                  $params Connection parameters.
      */
     public function __construct(
         Horde_Imap_Client_Base $imap,
-        Group $groups,
+        Horde_Group $groups,
         $params = array()
     ) {
         $this->_imap = $imap;

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 168132d..7cfadce 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Driver/Pear.php
@@ -38,13 +38,13 @@ extends Horde_Kolab_Storage_Driver_Base
     /**
      * Constructor.
      *
-     * @param Net_IMAP $imap   The IMAP connection handler.
-     * @param Group    $groups The groups handler.
-     * @param array    $params Connection parameters.
+     * @param Net_IMAP $imap      The IMAP connection handler.
+     * @param Horde_Group $groups The groups handler.
+     * @param array $params        Connection parameters.
      */
     public function __construct(
         Net_IMAP $imap,
-        Group $groups,
+        Horde_Group $groups,
         $params = array()
     ) {
         $this->_imap = $imap;

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission.php
index c0d76b1..005b886 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission.php
@@ -61,7 +61,7 @@ extends Horde_Perms_Permission
     public function __construct(
         $name,
         Horde_Kolab_Storage_Folder $folder,
-        Group $groups
+        Horde_Group $groups
     ) {
         parent::__construct(__CLASS__ . '::' . $name);
         $this->_folder = $folder;

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Acl/Group.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Acl/Group.php
index e13c90f..f87d4d7 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Acl/Group.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Acl/Group.php
@@ -45,11 +45,11 @@ extends Horde_Kolab_Storage_Folder_Permission_Acl
     /**
      * Constructor.
      *
-     * @param string $acl    The folder ACL element as provided by the driver.
-     * @param string $id     The group id.
-     * @param Group  $groups The horde group handler.
+     * @param string $acl          The folder ACL element as provided by the driver.
+     * @param string $id           The group id.
+     * @param Horde_Group $groups  The horde group handler.
      */
-    public function __construct($acl, $id, Group $groups)
+    public function __construct($acl, $id, Horde_Group $groups)
     {
         $this->_id     = $id;
         $this->_groups = $groups;

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/AclIterator.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/AclIterator.php
index 8f1c778..38ac8fd 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/AclIterator.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/AclIterator.php
@@ -42,7 +42,7 @@ implements Iterator
      * @param Horde_Group $groups  The group handler.
      * @param string      $creator The ID of the folder creator.
      */
-    public function __construct(array $acl, Group $groups, $creator)
+    public function __construct(array $acl, Horde_Group $groups, $creator)
     {
         foreach ($acl as $user => $rights) {
             if ($user == $creator) {

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Element/Group.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Element/Group.php
index 2bd5030..c9fa6d9 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Element/Group.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/Element/Group.php
@@ -45,11 +45,11 @@ extends Horde_Kolab_Storage_Folder_Permission_Element
     /**
      * Constructor.
      *
-     * @param int    $permission The folder permission as provided by Horde.
-     * @param string $id         The group id.
-     * @param Group  $groups     The horde group handler.
+     * @param integer $permission  The folder permission as provided by Horde.
+     * @param string $id           The group id.
+     * @param Horde_Group $groups  The horde group handler.
      */
-    public function __construct($permission, $id, Group $groups)
+    public function __construct($permission, $id, Horde_Group $groups)
     {
         $this->_horde_id = $id;
         $this->_kolab_id = 'group:' . $groups->getGroupName($id);

diff --git a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/ElementIterator.php b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/ElementIterator.php
index 807cdff..4b31a5f 100644 (file)
--- a/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/ElementIterator.php
+++ b/framework/Kolab_Storage/lib/Horde/Kolab/Storage/Folder/Permission/ElementIterator.php
@@ -42,7 +42,7 @@ implements Iterator
      * @param Horde_Group $groups      The group handler.
      * @param string      $creator     The ID of the folder creator.
      */
-    public function __construct(array $permissions, Group $groups, $creator)
+    public function __construct(array $permissions, Horde_Group $groups, $creator)
     {
         foreach ($permissions as $user => $user_perms) {
             if ($user == 'default') {

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
index f115c1f..605f5cc 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/AclTest.php
@@ -36,7 +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('Group', 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->_imap->expects($this->any())
             ->method('getNamespaces')

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
index 8696378..6dbe68c 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/CclientTest.php
@@ -37,10 +37,7 @@ extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        require_once 'Horde/Group.php';
-        require_once 'Horde/Group/mock.php';
-
-        $this->group = new Group_mock();
+        $this->group = new Horde_Group_Mock();
     }
 
     public function testGetNamespaceReturnsNamespaceHandler()

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
index 7546434..9fda3b2 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/ImapTest.php
@@ -37,10 +37,7 @@ extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        require_once 'Horde/Group.php';
-        require_once 'Horde/Group/mock.php';
-
-        $this->group = new Group_mock();
+        $this->group = new Horde_Group_Mock();
     }
 
     public function testGetNamespaceReturnsNamespaceHandler()

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
index 78a645f..77e41cb 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/MockTest.php
@@ -37,10 +37,7 @@ extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        require_once 'Horde/Group.php';
-        require_once 'Horde/Group/mock.php';
-
-        $this->group = new Group_mock();
+        $this->group = new Horde_Group_Mock();
     }
 
     public function testGetAnnotationReturnsAnnotationValue()

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
index 5607858..dbc334d 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/Class/Driver/PearTest.php
@@ -37,10 +37,7 @@ extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        require_once 'Horde/Group.php';
-        require_once 'Horde/Group/mock.php';
-
-        $this->group = new Group_mock();
+        $this->group = new Horde_Group_Mock();
     }
 
     public function testGetNamespaceReturnsNamespaceHandler()

diff --git a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
index 8add6ed..a4b96f8 100644 (file)
--- a/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
+++ b/framework/Kolab_Storage/test/Horde/Kolab/Storage/PermissionTest.php
@@ -35,7 +35,7 @@ class Horde_Kolab_Storage_PermissionTest extends PHPUnit_Framework_TestCase
     public function setUp()
     {
         $this->folder = $this->getMock('Horde_Kolab_Storage_Folder_Base', array(), array(), '', false, false);
-        $this->groups = $this->getMock('Group', array(), array(), '', false, false);
+        $this->groups = $this->getMock('Horde_Group', array(), array(), '', false, false);
         $this->perms = new Horde_Perms();
     }