The branch "master" has been updated. The following is a summary of the commits.
from: d9471ee1254f2fed1df23b798882de7fa5a69d85 353ed27 Drop members table too. 04493e2 Add test suite skeleton. fdb61a0 Complete test suite. 2d868d7 getLdap() -> create() a785c32 Add MySQL test. aa96414 Abstract base class. 589c226 Start implementing the SQL driver. 9b582e6 Fix variable name. 252ee74 Fix migrations. 78624c2 Type hint. 9f96681 Implement remaining methods. c851560 phpdoc dfcbe44 No longer needed. 6af2647 v2 servers don't necessarily have a root DSE, catch that. df90efb Referrals must be turned off when getting the root DSE. ff9be42 Consider empty DN as anonymous binding too. 5658a85 Catch invalid RDNs. 11fbaf7 Set skip reason. 2b65598 Enable listAll() test. 1368519 Use non-existant ID that works with LDAP. c03e0ca Add readOnly(). 7c4ad71 Add renameSupported(). 53d8fa0 Wrapping 8a6bce8 Clean up after tests. a91ed97 Fix @depends. 02f65ef Refactor LDAP driver. 2242ab6 Skip tear down if not configured. 78bb7ec Renaming is not supported. 0e27344 Move test into correct place. We don't need a looger. 235bf52 Add a failing test for SQLite driver breaking table when changing the primary key column. e4c5040 There is no 'id' option, there is only a 'primaryKey' option that defaults to 'id'. Fixes first bug. b647b3b Style f935a09 Horde_Db_Adapter_Base_TableDefinition::primaryKey() expects columns, not the complete index object. Fixed the final bug. 59b6aab One more failing test. Adding autoincrementing still not working with SQLite. 71d2ce9 Drop parents column. 6d4b123 Add option to unset the primary key of a TableDefinition and use that to delete existing primary keys when changing a column's type to the virtual type "primaryKey" in SQLite. 5ca38ac Changing arbitrary columns to autoincrementing simply doesn't work, because this is not supported by all databases. Use the virtual column type "primaryKey" instead, which does exactly what we want. 2a3ce70 Test non-existants IDs of the correct type. d9f3faa Add pgsql test. e27188f Indention. 4247956 Allow changing the primary key. 84efea7 Tweak schema table name. 01627df Hopefully this is all that should be left to implement the Kolab driver. d430fb6 Read-only is the default. 9553d55 Implement Mock driver. fd5b861 Remove the DataTree driver. a33ab31 Remove group hooks. If people want custom logic, they can create a custom driver. 928db97 If we default to read-only drivers, we can as well default to throw exceptions from write operations. 9dc584a Don't drop parents yet, might need that later for conversion. 32f832d Updated c107101 Generalize class building. c47b1ff Reduce dependencies. b19dc3b Set group_parents for now, to avoid constraint violations. 866fbd9 Add getData(). 57654aa Throws a NotFound exception too. a95c55b Add setData(). f7f1faa Fix class building. 46752e6 Start converting consumer code to new group API. ba3e110 Use new getSorucesConfig api method. f5f30e6 First attempt at moving turba specific knowledge out of the Contactlists group driver. a45e4bb Tweaks and fixes to the contact group API. fabfa11 Provide default implementation of setData(). 92619b9 Implement Contactlists driver. 2150566 Add MySQL tests without PDO. 23ba101 Use assertInternalType(). 665fc28 Horde_Group -> Horde_Group_Base d1532a3 Allow to pass the config file path to Horde_Test_Case::getConfig(). 8403924 Add configuration for unit tests. 15db67f Allow restricting comments to any group. 589f854 Convert the remaining code to the new group API. 76be4cb Merge branch 'H4-Group' ----------------------------------------------------------------------- commit 353ed279c15aaa9906c1d855e463a38be2bcf5ba Author: Jan Schneider <[email protected]> Date: Tue Mar 1 17:58:06 2011 +0100 Drop members table too. .../Group/migration/Horde_Group/1_horde_group_base_tables.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/353ed279c15aaa9906c1d855e463a38be2bcf5ba ----------------------------------------------------------------------- commit 04493e2a51332c8e6c1c9837710a69a0d3a75d70 Author: Jan Schneider <[email protected]> Date: Tue Mar 1 18:05:07 2011 +0100 Add test suite skeleton. framework/Group/test/Horde/Group/AllTests.php | 34 +++++++++++ framework/Group/test/Horde/Group/Autoload.php | 20 ++++++ framework/Group/test/Horde/Group/Base.php | 18 ++++++ framework/Group/test/Horde/Group/Sql/Base.php | 46 +++++++++++++++ framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php | 27 +++++++++ 5 files changed, 145 insertions(+), 0 deletions(-) create mode 100644 framework/Group/test/Horde/Group/AllTests.php create mode 100644 framework/Group/test/Horde/Group/Autoload.php create mode 100644 framework/Group/test/Horde/Group/Base.php create mode 100644 framework/Group/test/Horde/Group/Sql/Base.php create mode 100644 framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php http://git.horde.org/horde-git/-/commit/04493e2a51332c8e6c1c9837710a69a0d3a75d70 ----------------------------------------------------------------------- commit fdb61a086545089cc4453cbb0efca643f3259804 Author: Jan Schneider <[email protected]> Date: Tue Mar 1 18:58:41 2011 +0100 Complete test suite. framework/Group/test/Horde/Group/Base.php | 118 +++++++++++++++++++++++++ framework/Group/test/Horde/Group/Sql/Base.php | 77 ++++++++++++++++ 2 files changed, 195 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/fdb61a086545089cc4453cbb0efca643f3259804 ----------------------------------------------------------------------- commit 2d868d784ff97f0fffc78545da2e909e74915c2e Author: Jan Schneider <[email protected]> Date: Tue Mar 1 22:51:04 2011 +0100 getLdap() -> create() framework/Core/lib/Horde/Core/Factory/Auth.php | 17 +++++++++---- framework/Core/lib/Horde/Core/Factory/Ldap.php | 2 +- framework/Core/lib/Horde/Core/Factory/Prefs.php | 7 ++++- framework/Core/lib/Horde/Core/Factory/SessionHandler.php | 4 ++- 4 files changed, 21 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/2d868d784ff97f0fffc78545da2e909e74915c2e ----------------------------------------------------------------------- commit a785c32778e755e0738e3006e4d8a89c35d270ae Author: Jan Schneider <[email protected]> Date: Wed Mar 2 09:52:51 2011 +0100 Add MySQL test. framework/Group/test/Horde/Group/Sql/Base.php | 4 +- framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php | 29 +++++++++++++++ framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php http://git.horde.org/horde-git/-/commit/a785c32778e755e0738e3006e4d8a89c35d270ae ----------------------------------------------------------------------- commit aa9641490bb49b717c64bba0ceef0bfa3ec26a11 Author: Jan Schneider <[email protected]> Date: Wed Mar 2 09:54:02 2011 +0100 Abstract base class. framework/Group/lib/Horde/Group/Base.php | 112 ++++++++++++++++++++++++++++++ framework/Group/package.xml | 32 ++++++++- 2 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 framework/Group/lib/Horde/Group/Base.php http://git.horde.org/horde-git/-/commit/aa9641490bb49b717c64bba0ceef0bfa3ec26a11 ----------------------------------------------------------------------- commit 589c226d941db0f86148a59f4c38942ef7524728 Author: Jan Schneider <[email protected]> Date: Wed Mar 2 09:58:06 2011 +0100 Start implementing the SQL driver. framework/Core/lib/Horde/Core/Factory/Group.php | 13 +- framework/Group/lib/Horde/Group/Sql.php | 1321 ++++++++++++----------- framework/Group/test/Horde/Group/Base.php | 2 - 3 files changed, 725 insertions(+), 611 deletions(-) http://git.horde.org/horde-git/-/commit/589c226d941db0f86148a59f4c38942ef7524728 ----------------------------------------------------------------------- commit 9b582e68b205a9cd498422eacbab8c8b3cb55e5b Author: Jan Schneider <[email protected]> Date: Wed Mar 2 11:34:23 2011 +0100 Fix variable name. framework/Group/test/Horde/Group/Base.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/9b582e68b205a9cd498422eacbab8c8b3cb55e5b ----------------------------------------------------------------------- commit 252ee74d038a6babf267110e41a5c98db3dde6fa Author: Jan Schneider <[email protected]> Date: Wed Mar 2 11:34:42 2011 +0100 Fix migrations. framework/Group/test/Horde/Group/Sql/Base.php | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/252ee74d038a6babf267110e41a5c98db3dde6fa ----------------------------------------------------------------------- commit 78624c2b2841769d6474ab4204812e8e68a6e7a9 Author: Jan Schneider <[email protected]> Date: Wed Mar 2 11:44:55 2011 +0100 Type hint. framework/Db/lib/Horde/Db/Adapter/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/78624c2b2841769d6474ab4204812e8e68a6e7a9 ----------------------------------------------------------------------- commit 9f966814e4b00ff2e0658ce74d052ab1ac752de3 Author: Jan Schneider <[email protected]> Date: Wed Mar 2 12:08:46 2011 +0100 Implement remaining methods. framework/Group/lib/Horde/Group/Sql.php | 73 ++++++++++++++++++++++++++++- framework/Group/test/Horde/Group/Base.php | 22 +-------- 2 files changed, 73 insertions(+), 22 deletions(-) http://git.horde.org/horde-git/-/commit/9f966814e4b00ff2e0658ce74d052ab1ac752de3 ----------------------------------------------------------------------- commit c851560a57b4630a70355693176631048d14042e Author: Jan Schneider <[email protected]> Date: Wed Mar 2 19:15:20 2011 +0100 phpdoc framework/Group/lib/Horde/Group/Base.php | 14 ++++++++++++++ framework/Group/lib/Horde/Group/Sql.php | 19 ++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/c851560a57b4630a70355693176631048d14042e ----------------------------------------------------------------------- commit dfcbe44ffd3515dbf8e7e8672a4574154fd1fdcb Author: Jan Schneider <[email protected]> Date: Wed Mar 2 19:15:53 2011 +0100 No longer needed. framework/Group/lib/Horde/Group/Sql.php | 660 ------------------------- framework/Group/lib/Horde/Group/SqlObject.php | 133 ----- 2 files changed, 0 insertions(+), 793 deletions(-) delete mode 100644 framework/Group/lib/Horde/Group/SqlObject.php http://git.horde.org/horde-git/-/commit/dfcbe44ffd3515dbf8e7e8672a4574154fd1fdcb ----------------------------------------------------------------------- commit 6af264717e798afbbcdd4cab9f76731996c1f6b8 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 11:06:27 2011 +0100 v2 servers don't necessarily have a root DSE, catch that. framework/Ldap/lib/Horde/Ldap.php | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/6af264717e798afbbcdd4cab9f76731996c1f6b8 ----------------------------------------------------------------------- commit df90efb859b141e70fb8b96ed686b812019e2894 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 11:07:22 2011 +0100 Referrals must be turned off when getting the root DSE. framework/Ldap/lib/Horde/Ldap/RootDse.php | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/df90efb859b141e70fb8b96ed686b812019e2894 ----------------------------------------------------------------------- commit ff9be423bbc5b74ffa9a4d47daf4643a0b841ffe Author: Jan Schneider <[email protected]> Date: Thu Mar 3 15:54:32 2011 +0100 Consider empty DN as anonymous binding too. framework/Ldap/lib/Horde/Ldap.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/ff9be423bbc5b74ffa9a4d47daf4643a0b841ffe ----------------------------------------------------------------------- commit 5658a85198f9f3b1ae42f43efcc75d94bdcf21e6 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 19:01:37 2011 +0100 Catch invalid RDNs. framework/Ldap/lib/Horde/Ldap/Util.php | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/5658a85198f9f3b1ae42f43efcc75d94bdcf21e6 ----------------------------------------------------------------------- commit 11fbaf7b502309233f6c37e0037c9023b87d0d9a Author: Jan Schneider <[email protected]> Date: Thu Mar 3 19:02:54 2011 +0100 Set skip reason. framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/11fbaf7b502309233f6c37e0037c9023b87d0d9a ----------------------------------------------------------------------- commit 2b655986bc0c3a62d36b71dbf2058d5de0f1dd55 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 19:03:46 2011 +0100 Enable listAll() test. framework/Group/test/Horde/Group/Base.php | 2 +- framework/Group/test/Horde/Group/Sql/Base.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/2b655986bc0c3a62d36b71dbf2058d5de0f1dd55 ----------------------------------------------------------------------- commit 13685196cf2526c72401b743e6c9829c23e65502 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 19:04:11 2011 +0100 Use non-existant ID that works with LDAP. framework/Group/test/Horde/Group/Base.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/13685196cf2526c72401b743e6c9829c23e65502 ----------------------------------------------------------------------- commit c03e0ca484469db2a9613b75841d5522c891027a Author: Jan Schneider <[email protected]> Date: Thu Mar 3 19:05:55 2011 +0100 Add readOnly(). framework/Group/lib/Horde/Group/Base.php | 10 ++++++++++ framework/Group/lib/Horde/Group/Sql.php | 10 ++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/c03e0ca484469db2a9613b75841d5522c891027a ----------------------------------------------------------------------- commit 7c4ad71d79548df3d92426285839962ef3e2565a Author: Jan Schneider <[email protected]> Date: Thu Mar 3 21:32:33 2011 +0100 Add renameSupported(). framework/Group/lib/Horde/Group/Base.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/7c4ad71d79548df3d92426285839962ef3e2565a ----------------------------------------------------------------------- commit 53d8fa06ab25ceebd39ea387d14f9bbee5b5448c Author: Jan Schneider <[email protected]> Date: Thu Mar 3 21:40:24 2011 +0100 Wrapping framework/Ldap/lib/Horde/Ldap/Search.php | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/53d8fa06ab25ceebd39ea387d14f9bbee5b5448c ----------------------------------------------------------------------- commit 8a6bce8bf1f654eeb6cf985c3e46741b272ddd45 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 21:42:00 2011 +0100 Clean up after tests. framework/Group/test/Horde/Group/Base.php | 6 ++++++ framework/Group/test/Horde/Group/Sql/Base.php | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/8a6bce8bf1f654eeb6cf985c3e46741b272ddd45 ----------------------------------------------------------------------- commit a91ed974fc78272139f7d6f998fbab4dc82dd138 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 21:42:16 2011 +0100 Fix @depends. framework/Group/test/Horde/Group/Sql/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/a91ed974fc78272139f7d6f998fbab4dc82dd138 ----------------------------------------------------------------------- commit 02f65ef11062e0aa31ae30b51e01e39dc61386a8 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 21:49:50 2011 +0100 Refactor LDAP driver. framework/Core/lib/Horde/Core/Factory/Group.php | 42 +- framework/Core/lib/Horde/Core/Group/Ldap.php | 35 ++ framework/Group/lib/Horde/Group/Ldap.php | 577 +++++++++-------------- framework/Group/lib/Horde/Group/LdapObject.php | 126 ----- framework/Group/test/Horde/Group/LdapTest.php | 131 +++++ 5 files changed, 406 insertions(+), 505 deletions(-) create mode 100644 framework/Core/lib/Horde/Core/Group/Ldap.php delete mode 100644 framework/Group/lib/Horde/Group/LdapObject.php create mode 100644 framework/Group/test/Horde/Group/LdapTest.php http://git.horde.org/horde-git/-/commit/02f65ef11062e0aa31ae30b51e01e39dc61386a8 ----------------------------------------------------------------------- commit 2242ab6507700482601fd2eda5ce53c7f34dfbfd Author: Jan Schneider <[email protected]> Date: Thu Mar 3 22:04:09 2011 +0100 Skip tear down if not configured. framework/Group/test/Horde/Group/LdapTest.php | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) http://git.horde.org/horde-git/-/commit/2242ab6507700482601fd2eda5ce53c7f34dfbfd ----------------------------------------------------------------------- commit 78bb7ecc52fd8cd45a0d6558b86fdac9aacfd601 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 22:08:35 2011 +0100 Renaming is not supported. framework/Group/lib/Horde/Group/Ldap.php | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) http://git.horde.org/horde-git/-/commit/78bb7ecc52fd8cd45a0d6558b86fdac9aacfd601 ----------------------------------------------------------------------- commit 0e273447c713524400bd5be8993775f636db9656 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 22:27:31 2011 +0100 Move test into correct place. We don't need a looger. framework/Db/test/Horde/Db/Migration/BaseTest.php | 10 +++++ framework/Db/test/Horde/Db/Migration/MigratorTest.php | 30 +++++------------ 2 files changed, 19 insertions(+), 21 deletions(-) http://git.horde.org/horde-git/-/commit/0e273447c713524400bd5be8993775f636db9656 ----------------------------------------------------------------------- commit 235bf5239a9755996efe64215ac31410ae05ae09 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 22:35:43 2011 +0100 Add a failing test for SQLite driver breaking table when changing the primary key column. framework/Db/test/Horde/Db/Migration/BaseTest.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/235bf5239a9755996efe64215ac31410ae05ae09 ----------------------------------------------------------------------- commit e4c5040a3bec75804e04e9d17f11cb6019a7f0d4 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 22:57:30 2011 +0100 There is no 'id' option, there is only a 'primaryKey' option that defaults to 'id'. Fixes first bug. framework/Db/lib/Horde/Db/Adapter/Base/Schema.php | 73 ++--- framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- .../test/Horde/Db/fixtures/migrations/3_innocent_jointable1.php | 2 +- .../fixtures/migrations_with_duplicate/3_innocent_jointable2.php | 2 +- .../migrations_with_missing_versions/4_innocent_jointable3.php | 2 +- 5 files changed, 39 insertions(+), 42 deletions(-) http://git.horde.org/horde-git/-/commit/e4c5040a3bec75804e04e9d17f11cb6019a7f0d4 ----------------------------------------------------------------------- commit b647b3bb4d7f8fd4febfc803075327bfc491485c Author: Jan Schneider <[email protected]> Date: Thu Mar 3 23:11:12 2011 +0100 Style framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/b647b3bb4d7f8fd4febfc803075327bfc491485c ----------------------------------------------------------------------- commit f935a094a3dd786ed03fadec6c79b74e4b9723eb Author: Jan Schneider <[email protected]> Date: Thu Mar 3 23:12:03 2011 +0100 Horde_Db_Adapter_Base_TableDefinition::primaryKey() expects columns, not the complete index object. Fixed the final bug. framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/f935a094a3dd786ed03fadec6c79b74e4b9723eb ----------------------------------------------------------------------- commit 59b6aab170d13bcd45c4390ea0ef7ca5b5591357 Author: Jan Schneider <[email protected]> Date: Thu Mar 3 23:41:33 2011 +0100 One more failing test. Adding autoincrementing still not working with SQLite. framework/Db/test/Horde/Db/Migration/BaseTest.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/59b6aab170d13bcd45c4390ea0ef7ca5b5591357 ----------------------------------------------------------------------- commit 71d2ce9952ed519783aa6999a7c0cbc9f1c1fecb Author: Jan Schneider <[email protected]> Date: Thu Mar 3 23:42:03 2011 +0100 Drop parents column. .../migration/Horde_Group/3_horde_group_upgrade_drop_parents.php | 19 +++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 framework/Group/migration/Horde_Group/3_horde_group_upgrade_drop_parents.php http://git.horde.org/horde-git/-/commit/71d2ce9952ed519783aa6999a7c0cbc9f1c1fecb ----------------------------------------------------------------------- commit 6d4b12367b7beb0ec1f7e55c184b2e9a109f3c4c Author: Jan Schneider <[email protected]> Date: Fri Mar 4 13:55:46 2011 +0100 Add option to unset the primary key of a TableDefinition and use that to delete existing primary keys when changing a column's type to the virtual type "primaryKey" in SQLite. framework/Db/lib/Horde/Db/Adapter/Base/TableDefinition.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/6d4b12367b7beb0ec1f7e55c184b2e9a109f3c4c ----------------------------------------------------------------------- commit 5ca38acea489790b900e3eb80a01d4495a91aa49 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 14:13:07 2011 +0100 Changing arbitrary columns to autoincrementing simply doesn't work, because this is not supported by all databases. Use the virtual column type "primaryKey" instead, which does exactly what we want. ansel/migration/2_ansel_upgrade_autoincrement.php | 24 ++++- framework/Db/test/Horde/Db/Migration/BaseTest.php | 2 +- .../migration/Horde_Group/2_horde_group_upgrade_autoincrement.php | 6 +- .../Horde_History/2_horde_history_upgrade_autoincrement.php | 6 +- .../migration/Horde/Perms/2_horde_perms_upgrade_autoincrement.php | 6 +- .../VFS/migration/Horde/VFS/2_horde_vfs_upgrade_autoincrement.php | 12 ++- hermes/migration/2_hermes_autoincrement.php | 19 +++- imp/migration/2_imp_autoincrement_sentmail.php | 6 +- ingo/migration/2_ingo_upgrade_autoincrement.php | 12 ++- jonah/migration/2_jonah_upgrade_autoincrement.php | 18 +++- kronolith/migration/2_kronolith_upgrade_autoincrement.php | 6 +- kronolith/migration/7_kronolith_upgrade_resourceautoincrement.php | 6 +- mnemo/migration/2_mnemo_upgrade_autoincrement.php | 6 +- nag/migration/2_nag_upgrade_autoincrement.php | 6 +- turba/migration/2_turba_upgrade_autoincrement.php | 6 +- whups/migration/2_whups_autoincrement_shares.php | 6 +- wicked/migration/2_wicked_autoincrement_page_id.php | 2 +- 17 files changed, 122 insertions(+), 27 deletions(-) http://git.horde.org/horde-git/-/commit/5ca38acea489790b900e3eb80a01d4495a91aa49 ----------------------------------------------------------------------- commit 2a3ce70b50cf2a1a4f34ccd1c9a3d88d92d1ff4a Author: Jan Schneider <[email protected]> Date: Fri Mar 4 16:33:21 2011 +0100 Test non-existants IDs of the correct type. framework/Group/test/Horde/Group/Base.php | 4 ++-- framework/Group/test/Horde/Group/LdapTest.php | 2 +- framework/Group/test/Horde/Group/Sql/Base.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/2a3ce70b50cf2a1a4f34ccd1c9a3d88d92d1ff4a ----------------------------------------------------------------------- commit d9f3faa3612d8bbe6ad98ebd9f2c3c625b85fbad Author: Jan Schneider <[email protected]> Date: Fri Mar 4 16:33:52 2011 +0100 Add pgsql test. framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php | 30 ++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) create mode 100644 framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php http://git.horde.org/horde-git/-/commit/d9f3faa3612d8bbe6ad98ebd9f2c3c625b85fbad ----------------------------------------------------------------------- commit e27188fc34232357688402568077f8795033f8fe Author: Jan Schneider <[email protected]> Date: Fri Mar 4 17:55:40 2011 +0100 Indention. framework/Db/lib/Horde/Db/Adapter/Base/Column.php | 44 ++++++++++---------- 1 files changed, 22 insertions(+), 22 deletions(-) http://git.horde.org/horde-git/-/commit/e27188fc34232357688402568077f8795033f8fe ----------------------------------------------------------------------- commit 4247956d3d755e07a71c88f7005d37a5f1bacedc Author: Jan Schneider <[email protected]> Date: Fri Mar 4 18:25:58 2011 +0100 Allow changing the primary key. framework/Db/lib/Horde/Db/Adapter/Mysql/Schema.php | 4 +- framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 31 ++++++++++++-- framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 32 ++++++++++++-- 3 files changed, 57 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/4247956d3d755e07a71c88f7005d37a5f1bacedc ----------------------------------------------------------------------- commit 84efea7b6965fa2ef52aedf10f5197713187e136 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 18:26:51 2011 +0100 Tweak schema table name. framework/Group/test/Horde/Group/Sql/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/84efea7b6965fa2ef52aedf10f5197713187e136 ----------------------------------------------------------------------- commit 01627dfe89f146df1499e3dfc6bf44e58ebafbef Author: Jan Schneider <[email protected]> Date: Fri Mar 4 18:51:02 2011 +0100 Hopefully this is all that should be left to implement the Kolab driver. Passing the correct parameters from Horde_Core_Factory_Group and testing is left as an excercise for Gunnar. framework/Group/lib/Horde/Group/Kolab.php | 275 ++-------------------- framework/Group/lib/Horde/Group/KolabObject.php | 162 ------------- 2 files changed, 25 insertions(+), 412 deletions(-) delete mode 100644 framework/Group/lib/Horde/Group/KolabObject.php http://git.horde.org/horde-git/-/commit/01627dfe89f146df1499e3dfc6bf44e58ebafbef ----------------------------------------------------------------------- commit d430fb6befa8c8b64911251de283ee24d5d654e6 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 18:54:04 2011 +0100 Read-only is the default. framework/Group/lib/Horde/Group/Kolab.php | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/d430fb6befa8c8b64911251de283ee24d5d654e6 ----------------------------------------------------------------------- commit 9553d55a924bc3da93aedbd0b37742c4be527ed1 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 19:18:41 2011 +0100 Implement Mock driver. framework/Group/lib/Horde/Group/Mock.php | 303 +++++++++---------------- framework/Group/test/Horde/Group/MockTest.php | 106 +++++++++ 2 files changed, 214 insertions(+), 195 deletions(-) create mode 100644 framework/Group/test/Horde/Group/MockTest.php http://git.horde.org/horde-git/-/commit/9553d55a924bc3da93aedbd0b37742c4be527ed1 ----------------------------------------------------------------------- commit fd5b8611e4d281ba2ccfd77437c856adb0022e5a Author: Jan Schneider <[email protected]> Date: Fri Mar 4 19:26:44 2011 +0100 Remove the DataTree driver. framework/Group/lib/Horde/Group.php | 651 ------------- framework/Group/lib/Horde/Group/DataTreeObject.php | 190 ---- horde/scripts/upgrades/convert_datatree_groups_to_sql.php | 2 + 3 files changed, 2 insertions(+), 841 deletions(-) delete mode 100644 framework/Group/lib/Horde/Group.php delete mode 100644 framework/Group/lib/Horde/Group/DataTreeObject.php http://git.horde.org/horde-git/-/commit/fd5b8611e4d281ba2ccfd77437c856adb0022e5a ----------------------------------------------------------------------- commit a33ab31147cbe9c622b25721c32c9a49274c1f6c Author: Jan Schneider <[email protected]> Date: Fri Mar 4 19:30:03 2011 +0100 Remove group hooks. If people want custom logic, they can create a custom driver. framework/Group/lib/Horde/Group/Hooks.php | 81 ----------------------------- horde/config/conf.xml | 15 ++---- horde/config/hooks.php.dist | 31 ----------- 3 files changed, 5 insertions(+), 122 deletions(-) delete mode 100644 framework/Group/lib/Horde/Group/Hooks.php http://git.horde.org/horde-git/-/commit/a33ab31147cbe9c622b25721c32c9a49274c1f6c ----------------------------------------------------------------------- commit 928db97e71b9be762cffa71f1e464bfd049f5108 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 19:33:38 2011 +0100 If we default to read-only drivers, we can as well default to throw exceptions from write operations. framework/Group/lib/Horde/Group/Base.php | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/928db97e71b9be762cffa71f1e464bfd049f5108 ----------------------------------------------------------------------- commit 9dc584a44b9e871323b5249bd4394c475fa03542 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 22:37:15 2011 +0100 Don't drop parents yet, might need that later for conversion. .../migration/Horde_Group/3_horde_group_upgrade_drop_parents.php | 19 ----- 1 files changed, 0 insertions(+), 19 deletions(-) delete mode 100644 framework/Group/migration/Horde_Group/3_horde_group_upgrade_drop_parents.php http://git.horde.org/horde-git/-/commit/9dc584a44b9e871323b5249bd4394c475fa03542 ----------------------------------------------------------------------- commit 32f832d76a3b3e9e31ca59c67db8a70838974648 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 22:37:27 2011 +0100 Updated framework/Group/package.xml | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) http://git.horde.org/horde-git/-/commit/32f832d76a3b3e9e31ca59c67db8a70838974648 ----------------------------------------------------------------------- commit c107101e519916863ad438014ed449b146c65bc9 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 22:39:29 2011 +0100 Generalize class building. framework/Core/lib/Horde/Core/Factory/Group.php | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/c107101e519916863ad438014ed449b146c65bc9 ----------------------------------------------------------------------- commit c47b1ff593387794e577df7f3bc2ed3cad177994 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 22:43:45 2011 +0100 Reduce dependencies. framework/Group/package.xml | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) http://git.horde.org/horde-git/-/commit/c47b1ff593387794e577df7f3bc2ed3cad177994 ----------------------------------------------------------------------- commit b19dc3b5f765abebd6008bfe5218740e9d697e25 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 23:23:15 2011 +0100 Set group_parents for now, to avoid constraint violations. framework/Group/lib/Horde/Group/Sql.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/b19dc3b5f765abebd6008bfe5218740e9d697e25 ----------------------------------------------------------------------- commit 866fbd9fa328d3c5f3ee76a01099d837c7bb9776 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 23:23:49 2011 +0100 Add getData(). framework/Group/lib/Horde/Group/Base.php | 16 +++++++++++ framework/Group/lib/Horde/Group/Contactlists.php | 7 +++-- framework/Group/lib/Horde/Group/Ldap.php | 32 ++++++++++++++++++++++ framework/Group/lib/Horde/Group/Mock.php | 17 +++++++++++ framework/Group/lib/Horde/Group/Sql.php | 24 ++++++++++++++++ framework/Group/test/Horde/Group/Base.php | 9 +++++- framework/Group/test/Horde/Group/LdapTest.php | 8 +++++ framework/Group/test/Horde/Group/MockTest.php | 8 +++++ framework/Group/test/Horde/Group/Sql/Base.php | 8 +++++ 9 files changed, 125 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/866fbd9fa328d3c5f3ee76a01099d837c7bb9776 ----------------------------------------------------------------------- commit 57654aa058494513dfb8787e36257239d3936232 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 23:37:50 2011 +0100 Throws a NotFound exception too. framework/Ldap/lib/Horde/Ldap.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/57654aa058494513dfb8787e36257239d3936232 ----------------------------------------------------------------------- commit a95c55b33edad7075f1e24fb8d01b7c7bbcc8cf6 Author: Jan Schneider <[email protected]> Date: Fri Mar 4 23:46:45 2011 +0100 Add setData(). framework/Group/lib/Horde/Group/Base.php | 14 +++++++++ framework/Group/lib/Horde/Group/Ldap.php | 36 +++++++++++++++++++++++++ framework/Group/lib/Horde/Group/Mock.php | 24 ++++++++++++++++ framework/Group/lib/Horde/Group/Sql.php | 29 ++++++++++++++++++++ framework/Group/test/Horde/Group/Base.php | 10 +++++++ framework/Group/test/Horde/Group/LdapTest.php | 8 +++++ framework/Group/test/Horde/Group/MockTest.php | 8 +++++ framework/Group/test/Horde/Group/Sql/Base.php | 8 +++++ 8 files changed, 137 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/a95c55b33edad7075f1e24fb8d01b7c7bbcc8cf6 ----------------------------------------------------------------------- commit f7f1faad6f67f2b720625d9c5d36e55c11d7474a Author: Jan Schneider <[email protected]> Date: Sat Mar 5 00:12:33 2011 +0100 Fix class building. framework/Core/lib/Horde/Core/Factory/Group.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/f7f1faad6f67f2b720625d9c5d36e55c11d7474a ----------------------------------------------------------------------- commit 46752e676441517e30c016280195737f2bb83066 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 00:13:22 2011 +0100 Start converting consumer code to new group API. framework/Core/lib/Horde/Core/Ajax/Application.php | 4 +- framework/Core/lib/Horde/Core/Perms/Ui.php | 5 +- framework/Perms/lib/Horde/Perms.php | 6 +- framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Group.php | 2 +- .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Group.php | 2 +- framework/Share/lib/Horde/Share/Datatree.php | 3 +- framework/Share/lib/Horde/Share/Sql.php | 2 +- framework/Share/lib/Horde/Share/Sqlng.php | 2 +- framework/Share/test/Horde/Share/Stub/Group.php | 32 +- horde/admin/groups.php | 163 ++--- horde/templates/admin/groups/delete.inc | 4 +- horde/templates/admin/groups/edit.inc | 10 +- 12 files changed, 86 insertions(+), 149 deletions(-) http://git.horde.org/horde-git/-/commit/46752e676441517e30c016280195737f2bb83066 ----------------------------------------------------------------------- commit ba3e110bb68f8256c37cdd7b4039e152f1b73b4e Author: Michael J. Rubinsky <[email protected]> Date: Fri Mar 4 17:12:13 2011 -0500 Use new getSorucesConfig api method. Porting these changes as I go, basically to show the usage. The group driver is being rewritten, so I'm not concerned about e.g., the global registry use. framework/Group/lib/Horde/Group/Contactlists.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/ba3e110bb68f8256c37cdd7b4039e152f1b73b4e ----------------------------------------------------------------------- commit f5f30e6475f64db5ab5bebb52960983686bdd7e6 Author: Michael J. Rubinsky <[email protected]> Date: Sat Mar 5 01:19:23 2011 -0500 First attempt at moving turba specific knowledge out of the Contactlists group driver. Not too concerned at this point about $GLOBALS usage, since this is going to be refactored to the new Group API by jan. framework/Group/lib/Horde/Group/Contactlists.php | 252 +------------------- turba/lib/Api.php | 278 ++++++++++++++++++++++ 2 files changed, 290 insertions(+), 240 deletions(-) http://git.horde.org/horde-git/-/commit/f5f30e6475f64db5ab5bebb52960983686bdd7e6 ----------------------------------------------------------------------- commit a45e4bb5980601ebeea3c3231e0f1afac9fcb944 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 18:04:12 2011 +0100 Tweaks and fixes to the contact group API. Michael, can we drop listUserGroupObjects(), because this seems to provide the same functionality like getGroupMemberships()? turba/lib/Api.php | 76 +++++++++++++++++++++++++++------------------------- 1 files changed, 39 insertions(+), 37 deletions(-) http://git.horde.org/horde-git/-/commit/a45e4bb5980601ebeea3c3231e0f1afac9fcb944 ----------------------------------------------------------------------- commit fabfa110c12d24d1e95ea789da0718dac5a4f07e Author: Jan Schneider <[email protected]> Date: Sat Mar 5 18:05:22 2011 +0100 Provide default implementation of setData(). framework/Group/lib/Horde/Group/Base.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/fabfa110c12d24d1e95ea789da0718dac5a4f07e ----------------------------------------------------------------------- commit 92619b968b1e47d3b0af5f8efb23775fc26f4519 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 18:06:17 2011 +0100 Implement Contactlists driver. framework/Group/lib/Horde/Group/ContactListObject.php | 109 ----- framework/Group/lib/Horde/Group/Contactlists.php | 377 +++-------------- framework/Group/test/Horde/Group/ContactlistTest.php | 73 ++++ framework/Group/test/Horde/Group/Stub/Api.php | 97 +++++ 4 files changed, 238 insertions(+), 418 deletions(-) delete mode 100644 framework/Group/lib/Horde/Group/ContactListObject.php create mode 100644 framework/Group/test/Horde/Group/ContactlistTest.php create mode 100644 framework/Group/test/Horde/Group/Stub/Api.php http://git.horde.org/horde-git/-/commit/92619b968b1e47d3b0af5f8efb23775fc26f4519 ----------------------------------------------------------------------- commit 215056627d8ca7210851c8eef99634a0f094af5e Author: Jan Schneider <[email protected]> Date: Sat Mar 5 18:41:07 2011 +0100 Add MySQL tests without PDO. framework/Group/test/Horde/Group/Sql/MysqlTest.php | 29 +++++++++++++++++++ framework/Group/test/Horde/Group/Sql/MysqliTest.php | 29 +++++++++++++++++++ 2 files changed, 58 insertions(+), 0 deletions(-) create mode 100644 framework/Group/test/Horde/Group/Sql/MysqlTest.php create mode 100644 framework/Group/test/Horde/Group/Sql/MysqliTest.php http://git.horde.org/horde-git/-/commit/215056627d8ca7210851c8eef99634a0f094af5e ----------------------------------------------------------------------- commit 23ba101a07dfcf4fa87a84c3b9d930dd36e748a7 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:00:39 2011 +0100 Use assertInternalType(). framework/Share/test/Horde/Share/Kolab/UnitTest.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/23ba101a07dfcf4fa87a84c3b9d930dd36e748a7 ----------------------------------------------------------------------- commit 665fc2880477a9ca8efb7fa701552c6eec13e0fd Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:02:21 2011 +0100 Horde_Group -> Horde_Group_Base .../lib/Horde/Kolab/Storage/Driver/Decorator/Log.php | 2 +- .../lib/Horde/Kolab/Storage/Driver/Decorator/Timer.php | 2 +- framework/Perms/lib/Horde/Perms/Permission/Kolab.php | 13 ++-- framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Group.php | 9 ++- framework/Perms/lib/Horde/Perms/Permission/Kolab/AclIterator.php | 9 ++- .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Group.php | 9 ++- .../Perms/lib/Horde/Perms/Permission/Kolab/ElementIterator.php | 10 ++- framework/Share/lib/Horde/Share/Base.php | 14 +++-- framework/Share/lib/Horde/Share/Kolab.php | 12 ++-- framework/Share/lib/Horde/Share/Object/Kolab.php | 11 ++-- framework/Share/lib/Horde/Share/Sql.php | 3 +- framework/Share/lib/Horde/Share/Sqlng.php | 3 +- 12 files changed, 54 insertions(+), 43 deletions(-) http://git.horde.org/horde-git/-/commit/665fc2880477a9ca8efb7fa701552c6eec13e0fd ----------------------------------------------------------------------- commit d1532a3e9b91963ca19ddce70d22e26f4856f776 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:04:44 2011 +0100 Allow to pass the config file path to Horde_Test_Case::getConfig(). .gitignore | 6 ------ framework/Share/test/Horde/Share/Sql/MysqlTest.php | 3 ++- framework/Share/test/Horde/Share/Sql/MysqliTest.php | 3 ++- framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php | 3 ++- framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php | 3 ++- framework/Share/test/Horde/Share/Sqlng/MysqlTest.php | 3 ++- framework/Share/test/Horde/Share/Sqlng/MysqliTest.php | 3 ++- framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php | 3 ++- framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php | 3 ++- framework/Share/test/Horde/Share/conf.php.dist | 2 -- framework/Test/lib/Horde/Test/Case.php | 11 +++++++---- 11 files changed, 23 insertions(+), 20 deletions(-) http://git.horde.org/horde-git/-/commit/d1532a3e9b91963ca19ddce70d22e26f4856f776 ----------------------------------------------------------------------- commit 840392473461fdde7040004a26bceac2a3cc3dcf Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:11:52 2011 +0100 Add configuration for unit tests. .gitignore | 1 + framework/Group/test/Horde/Group/Sql/MysqlTest.php | 3 +- framework/Group/test/Horde/Group/Sql/MysqliTest.php | 3 +- framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php | 3 +- framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php | 3 +- framework/Group/test/Horde/Group/conf.php.dist | 33 ++++++++++++++++ 6 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 framework/Group/test/Horde/Group/conf.php.dist http://git.horde.org/horde-git/-/commit/840392473461fdde7040004a26bceac2a3cc3dcf ----------------------------------------------------------------------- commit 15db67f5c86f4955482efa22d672cefa201fa9f5 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:39:56 2011 +0100 Allow restricting comments to any group. whups/lib/Forms/AddComment.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/15db67f5c86f4955482efa22d672cefa201fa9f5 ----------------------------------------------------------------------- commit 589f8543c82ff728b8633a9fee005e7b4b0060b3 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:43:43 2011 +0100 Convert the remaining code to the new group API. ansel/lib/Storage.php | 5 +- ansel/perms.php | 4 +- folks/config/hooks.php.dist | 8 +- folks/perms.php | 4 +- horde/lib/Api.php | 146 ++++++++----------------------- horde/services/shares/edit.php | 4 +- horde/templates/shares/edit.inc | 4 +- kronolith/lib/Kronolith.php | 16 ++-- kronolith/perms.php | 4 +- kronolith/templates/chunks/calendar.php | 4 +- kronolith/templates/perms/perms.inc | 4 +- nag/lib/Form/Task.php | 2 +- nag/lib/Nag.php | 3 +- trean/lib/Bookmarks.php | 5 +- turba/lib/Driver/Group.php | 2 +- whups/lib/Forms/CreateTicket.php | 9 +- whups/lib/Forms/EditTicket.php | 14 ++-- whups/lib/Forms/Query.php | 5 +- whups/lib/Whups.php | 17 ++-- whups/ticket/queue.php | 8 +- whups/ticket/type.php | 5 +- 21 files changed, 105 insertions(+), 168 deletions(-) http://git.horde.org/horde-git/-/commit/589f8543c82ff728b8633a9fee005e7b4b0060b3 ----------------------------------------------------------------------- commit 76be4cb468992e7c02efccddbff9189b75d039db Merge: d9471ee 589f854 Author: Jan Schneider <[email protected]> Date: Sat Mar 5 19:55:08 2011 +0100 Merge branch 'H4-Group' Still missing: sub-groups, caching, search() implementation for contactlists driver. Conflicts: framework/Core/lib/Horde/Core/Factory/Group.php framework/Group/lib/Horde/Group/Contactlists.php turba/lib/Api.php .gitignore | 7 +- ansel/lib/Storage.php | 5 +- ansel/perms.php | 4 +- folks/config/hooks.php.dist | 8 +- folks/perms.php | 4 +- framework/Core/lib/Horde/Core/Ajax/Application.php | 4 +- framework/Core/lib/Horde/Core/Factory/Group.php | 33 +- framework/Core/lib/Horde/Core/Group/Ldap.php | 35 + framework/Core/lib/Horde/Core/Perms/Ui.php | 5 +- framework/Db/lib/Horde/Db/Adapter/Base.php | 2 +- framework/Group/lib/Horde/Group.php | 651 ---- framework/Group/lib/Horde/Group/Base.php | 194 ++ framework/Group/lib/Horde/Group/ContactListObject.php | 109 - framework/Group/lib/Horde/Group/Contactlists.php | 384 +-- framework/Group/lib/Horde/Group/DataTreeObject.php | 190 -- framework/Group/lib/Horde/Group/Hooks.php | 81 - framework/Group/lib/Horde/Group/Kolab.php | 277 +-- framework/Group/lib/Horde/Group/KolabObject.php | 162 - framework/Group/lib/Horde/Group/Ldap.php | 609 ++--- framework/Group/lib/Horde/Group/LdapObject.php | 126 - framework/Group/lib/Horde/Group/Mock.php | 316 +-- framework/Group/lib/Horde/Group/Sql.php | 680 +---- framework/Group/lib/Horde/Group/SqlObject.php | 133 - .../Group/migration/Horde_Group/1_horde_group_base_tables.php | 1 + framework/Group/package.xml | 62 +- framework/Group/test/Horde/Group/AllTests.php | 34 + framework/Group/test/Horde/Group/Autoload.php | 20 + framework/Group/test/Horde/Group/Base.php | 137 + framework/Group/test/Horde/Group/ContactlistTest.php | 73 + framework/Group/test/Horde/Group/LdapTest.php | 149 + framework/Group/test/Horde/Group/MockTest.php | 122 + framework/Group/test/Horde/Group/Sql/Base.php | 154 + framework/Group/test/Horde/Group/Sql/MysqlTest.php | 30 + framework/Group/test/Horde/Group/Sql/MysqliTest.php | 30 + framework/Group/test/Horde/Group/Sql/Pdo/MysqlTest.php | 31 + framework/Group/test/Horde/Group/Sql/Pdo/PgsqlTest.php | 31 + framework/Group/test/Horde/Group/Sql/Pdo/SqliteTest.php | 27 + framework/Group/test/Horde/Group/Stub/Api.php | 97 + framework/Group/test/Horde/Group/conf.php.dist | 33 + .../lib/Horde/Kolab/Storage/Driver/Decorator/Log.php | 2 +- .../lib/Horde/Kolab/Storage/Driver/Decorator/Timer.php | 2 +- framework/Ldap/lib/Horde/Ldap.php | 18 +- framework/Ldap/lib/Horde/Ldap/RootDse.php | 14 +- framework/Ldap/lib/Horde/Ldap/Search.php | 3 +- framework/Ldap/lib/Horde/Ldap/Util.php | 9 +- framework/Perms/lib/Horde/Perms.php | 6 +- framework/Perms/lib/Horde/Perms/Permission/Kolab.php | 13 +- framework/Perms/lib/Horde/Perms/Permission/Kolab/Acl/Group.php | 11 +- framework/Perms/lib/Horde/Perms/Permission/Kolab/AclIterator.php | 9 +- .../Perms/lib/Horde/Perms/Permission/Kolab/Element/Group.php | 11 +- .../Perms/lib/Horde/Perms/Permission/Kolab/ElementIterator.php | 10 +- framework/Share/lib/Horde/Share/Base.php | 14 +- framework/Share/lib/Horde/Share/Datatree.php | 3 +- framework/Share/lib/Horde/Share/Kolab.php | 12 +- framework/Share/lib/Horde/Share/Object/Kolab.php | 11 +- framework/Share/lib/Horde/Share/Sql.php | 5 +- framework/Share/lib/Horde/Share/Sqlng.php | 5 +- framework/Share/test/Horde/Share/Kolab/UnitTest.php | 2 +- framework/Share/test/Horde/Share/Sql/MysqlTest.php | 3 +- framework/Share/test/Horde/Share/Sql/MysqliTest.php | 3 +- framework/Share/test/Horde/Share/Sql/Pdo/MysqlTest.php | 3 +- framework/Share/test/Horde/Share/Sql/Pdo/PgsqlTest.php | 3 +- framework/Share/test/Horde/Share/Sqlng/MysqlTest.php | 3 +- framework/Share/test/Horde/Share/Sqlng/MysqliTest.php | 3 +- framework/Share/test/Horde/Share/Sqlng/Pdo/MysqlTest.php | 3 +- framework/Share/test/Horde/Share/Sqlng/Pdo/PgsqlTest.php | 3 +- framework/Share/test/Horde/Share/Stub/Group.php | 32 +- framework/Share/test/Horde/Share/conf.php.dist | 2 - framework/Test/lib/Horde/Test/Case.php | 11 +- horde/admin/groups.php | 163 +- horde/config/conf.xml | 15 +- horde/config/hooks.php.dist | 31 - horde/lib/Api.php | 146 +- horde/scripts/upgrades/convert_datatree_groups_to_sql.php | 2 + horde/services/shares/edit.php | 4 +- horde/templates/admin/groups/delete.inc | 4 +- horde/templates/admin/groups/edit.inc | 10 +- horde/templates/shares/edit.inc | 4 +- kronolith/lib/Kronolith.php | 16 +- kronolith/perms.php | 4 +- kronolith/templates/chunks/calendar.php | 4 +- kronolith/templates/perms/perms.inc | 4 +- nag/lib/Form/Task.php | 2 +- nag/lib/Nag.php | 3 +- trean/lib/Bookmarks.php | 5 +- turba/lib/Api.php | 72 +- turba/lib/Driver/Group.php | 2 +- whups/lib/Forms/AddComment.php | 5 +- whups/lib/Forms/CreateTicket.php | 9 +- whups/lib/Forms/EditTicket.php | 14 +- whups/lib/Forms/Query.php | 5 +- whups/lib/Whups.php | 17 +- whups/ticket/queue.php | 8 +- whups/ticket/type.php | 5 +- 94 files changed, 2229 insertions(+), 3604 deletions(-) http://git.horde.org/horde-git/-/commit/76be4cb468992e7c02efccddbff9189b75d039db __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
