The branch "master" has been updated. The following is a summary of the commits.
from: 2682e692e501ea0b333be9b087a0013caac57b34 62919f6 BFN 8d42816 This doesn't return a value, catch an exception instead. 64ecdac Enable IMAP folder renaming. 9617e8e Don't rename if $old == $new. 32fc64b First round of rewriting hierarchy handling. f7bf363 Update and add a bunch of new tests. 7c142e4 Remove old test. a28142c Use the new folder uids. 69e393b Fix type hint. 1452f47 These are just ids, not the full folder object. d97c583 Use the server object to get the importer. 31ddafb Update state correctly after a change in hierarchy, don't limit by EAS version. 8a6cf7f We need the serverid here, not the uid. 7ecf096 Logging e28bbda Allow for changing the backend serverid in the folder object. 57c72c0 Add missing protected member. b70fae2 Logging tweaks 4cdbba8 Fix FOLDERCREATE commands for new serverid/uid changes dd4578a Fix FOLDERSYNC commands for new serverid/uid changes. 0170688 More serverid/uid changes. be9ebd9 Persist the serverid in the change arrays. 9faa0f2 Allow for updating the serverid in the folder's state object. 232b346 phpdoc/logging e56b3c0 Always ask for the serverid from the backend. bc36cb0 Fix broken timestamping. a6e42d9 Fix incoming folder changes. 700b6c0 Need to compare serverids here, not uids. 8713c54 Fix applying imap folder name changes. fe2c2ef No need for these comments, obvious. 0a1122d Add hierarchy test to the Core activesync tests. cb6fe2a Test getting the collection data from the cache. c023369 Ensure we have a different timestamp between tests. 31c10f5 No idea why this doesn't work. Mark as skipped for now. 414901d Update fixture 0f8f144 Should depend on this test. 300b7f5 Update package.xml filelist. 35588b4 BFN ----------------------------------------------------------------------- commit 62919f6b4e20d3c1b9e68f027d527ef9a76c7bd7 Author: Michael J Rubinsky <[email protected]> Date: Tue May 14 20:14:29 2013 -0400 BFN framework/ActiveSync/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/62919f6b4e20d3c1b9e68f027d527ef9a76c7bd7 ----------------------------------------------------------------------- commit 8d428164a741961537bbb75018902a2c73182687 Author: Michael J Rubinsky <[email protected]> Date: Wed May 15 11:04:34 2013 -0400 This doesn't return a value, catch an exception instead. .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8d428164a741961537bbb75018902a2c73182687 ----------------------------------------------------------------------- commit 64ecdacdc8915fc4d747eef5458493db4038d989 Author: Michael J Rubinsky <[email protected]> Date: Wed May 15 11:05:16 2013 -0400 Enable IMAP folder renaming. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/64ecdacdc8915fc4d747eef5458493db4038d989 ----------------------------------------------------------------------- commit 9617e8ea4f1ea0878c06e1827c4d6b8f5a1ad466 Author: Michael J Rubinsky <[email protected]> Date: Wed May 15 11:06:53 2013 -0400 Don't rename if $old == $new. Outlook sends a rename command with old and new being equal when the folder is moved to the local "Deleted Items" folder. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/9617e8ea4f1ea0878c06e1827c4d6b8f5a1ad466 ----------------------------------------------------------------------- commit 32fc64b90462dcea4dd79f9f3defec7f3274548b Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:07:09 2013 -0400 First round of rewriting hierarchy handling. Some EAS clients require a non-changing UID for the folder's serverid. In Exchange, this is provided by MAPI, but IMAP has no such capability. Generate and map a uid for each folder and store it. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 177 ++- framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 16 +- framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 5 +- framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 24 + framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php | 400 +++++ framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 4 +- framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php | 3 + .../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 5 + .../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php | 10 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 1 - framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php | 12 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 7 +- framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 13 +- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 77 +- framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 29 +- 16 files changed, 671 insertions(+), 114 deletions(-) create mode 100644 framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php http://git.horde.org/horde-git/-/commit/32fc64b90462dcea4dd79f9f3defec7f3274548b ----------------------------------------------------------------------- commit f7bf363f464b5c0dfb1b58bf2ecca01a1abd4223 Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:09:08 2013 -0400 Update and add a bunch of new tests. framework/ActiveSync/test/Horde/ActiveSync/CacheTest.php | 40 - framework/ActiveSync/test/Horde/ActiveSync/InviteTest.php | 1 - framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 492 ++++- framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php | 162 ++- .../ActiveSync/test/Horde/ActiveSync/StateTest/Sql/MysqlTest.php | 26 + .../ActiveSync/test/Horde/ActiveSync/StateTest/Sql/MysqliTest.php | 26 + .../test/Horde/ActiveSync/StateTest/Sql/Pdo/MysqlTest.php | 1 - framework/ActiveSync/test/Horde/ActiveSync/UtilsTest.php | 2 - 8 files changed, 673 insertions(+), 77 deletions(-) create mode 100644 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/MysqlTest.php create mode 100644 framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/MysqliTest.php http://git.horde.org/horde-git/-/commit/f7bf363f464b5c0dfb1b58bf2ecca01a1abd4223 ----------------------------------------------------------------------- commit 7c142e451ae53b51214f9fe913c1c5ad2de8a4f1 Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:09:53 2013 -0400 Remove old test. .../ActiveSync/test/Horde/ActiveSync/CollectionsHandlerTest.php | 349 ----- 1 files changed, 0 insertions(+), 349 deletions(-) delete mode 100644 framework/ActiveSync/test/Horde/ActiveSync/CollectionsHandlerTest.php http://git.horde.org/horde-git/-/commit/7c142e451ae53b51214f9fe913c1c5ad2de8a4f1 ----------------------------------------------------------------------- commit a28142c97fee4f9c5b8f1f945c75f902db5b883a Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:10:04 2013 -0400 Use the new folder uids. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 73 ++++++++++++------- 1 files changed, 47 insertions(+), 26 deletions(-) http://git.horde.org/horde-git/-/commit/a28142c97fee4f9c5b8f1f945c75f902db5b883a ----------------------------------------------------------------------- commit 69e393b2884338ae38f70bfa967c50a452bc1144 Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:14:43 2013 -0400 Fix type hint. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/69e393b2884338ae38f70bfa967c50a452bc1144 ----------------------------------------------------------------------- commit 1452f4796a292ea583e5b1f9f0f64c1e2d957b0e Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 13:46:50 2013 -0400 These are just ids, not the full folder object. framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/1452f4796a292ea583e5b1f9f0f64c1e2d957b0e ----------------------------------------------------------------------- commit d97c583ed6267c69d74c54dfe1cda279e082a0bf Author: Michael J Rubinsky <[email protected]> Date: Mon May 20 16:15:41 2013 -0400 Use the server object to get the importer. framework/ActiveSync/lib/Horde/ActiveSync.php | 14 ++ framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 28 ++-- framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 12 -- .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php | 2 +- framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 2 +- 7 files changed, 32 insertions(+), 30 deletions(-) http://git.horde.org/horde-git/-/commit/d97c583ed6267c69d74c54dfe1cda279e082a0bf ----------------------------------------------------------------------- commit 31ddafbee840da306505a75e690701ebd8ade29b Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 11:54:22 2013 -0400 Update state correctly after a change in hierarchy, don't limit by EAS version. framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 20 +++++++++---- 1 files changed, 14 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/31ddafbee840da306505a75e690701ebd8ade29b ----------------------------------------------------------------------- commit 8a6cf7fd7ee70d07153d0772eb17412c56cbad37 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 11:55:53 2013 -0400 We need the serverid here, not the uid. framework/ActiveSync/lib/Horde/ActiveSync/Connector/Exporter.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8a6cf7fd7ee70d07153d0772eb17412c56cbad37 ----------------------------------------------------------------------- commit 7ecf0965d805fa1aae03399ab6b65195678d0130 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 11:57:28 2013 -0400 Logging framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/7ecf0965d805fa1aae03399ab6b65195678d0130 ----------------------------------------------------------------------- commit e28bbda57a500fb15f14f0ad4b76f35740aa4304 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 11:57:57 2013 -0400 Allow for changing the backend serverid in the folder object. framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/e28bbda57a500fb15f14f0ad4b76f35740aa4304 ----------------------------------------------------------------------- commit 57c72c03a8851c1bf0f5698f4935952d911a4ee0 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 11:59:04 2013 -0400 Add missing protected member. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/57c72c03a8851c1bf0f5698f4935952d911a4ee0 ----------------------------------------------------------------------- commit b70fae2cc4a8c5e3ea5d3ff8ef3f6146066d003e Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:00:17 2013 -0400 Logging tweaks framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 15 ++++++++--- 1 files changed, 11 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/b70fae2cc4a8c5e3ea5d3ff8ef3f6146066d003e ----------------------------------------------------------------------- commit 4cdbba85f0fd5852f48571425b0a1eb82c775ec9 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:01:36 2013 -0400 Fix FOLDERCREATE commands for new serverid/uid changes .../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 34 +++-- 1 files changed, 23 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/4cdbba85f0fd5852f48571425b0a1eb82c775ec9 ----------------------------------------------------------------------- commit dd4578afe7c5c61604dae02bf6ff17f24e844bc5 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:02:28 2013 -0400 Fix FOLDERSYNC commands for new serverid/uid changes. framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/dd4578afe7c5c61604dae02bf6ff17f24e844bc5 ----------------------------------------------------------------------- commit 0170688e0a8174389fb091ee420659956eec0b46 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:03:17 2013 -0400 More serverid/uid changes. framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/0170688e0a8174389fb091ee420659956eec0b46 ----------------------------------------------------------------------- commit be9ebd9d49695c3f5b78e5a314a34efaec1d1969 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:04:23 2013 -0400 Persist the serverid in the change arrays. framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/be9ebd9d49695c3f5b78e5a314a34efaec1d1969 ----------------------------------------------------------------------- commit 9faa0f2a2f19051e1639e6446848b770a70000ff Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:04:58 2013 -0400 Allow for updating the serverid in the folder's state object. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 42 +++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/9faa0f2a2f19051e1639e6446848b770a70000ff ----------------------------------------------------------------------- commit 232b3464c9e7d11a89dbf97df05d69a1055cf394 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:05:53 2013 -0400 phpdoc/logging framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 32 ++++++++++---- 1 files changed, 23 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/232b3464c9e7d11a89dbf97df05d69a1055cf394 ----------------------------------------------------------------------- commit e56b3c0d35a30dd7df575f825d7553f9a2a9dbb0 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:06:18 2013 -0400 Always ask for the serverid from the backend. framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e56b3c0d35a30dd7df575f825d7553f9a2a9dbb0 ----------------------------------------------------------------------- commit bc36cb08a7f3fcf693f67cf821432adaa507008c Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:08:08 2013 -0400 Fix broken timestamping. framework/ActiveSync/lib/Horde/ActiveSync/SyncCache.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/bc36cb08a7f3fcf693f67cf821432adaa507008c ----------------------------------------------------------------------- commit a6e42d9b4563655535ae0a77d5b667f38d9fd233 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:09:12 2013 -0400 Fix incoming folder changes. framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 42 ++++-- framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 14 ++- 2 files changed, 41 insertions(+), 15 deletions(-) http://git.horde.org/horde-git/-/commit/a6e42d9b4563655535ae0a77d5b667f38d9fd233 ----------------------------------------------------------------------- commit 700b6c0691a3630c633c89c3c9f3c0ef9e492e6e Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:10:20 2013 -0400 Need to compare serverids here, not uids. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/700b6c0691a3630c633c89c3c9f3c0ef9e492e6e ----------------------------------------------------------------------- commit 8713c542498d47fa0ae017539dd15d8aa24d4c28 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:10:50 2013 -0400 Fix applying imap folder name changes. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/8713c542498d47fa0ae017539dd15d8aa24d4c28 ----------------------------------------------------------------------- commit fe2c2ef22c3a71b23df15cbbb9c4a6c2d5a8a89b Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:11:22 2013 -0400 No need for these comments, obvious. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/fe2c2ef22c3a71b23df15cbbb9c4a6c2d5a8a89b ----------------------------------------------------------------------- commit 0a1122dc9849aa238716b650bdb32e3042af1279 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 12:11:40 2013 -0400 Add hierarchy test to the Core activesync tests. framework/Core/test/Horde/Core/ActiveSyncTests.php | 40 +++++++++++++++++++- 1 files changed, 38 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/0a1122dc9849aa238716b650bdb32e3042af1279 ----------------------------------------------------------------------- commit cb6fe2aea0e7d1f0e4af09034526b126a06a115b Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:06:28 2013 -0400 Test getting the collection data from the cache. framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 7 ++++ framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php | 8 +++++ 2 files changed, 15 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/cb6fe2aea0e7d1f0e4af09034526b126a06a115b ----------------------------------------------------------------------- commit c023369020b14d975155d4015e4886efdf6435af Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:06:49 2013 -0400 Ensure we have a different timestamp between tests. (These calls would normally be in different http requests). framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/c023369020b14d975155d4015e4886efdf6435af ----------------------------------------------------------------------- commit 31c10f5f0e33a5de27a3ca6911c453f3e5b9bd64 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:08:02 2013 -0400 No idea why this doesn't work. Mark as skipped for now. framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/31c10f5f0e33a5de27a3ca6911c453f3e5b9bd64 ----------------------------------------------------------------------- commit 414901de56bf11ad18cb4a01612fdded493446d8 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:08:30 2013 -0400 Update fixture framework/ActiveSync/test/Horde/ActiveSync/StateTest/Base.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/414901de56bf11ad18cb4a01612fdded493446d8 ----------------------------------------------------------------------- commit 0f8f14441e2033bc464a02e53fc2851746e3a260 Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:08:42 2013 -0400 Should depend on this test. framework/ActiveSync/test/Horde/ActiveSync/StateTest/Sql/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/0f8f14441e2033bc464a02e53fc2851746e3a260 ----------------------------------------------------------------------- commit 300b7f58ae7f6d2391e63704c2d907bd4c1b5a6a Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:20:12 2013 -0400 Update package.xml filelist. framework/ActiveSync/package.xml | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/300b7f58ae7f6d2391e63704c2d907bd4c1b5a6a ----------------------------------------------------------------------- commit 35588b434f56e3055bdf02afa220d97639bf673f Author: Michael J Rubinsky <[email protected]> Date: Fri May 24 13:20:59 2013 -0400 BFN framework/ActiveSync/package.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/35588b434f56e3055bdf02afa220d97639bf673f -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
