diff -pruN 2.2.3-1/debian/changelog 2.2.3-1ubuntu1/debian/changelog --- 2.2.3-1/debian/changelog 2016-12-19 08:14:53.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/changelog 2018-02-23 03:50:23.000000000 +0000 @@ -1,3 +1,14 @@ +php-horde-kolab-storage (2.2.3-1ubuntu1) bionic; urgency=medium + + * debian/patches/0001-namespaced-phpunit-classes.patch: switch to + namespaced PHPUnit 6+ classes. + * debian/patches/0002-phpunit-deprecated-getMock.patch: replace usage + of PHPUnit's deprecated/removed getMock method. + * debian/patches/0003-fix-tests-that-need-a-session.patch: fix tests + that require a session. (LP: #1749783) + + -- Matt Coleman Thu, 22 Feb 2018 19:50:23 -0800 + php-horde-kolab-storage (2.2.3-1) unstable; urgency=medium * New upstream version 2.2.3 diff -pruN 2.2.3-1/debian/control 2.2.3-1ubuntu1/debian/control --- 2.2.3-1/debian/control 2016-12-19 08:14:53.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/control 2018-02-23 03:50:20.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-kolab-storage Section: php Priority: extra -Maintainer: Horde Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Horde Maintainers Uploaders: Mathieu Parent Build-Depends: debhelper (>= 9), pkg-php-tools, pear-horde-channel Standards-Version: 3.9.8 diff -pruN 2.2.3-1/debian/patches/0001-namespaced-phpunit-classes.patch 2.2.3-1ubuntu1/debian/patches/0001-namespaced-phpunit-classes.patch --- 2.2.3-1/debian/patches/0001-namespaced-phpunit-classes.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/patches/0001-namespaced-phpunit-classes.patch 2018-02-23 03:50:20.000000000 +0000 @@ -0,0 +1,421 @@ +Description: switch to namespaced PHPUnit 6+ classes +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/AttachmentTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/AttachmentTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/AttachmentTest.php +@@ -27,7 +27,7 @@ + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ +-class Horde_Kolab_Storage_AttachmentTest extends PHPUnit_Framework_TestCase ++class Horde_Kolab_Storage_AttachmentTest extends PHPUnit\Framework\TestCase + { + /** + * Test setup. +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_ComponentTest_Data_Object_Message_ModifiedTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testStore() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_ComponentTest_Data_Object_Message_NewTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testStore() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Server/DriverTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Server/DriverTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Server/DriverTest.php +@@ -27,7 +27,7 @@ + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ +-class Horde_Kolab_Storage_Server_DriverTest extends PHPUnit_Framework_TestCase ++class Horde_Kolab_Storage_Server_DriverTest extends PHPUnit\Framework\TestCase + { + const MOCK = 'Mock'; + const CCLIENT = 'Cclient'; +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_TestCase +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function setUp() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/CclientTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Driver_CclientTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function setUp() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Driver_ImapTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testGetNamespaceReturnsNamespaceHandler() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Driver_PearTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testGetNamespaceReturnsNamespaceHandler() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Folder_DataTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testType() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypeTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Folder_TypeTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testConstruction() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypesTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypesTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/TypesTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Folder_TypesTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testConstruction() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Manipulation_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testCreateFolder() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Manipulation_Decorator_LogTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testCreateFolder() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_Acl_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testHasAclSupport() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_Acl_CacheTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testInitGetAcl() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_Activesync_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testGetEmptyActiveSync() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_ActiveSync_CacheTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testInitActiveSync() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_List_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testListTypes() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_List_Cache_SynchronizationTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testSynchronizeNamespace() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_List_CacheTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testListTypes() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_List_DefaultsTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testMarkCompleteIsComplete() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_Share_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testGetDescription() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php +@@ -26,7 +26,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Query_Share_CacheTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testInitDescription() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Synchronization_BaseTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testSynchronize() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_Synchronization_Decorator_LogTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testRegisterListener() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_List_ToolsTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testManipulation() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/MimeTypeTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/MimeTypeTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/MimeTypeTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Object_MimeTypeTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + /** + * @dataProvider getObjectAndMimeTypes +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Object_Writer_FormatTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testLoad() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Object_Writer_RawTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testLoad() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_ObjectTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function setUp() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Synchronization_OncePerSessionTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testSynchronizeListReturn() + { +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +@@ -28,7 +28,7 @@ + * @link http://pear.horde.org/index.php?package=Kolab_Storage + */ + class Horde_Kolab_Storage_Unit_Synchronization_TimeBasedTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + public function testSynchronizeListReturn() + { diff -pruN 2.2.3-1/debian/patches/0002-phpunit-deprecated-getMock.patch 2.2.3-1ubuntu1/debian/patches/0002-phpunit-deprecated-getMock.patch --- 2.2.3-1/debian/patches/0002-phpunit-deprecated-getMock.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/patches/0002-phpunit-deprecated-getMock.patch 2018-02-23 03:50:20.000000000 +0000 @@ -0,0 +1,2038 @@ +Description: replace usage of PHPUnit's deprecated/removed getMock method +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/ModifiedTest.php +@@ -40,7 +40,7 @@ extends PHPUnit\Framework\TestCase + ); + $object = new Horde_Kolab_Storage_Object(); + $object->setDriver($driver); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/ComponentTest/Data/Object/Message/NewTest.php +@@ -38,7 +38,7 @@ extends PHPUnit\Framework\TestCase + $factory + ); + +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/TestCase.php +@@ -61,8 +61,8 @@ extends PHPUnit\Framework\TestCase + $driver, + new Horde_Kolab_Storage_QuerySet_Uncached($factory), + $factory, +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + $params + ); + } +@@ -82,7 +82,7 @@ extends PHPUnit\Framework\TestCase + new Horde_Kolab_Storage_QuerySet_Cached($factory, array(), $cache), + $factory, + $cache, +- $this->getMock('Horde_Log_Logger') ++ $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + } + +@@ -537,7 +537,7 @@ extends PHPUnit\Framework\TestCase + array( + 'driver' => 'mock', + 'params' => $data, +- 'logger' => $this->getMock('Horde_Log_Logger'), ++ 'logger' => $this->getMockBuilder('Horde_Log_Logger')->getMock(), + 'history_prefix_generator' => new Horde_Kolab_Storage_Stub_HistoryPrefix() + ), + $params +@@ -570,7 +570,7 @@ extends PHPUnit\Framework\TestCase + protected function getMockDriverList($factory = null) + { + $factory = $this->completeFactory($factory); +- $this->mockDriver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->mockDriver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + return new Horde_Kolab_Storage_List_Base( + $this->mockDriver, + new Horde_Kolab_Storage_Factory() +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Data/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Data/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Data/Decorator/LogTest.php +@@ -33,7 +33,7 @@ extends Horde_Kolab_Storage_TestCase + public function testDelete() + { + $list = new Horde_Kolab_Storage_Data_Decorator_Log( +- $this->getMock('Horde_Kolab_Storage_Data'), ++ $this->getMockBuilder('Horde_Kolab_Storage_Data')->getMock(), + $this->getMockLogger() + ); + $list->delete('x'); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/LogTest.php +@@ -94,8 +94,8 @@ extends Horde_Kolab_Storage_TestCase + + public function testCreateFolderLog() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +@@ -110,8 +110,8 @@ extends Horde_Kolab_Storage_TestCase + + public function testDeleteFolderLog() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +@@ -126,8 +126,8 @@ extends Horde_Kolab_Storage_TestCase + + public function testRenameFolderLog() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +@@ -142,40 +142,40 @@ extends Horde_Kolab_Storage_TestCase + + public function testCreateFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('create') + ->with('INBOX/Test'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $log = new Horde_Kolab_Storage_Driver_Decorator_Log($driver, $logger); + $log->create('INBOX/Test'); + } + + public function testDeleteFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('delete') + ->with('INBOX/Test'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $log = new Horde_Kolab_Storage_Driver_Decorator_Log($driver, $logger); + $log->delete('INBOX/Test'); + } + + public function testRenameFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('rename') + ->with('INBOX/Test', 'FOO'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $log = new Horde_Kolab_Storage_Driver_Decorator_Log($driver, $logger); + $log->rename('INBOX/Test', 'FOO'); + } + + public function testSetAclLogsEntry() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('setAcl') + ->with('a', 'b', 'c'); +@@ -189,7 +189,7 @@ extends Horde_Kolab_Storage_TestCase + + public function testDeleteAclLogsEntry() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('deleteAcl') + ->with('a', 'b'); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/Decorator/TimerTest.php +@@ -108,7 +108,7 @@ extends Horde_Kolab_Storage_TestCase + + public function testCreateLogsEntry() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('create') + ->with('a'); +@@ -123,7 +123,7 @@ extends Horde_Kolab_Storage_TestCase + + public function testSetAclLogsEntry() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('setAcl') + ->with('a', 'b', 'c'); +@@ -138,7 +138,7 @@ extends Horde_Kolab_Storage_TestCase + + public function testDeleteAclLogsEntry() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('deleteAcl') + ->with('a', 'b'); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/ImapTest.php +@@ -76,7 +76,7 @@ extends PHPUnit\Framework\TestCase + + private function _getNamespaceMock() + { +- $imap = $this->getMock('Horde_Imap_Client_Socket', array(), array(), '', false, false); ++ $imap = $this->createMock('Horde_Imap_Client_Socket'); + $imap->expects($this->once()) + ->method('queryCapability') + ->with('NAMESPACE') +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Driver/PearTest.php +@@ -76,7 +76,7 @@ extends PHPUnit\Framework\TestCase + + private function _getNamespaceMock() + { +- $imap = $this->getMock('Net_IMAP', array('hasCapability', 'getNameSpace'), array(), '', false, false); ++ $imap = $this->createMock('Net_IMAP'); + $imap->expects($this->once()) + ->method('hasCapability') + ->with('NAMESPACE') +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/FactoryTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/FactoryTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/FactoryTest.php +@@ -32,7 +32,7 @@ extends Horde_Kolab_Storage_TestCase + { + public function testCreationFromParams() + { +- $factory = new Horde_Kolab_Storage_Factory(array('driver' => 'mock', 'logger' => $this->getMock('Horde_Log_Logger'))); ++ $factory = new Horde_Kolab_Storage_Factory(array('driver' => 'mock', 'logger' => $this->getMockBuilder('Horde_Log_Logger')->getMock())); + $this->assertInstanceOf( + 'Horde_Kolab_Storage', + $factory->create() +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/BaseTest.php +@@ -157,7 +157,7 @@ extends Horde_Kolab_Storage_TestCase + + private function _getListMock($data = array()) + { +- $query = $this->getMock('Horde_Kolab_Storage_List_Query_List'); ++ $query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_List')->getMock(); + $query->expects($this->any()) + ->method('folderData') + ->will($this->returnValue($data)); +@@ -174,8 +174,8 @@ extends Horde_Kolab_Storage_TestCase + { + $this->markTestIncomplete('Currently broken'); + $GLOBALS['language'] = 'de_DE'; +- $storage = $this->getMock('Horde_Kolab_Storage', array(), array(), '', false, false); +- $connection = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $storage = $this->createMock('Horde_Kolab_Storage'); ++ $connection = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $connection->expects($this->once()) + ->method('getNamespace') + ->will($this->returnValue(new Horde_Kolab_Storage_Driver_Namespace_Fixed())); +@@ -284,7 +284,7 @@ extends Horde_Kolab_Storage_TestCase + public function testTriggerOwn() + { + $this->markTestIncomplete('Currently broken'); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder', array('triggerUrl')); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->setMethods(array('triggerUrl'))->getMock(); + $folder->expects($this->once()) + ->method('triggerUrl') + ->with($this->equalTo('https://fb.example.org/freebusy/trigger/wrobel@example.org/Kalender.pfb')); +@@ -301,7 +301,7 @@ extends Horde_Kolab_Storage_TestCase + public function testTriggerForeign() + { + $this->markTestIncomplete('Currently broken'); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder', array('triggerUrl')); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->setMethods(array('triggerUrl'))->getMock(); + $folder->expects($this->exactly(2)) + ->method('triggerUrl') + ->with($this->equalTo('https://fb.example.org/freebusy/trigger/test@example.org/Kalender.pfb')); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/DataTest.php +@@ -86,15 +86,15 @@ extends PHPUnit\Framework\TestCase + + private function _getData() + { +- $type = $this->getMock('Horde_Kolab_Storage_Folder_Type', array(), array('a')); ++ $type = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Type')->setConstructorArgs(array('a'))->getMock(); + $type->expects($this->once()) + ->method('getType') + ->will($this->returnValue('test')); + $type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/NamespaceTest.php +@@ -32,8 +32,8 @@ extends Horde_Kolab_Storage_TestCase + public function setUp() + { + parent::setUp(); +- $this->_storage = $this->getMock('Horde_Kolab_Storage', array(), array(), '', false, false); +- $this->_connection = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->_storage = $this->createMock('Horde_Kolab_Storage'); ++ $this->_connection = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + } + + public function testTitleForPersonalNS() +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Folder/Stamp/UidsTest.php +@@ -71,7 +71,7 @@ extends Horde_Kolab_Storage_TestCase + */ + public function testInvalidStampTypeForReset() + { +- $this->_getStamp()->isReset($this->getMock('Horde_Kolab_Storage_Folder_Stamp')); ++ $this->_getStamp()->isReset($this->getMockBuilder('Horde_Kolab_Storage_Folder_Stamp')->getMock()); + } + + public function testSerialize() +@@ -164,7 +164,7 @@ extends Horde_Kolab_Storage_TestCase + */ + public function testInvalidStampType() + { +- $this->_getStamp()->getChanges($this->getMock('Horde_Kolab_Storage_Folder_Stamp')); ++ $this->_getStamp()->getChanges($this->getMockBuilder('Horde_Kolab_Storage_Folder_Stamp')->getMock()); + } + + public function testToString() +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/BaseTest.php +@@ -32,7 +32,7 @@ extends PHPUnit\Framework\TestCase + { + public function testCreateFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('create') + ->with('TEST'); +@@ -42,7 +42,7 @@ extends PHPUnit\Framework\TestCase + + public function testCreateFolderWithType() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('create') + ->with('TEST'); +@@ -55,7 +55,7 @@ extends PHPUnit\Framework\TestCase + + public function testDeleteFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('delete') + ->with('TEST'); +@@ -65,7 +65,7 @@ extends PHPUnit\Framework\TestCase + + public function testRenameFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('rename') + ->with('FOO', 'BAR'); +@@ -75,9 +75,9 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterCreateFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Base($driver); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Manipulation_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation_Listener')->getMock(); + $listener->expects($this->once()) + ->method('updateAfterCreateFolder') + ->with('TEST'); +@@ -87,9 +87,9 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterCreateFolderWithType() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Base($driver); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Manipulation_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation_Listener')->getMock(); + $listener->expects($this->once()) + ->method('updateAfterCreateFolder') + ->with('TEST', 'event'); +@@ -99,9 +99,9 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterDeleteFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Base($driver); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Manipulation_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation_Listener')->getMock(); + $listener->expects($this->once()) + ->method('updateAfterDeleteFolder') + ->with('TEST'); +@@ -111,9 +111,9 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterRenameFolder() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Base($driver); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Manipulation_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation_Listener')->getMock(); + $listener->expects($this->once()) + ->method('updateAfterRenameFolder') + ->with('FOO', 'BAR'); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Manipulation/Decorator/LogTest.php +@@ -32,56 +32,56 @@ extends PHPUnit\Framework\TestCase + { + public function testCreateFolder() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); + $base->expects($this->once()) + ->method('createFolder') + ->with('TEST'); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $manipulation->createFolder('TEST'); + } + + public function testDeleteFolder() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); + $base->expects($this->once()) + ->method('deleteFolder') + ->with('TEST'); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $manipulation->deleteFolder('TEST'); + } + + public function testRenameFolder() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); + $base->expects($this->once()) + ->method('renameFolder') + ->with('FOO', 'BAR'); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $manipulation->renameFolder('FOO', 'BAR'); + } + + public function testRegisterListener() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); + $base->expects($this->once()) + ->method('registerListener'); + $manipulation = new Horde_Kolab_Storage_List_Manipulation_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Manipulation_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation_Listener')->getMock(); + $manipulation->registerListener($listener); + } + + public function testCreateFolderLog() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +@@ -98,8 +98,8 @@ extends PHPUnit\Framework\TestCase + + public function testDeleteFolderLog() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +@@ -116,8 +116,8 @@ extends PHPUnit\Framework\TestCase + + public function testRenameFolderLog() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Manipulation'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Manipulation')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->exactly(2)) + ->method('debug') + ->with( +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/BaseTest.php +@@ -189,7 +189,7 @@ extends PHPUnit\Framework\TestCase + + private function _getAcl($has_support = true) + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $this->driver->expects($this->any()) + ->method('hasAclSupport') + ->will($this->returnValue($has_support)); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Acl/CacheTest.php +@@ -30,8 +30,8 @@ extends PHPUnit\Framework\TestCase + { + public function testInitGetAcl() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_Acl'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_Acl')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $this->cache->expects($this->exactly(3)) + ->method('hasQuery') + ->with( +@@ -340,8 +340,8 @@ extends PHPUnit\Framework\TestCase + + private function _getAcl() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_Acl'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_Acl')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + return new Horde_Kolab_Storage_List_Query_Acl_Cache( + $this->query, $this->cache + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/BaseTest.php +@@ -79,7 +79,7 @@ extends PHPUnit\Framework\TestCase + + private function _getActivesync() + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + return new Horde_Kolab_Storage_List_Query_ActiveSync_Base( + $this->driver + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/ActiveSync/CacheTest.php +@@ -30,8 +30,8 @@ extends PHPUnit\Framework\TestCase + { + public function testInitActiveSync() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_ActiveSync'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_ActiveSync')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $this->cache->expects($this->once()) + ->method('hasQuery') + ->with(Horde_Kolab_Storage_List_Query_ActiveSync_Cache::ACTIVE_SYNC) +@@ -170,8 +170,8 @@ extends PHPUnit\Framework\TestCase + + private function _getActivesync() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_ActiveSync'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_ActiveSync')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + return new Horde_Kolab_Storage_List_Query_ActiveSync_Cache( + $this->query, $this->cache + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/BaseTest.php +@@ -84,8 +84,8 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +@@ -157,8 +157,8 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +@@ -228,8 +228,8 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(false)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +@@ -297,7 +297,7 @@ extends PHPUnit\Framework\TestCase + $this->driver->expects($this->once()) + ->method('listFolders') + ->will($this->returnValue(array('INBOX/Test'))); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +@@ -328,8 +328,8 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $ns->expects($this->once()) + ->method('getType') + ->will($this->returnValue(Horde_Kolab_Storage_Folder_Namespace::PERSONAL)); +@@ -400,7 +400,7 @@ extends PHPUnit\Framework\TestCase + + public function testSetDefaultResetPreviousDefault() + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $this->types = new Horde_Kolab_Storage_Folder_Types(); + $list = new Horde_Kolab_Storage_List_Query_List_Base( + $this->driver, +@@ -434,8 +434,8 @@ extends PHPUnit\Framework\TestCase + ) + ); + +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $ns->expects($this->once()) + ->method('getType') + ->will($this->returnValue(Horde_Kolab_Storage_Folder_Namespace::PERSONAL)); +@@ -467,11 +467,11 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); + $ns->expects($this->once()) + ->method('getType') + ->will($this->returnValue(Horde_Kolab_Storage_Folder_Namespace::PERSONAL)); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('matchNamespace') + ->with('INBOX/Test') +@@ -506,8 +506,8 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $ns->expects($this->once()) + ->method('getType') + ->will($this->returnValue(Horde_Kolab_Storage_Folder_Namespace::PERSONAL)); +@@ -541,11 +541,11 @@ extends PHPUnit\Framework\TestCase + $this->mock_type->expects($this->once()) + ->method('isDefault') + ->will($this->returnValue(true)); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); + $ns->expects($this->once()) + ->method('getType') + ->will($this->returnValue(Horde_Kolab_Storage_Folder_Namespace::PERSONAL)); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->once()) + ->method('getOwner') + ->with('INBOX/Test') +@@ -565,9 +565,9 @@ extends PHPUnit\Framework\TestCase + + private function _getList() + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $this->types = $this->getMock('Horde_Kolab_Storage_Folder_Types'); +- $this->mock_type = $this->getMock('Horde_Kolab_Storage_Folder_Type', array(), array('event.default')); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $this->types = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Types')->getMock(); ++ $this->mock_type = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Type')->setConstructorArgs(array('event.default'))->getMock(); + return new Horde_Kolab_Storage_List_Query_List_Base( + $this->driver, + $this->types, +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/Cache/SynchronizationTest.php +@@ -118,8 +118,8 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterCreateFolderExit() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(false)); +@@ -137,8 +137,8 @@ extends PHPUnit\Framework\TestCase + public function testUpdateAfterCreateFolder() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -169,8 +169,8 @@ extends PHPUnit\Framework\TestCase + public function testUpdateAfterCreateFolderWithType() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -200,8 +200,8 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterDeleteFolderExit() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(false)); +@@ -219,8 +219,8 @@ extends PHPUnit\Framework\TestCase + public function testUpdateAfterDeleteFolder() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -250,8 +250,8 @@ extends PHPUnit\Framework\TestCase + + public function testUpdateAfterRenameFolderExit() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(false)); +@@ -269,8 +269,8 @@ extends PHPUnit\Framework\TestCase + public function testUpdateAfterRenameFolder() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -300,8 +300,8 @@ extends PHPUnit\Framework\TestCase + + private function _getSynchronization() + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $this->driver->expects($this->once()) + ->method('listFolders') + ->will($this->returnValue(array('INBOX/Test'))); +@@ -309,8 +309,8 @@ extends PHPUnit\Framework\TestCase + ->method('listAnnotation') + ->with(Horde_Kolab_Storage_List_Query_List_Base::ANNOTATION_FOLDER_TYPE) + ->will($this->returnValue(array('INBOX/Test' => 'a.default'))); +- $ns = $this->getMock('Horde_Kolab_Storage_Folder_Namespace_Element', array(), array('A', 'B', 'C')); +- $namespace = $this->getMock('Horde_Kolab_Storage_Folder_Namespace', array(), array(array())); ++ $ns = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace_Element')->setConstructorArgs(array('A', 'B', 'C'))->getMock(); ++ $namespace = $this->getMockBuilder('Horde_Kolab_Storage_Folder_Namespace')->setConstructorArgs(array(array()))->getMock(); + $namespace->expects($this->exactly(2)) + ->method('getOwner') + ->with('INBOX/Test') +@@ -353,20 +353,20 @@ extends PHPUnit\Framework\TestCase + public function testGetDuplicateDefaults() + { + $duplicates = array('a' => 'b'); +- $defaults = $this->getMock('Horde_Kolab_Storage_List_Query_List_Defaults_Bail'); ++ $defaults = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_List_Defaults_Bail')->getMock(); + $defaults->expects($this->once()) + ->method('getDuplicates') + ->will($this->returnValue($duplicates)); + $synchronization = new Horde_Kolab_Storage_List_Query_List_Cache_Synchronization( +- $this->getMock('Horde_Kolab_Storage_Driver'), new Horde_Kolab_Storage_Folder_Types(), $defaults ++ $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(), new Horde_Kolab_Storage_Folder_Types(), $defaults + ); + $this->assertEquals($duplicates, $synchronization->getDuplicateDefaults()); + } + + public function testSetDefaultExit() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(false)); +@@ -384,7 +384,7 @@ extends PHPUnit\Framework\TestCase + public function testSetDefault() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('setAnnotation') + ->with( +@@ -393,7 +393,7 @@ extends PHPUnit\Framework\TestCase + 'contact.default' + ); + +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -432,8 +432,8 @@ extends PHPUnit\Framework\TestCase + */ + public function testSetDefaultFailsWithoutPreviousType() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array('hasNamespace', 'getFolderTypes'), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -460,8 +460,8 @@ extends PHPUnit\Framework\TestCase + */ + public function testSetDefaultFailsOutsidePersonalNamespace() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array('hasNamespace', 'getFolderTypes'), array(), '', false, false); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->once()) + ->method('hasNamespace') + ->will($this->returnValue(true)); +@@ -483,7 +483,7 @@ extends PHPUnit\Framework\TestCase + public function testSetDefaultResetPreviousDefault() + { + $namespace = new Horde_Kolab_Storage_Folder_Namespace_Fixed('test'); +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->exactly(2)) + ->method('setAnnotation') + ->with( +@@ -498,7 +498,7 @@ extends PHPUnit\Framework\TestCase + ) + ); + +- $cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $cache->expects($this->exactly(2)) + ->method('hasNamespace') + ->will($this->returnValue(true)); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/CacheTest.php +@@ -421,8 +421,8 @@ extends PHPUnit\Framework\TestCase + + private function _getList() + { +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); +- $this->sync = $this->getMock('Horde_Kolab_Storage_List_Query_List_Cache_Synchronization', array(), array(), '', false, false); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); ++ $this->sync = $this->createMock('Horde_Kolab_Storage_List_Query_List_Cache_Synchronization'); + return new Horde_Kolab_Storage_List_Query_List_Cache( + $this->sync, $this->cache + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/List/DefaultsTest.php +@@ -86,7 +86,7 @@ extends PHPUnit\Framework\TestCase + + public function testLogOnDoubleDefault() + { +- $logger = $this->getMock('Horde_Log_Logger', array('err')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('err'))->getMock(); + $logger->expects($this->once()) + ->method('err') + ->with('Both folders "FooA" and "FooC" of owner "Mr. Foo" are marked as default folder of type "TypeFOO"!'); +@@ -99,7 +99,7 @@ extends PHPUnit\Framework\TestCase + + public function testDuplicates() + { +- $logger = $this->getMock('Horde_Log_Logger', array('err')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('err'))->getMock(); + $log = new Horde_Kolab_Storage_List_Query_List_Defaults_Log( + $logger + ); +@@ -117,7 +117,7 @@ extends PHPUnit\Framework\TestCase + + public function testTriplicate() + { +- $logger = $this->getMock('Horde_Log_Logger', array('err')); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('err'))->getMock(); + $log = new Horde_Kolab_Storage_List_Query_List_Defaults_Log( + $logger + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/BaseTest.php +@@ -82,7 +82,7 @@ extends PHPUnit\Framework\TestCase + + private function _getShare() + { +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + return new Horde_Kolab_Storage_List_Query_Share_Base( + $this->driver + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Query/Share/CacheTest.php +@@ -30,8 +30,8 @@ extends PHPUnit\Framework\TestCase + { + public function testInitDescription() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_Share'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_Share')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $this->cache->expects($this->once()) + ->method('hasQuery') + ->with(Horde_Kolab_Storage_List_Query_Share_Cache::DESCRIPTIONS) +@@ -93,8 +93,8 @@ extends PHPUnit\Framework\TestCase + + public function testInitParameter() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_Share'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_Share')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + $this->cache->expects($this->once()) + ->method('hasLongTerm') + ->with(Horde_Kolab_Storage_List_Query_Share_Cache::PARAMETERS) +@@ -296,8 +296,8 @@ extends PHPUnit\Framework\TestCase + + private function _getShare() + { +- $this->query = $this->getMock('Horde_Kolab_Storage_List_Query_Share'); +- $this->cache = $this->getMock('Horde_Kolab_Storage_List_Cache', array(), array(), '', false, false); ++ $this->query = $this->getMockBuilder('Horde_Kolab_Storage_List_Query_Share')->getMock(); ++ $this->cache = $this->createMock('Horde_Kolab_Storage_List_Cache'); + return new Horde_Kolab_Storage_List_Query_Share_Cache( + $this->query, $this->cache + ); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/BaseTest.php +@@ -33,7 +33,7 @@ extends PHPUnit\Framework\TestCase + public function testSynchronize() + { + $synchronization = new Horde_Kolab_Storage_List_Synchronization_Base(); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Synchronization_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization_Listener')->getMock(); + $listener->expects($this->once()) + ->method('synchronize'); + $synchronization->registerListener($listener); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/Synchronization/Decorator/LogTest.php +@@ -32,31 +32,31 @@ extends PHPUnit\Framework\TestCase + { + public function testRegisterListener() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Synchronization'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock(); + $base->expects($this->once()) + ->method('registerListener'); + $synchronization = new Horde_Kolab_Storage_List_Synchronization_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); +- $listener = $this->getMock('Horde_Kolab_Storage_List_Synchronization_Listener'); ++ $listener = $this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization_Listener')->getMock(); + $synchronization->registerListener($listener); + } + + public function testSynchronize() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Synchronization'); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock(); + $base->expects($this->once()) + ->method('synchronize'); + $synchronization = new Horde_Kolab_Storage_List_Synchronization_Decorator_Log( +- $base, $this->getMock('Horde_Log_Logger') ++ $base, $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $synchronization->synchronize(); + } + + public function testSynchronizationLog() + { +- $base = $this->getMock('Horde_Kolab_Storage_List_Synchronization'); +- $logger = $this->getMock('Horde_Log_Logger', array('debug')); ++ $base = $this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock(); ++ $logger = $this->getMockBuilder('Horde_Log_Logger')->setMethods(array('debug'))->getMock(); + $logger->expects($this->once()) + ->method('debug') + ->with('Synchronized the Kolab folder list!'); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/List/ToolsTest.php +@@ -34,8 +34,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array() + ); + $this->assertInstanceOf( +@@ -48,8 +48,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'log' => array('debug') + ) +@@ -64,8 +64,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'log' => array('list_manipulation') + ) +@@ -80,8 +80,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array() + ); + $this->assertInstanceOf( +@@ -94,8 +94,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'log' => array('debug') + ) +@@ -110,8 +110,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'log' => array('list_synchronization') + ) +@@ -129,8 +129,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array() + ); + $tools->getQuery('TEST'); +@@ -143,8 +143,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array() + ); + $tools->getQuery(Horde_Kolab_Storage_List_Tools::QUERY_SHARE); +@@ -154,8 +154,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array() + ); + $tools->getQuery(Horde_Kolab_Storage_List_Tools::QUERY_BASE); +@@ -165,8 +165,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array('queries' => array(Horde_Kolab_Storage_List_Tools::QUERY_BASE)) + ); + $this->assertInstanceOf( +@@ -179,8 +179,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array('queries' => array(Horde_Kolab_Storage_List_Tools::QUERY_BASE)) + ); + $this->assertInstanceOf( +@@ -192,8 +192,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'queries' => array( + 'list' => array( +@@ -215,8 +215,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'queries' => array( + 'list' => array( +@@ -236,8 +236,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'queries' => array( + 'list' => array( +@@ -258,8 +258,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'queries' => array( + 'list' => array( +@@ -278,8 +278,8 @@ extends PHPUnit\Framework\TestCase + { + $tools = new Horde_Kolab_Storage_List_Tools( + $this->_getDriver(), +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger'), ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock(), + array( + 'queries' => array( + 'list' => array( +@@ -304,8 +304,8 @@ extends PHPUnit\Framework\TestCase + ->will($this->returnValue('ID')); + $tools = new Horde_Kolab_Storage_List_Tools( + $driver, +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger') ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $this->assertEquals('ID', $tools->getId()); + } +@@ -318,15 +318,15 @@ extends PHPUnit\Framework\TestCase + ->will($this->returnValue('NAMESPACE')); + $tools = new Horde_Kolab_Storage_List_Tools( + $driver, +- $this->getMock('Horde_Kolab_Storage_Cache', array(), array(), '', false, false), +- $this->getMock('Horde_Log_Logger') ++ $this->createMock('Horde_Kolab_Storage_Cache'), ++ $this->getMockBuilder('Horde_Log_Logger')->getMock() + ); + $this->assertEquals('NAMESPACE', $tools->getNamespace()); + } + + private function _getDriver() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('getParameters') + ->will( +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/FormatTest.php +@@ -36,12 +36,12 @@ extends PHPUnit\Framework\TestCase + $data = "\n"; + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); +- $format = $this->getMock('Horde_Kolab_Format'); ++ $format = $this->getMockBuilder('Horde_Kolab_Format')->getMock(); + $format->expects($this->once()) + ->method('load') + ->with($content) + ->will($this->returnValue($array)); +- $factory = $this->getMock('Horde_Kolab_Format_Factory'); ++ $factory = $this->getMockBuilder('Horde_Kolab_Format_Factory')->getMock(); + $factory->expects($this->once()) + ->method('create') + ->with('Xml', 'event', array()) +@@ -49,7 +49,7 @@ extends PHPUnit\Framework\TestCase + $raw = new Horde_Kolab_Storage_Object_Writer_Format( + $factory + ); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('setData') + ->with($array); +@@ -64,12 +64,12 @@ extends PHPUnit\Framework\TestCase + $data = "\n"; + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); +- $format = $this->getMock('Horde_Kolab_Format'); ++ $format = $this->getMockBuilder('Horde_Kolab_Format')->getMock(); + $format->expects($this->once()) + ->method('load') + ->with($content) + ->will($this->throwException(new Horde_Kolab_Format_Exception())); +- $factory = $this->getMock('Horde_Kolab_Format_Factory'); ++ $factory = $this->getMockBuilder('Horde_Kolab_Format_Factory')->getMock(); + $factory->expects($this->once()) + ->method('create') + ->with('Xml', 'event', array()) +@@ -77,7 +77,7 @@ extends PHPUnit\Framework\TestCase + $raw = new Horde_Kolab_Storage_Object_Writer_Format( + $factory + ); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('setContent') + ->with($content); +@@ -94,12 +94,12 @@ extends PHPUnit\Framework\TestCase + $data = "\n"; + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); +- $format = $this->getMock('Horde_Kolab_Format'); ++ $format = $this->getMockBuilder('Horde_Kolab_Format')->getMock(); + $format->expects($this->once()) + ->method('save') + ->with($array, array('previous' => 'previous')) + ->will($this->returnValue($content)); +- $factory = $this->getMock('Horde_Kolab_Format_Factory'); ++ $factory = $this->getMockBuilder('Horde_Kolab_Format_Factory')->getMock(); + $factory->expects($this->once()) + ->method('create') + ->with('Xml', 'event', array()) +@@ -107,7 +107,7 @@ extends PHPUnit\Framework\TestCase + $raw = new Horde_Kolab_Storage_Object_Writer_Format( + $factory + ); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('getData') + ->will($this->returnValue($array)); +@@ -132,12 +132,12 @@ extends PHPUnit\Framework\TestCase + $data = "\n"; + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); +- $format = $this->getMock('Horde_Kolab_Format'); ++ $format = $this->getMockBuilder('Horde_Kolab_Format')->getMock(); + $format->expects($this->once()) + ->method('save') + ->with($array, array('previous' => 'previous')) + ->will($this->throwException(new Horde_Kolab_Format_Exception())); +- $factory = $this->getMock('Horde_Kolab_Format_Factory'); ++ $factory = $this->getMockBuilder('Horde_Kolab_Format_Factory')->getMock(); + $factory->expects($this->once()) + ->method('create') + ->with('Xml', 'event', array()) +@@ -145,7 +145,7 @@ extends PHPUnit\Framework\TestCase + $raw = new Horde_Kolab_Storage_Object_Writer_Format( + $factory + ); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('getData') + ->will($this->returnValue($array)); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Object/Writer/RawTest.php +@@ -36,7 +36,7 @@ extends PHPUnit\Framework\TestCase + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); + $raw = new Horde_Kolab_Storage_Object_Writer_Raw(); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('setContent') + ->with($content); +@@ -49,7 +49,7 @@ extends PHPUnit\Framework\TestCase + $content = fopen('php://temp', 'r+'); + fwrite($content, $data); + $raw = new Horde_Kolab_Storage_Object_Writer_Raw(); +- $object = $this->getMock('Horde_Kolab_Storage_Object'); ++ $object = $this->getMockBuilder('Horde_Kolab_Storage_Object')->getMock(); + $object->expects($this->once()) + ->method('getContent') + ->will($this->returnValue($content)); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/ObjectTest.php +@@ -32,8 +32,8 @@ extends PHPUnit\Framework\TestCase + { + public function setUp() + { +- $this->folder = $this->getMock('Horde_Kolab_Storage_Folder'); +- $this->driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $this->folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); ++ $this->driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + } + + /** +@@ -41,14 +41,14 @@ extends PHPUnit\Framework\TestCase + */ + public function testInvalidInitialStructure() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $object->load('1', $this->folder, $data, new Horde_Mime_Part()); + } + + public function testObjectType() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $this->folder->expects($this->once()) + ->method('getType') +@@ -68,9 +68,9 @@ extends PHPUnit\Framework\TestCase + + public function testObjectTypeDeviatesFromFolderType() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $headers->method('__call') + ->with('getValue', array('X-Kolab-Type')) + ->will($this->returnValue('application/x-vnd.kolab.note')); +@@ -96,9 +96,9 @@ extends PHPUnit\Framework\TestCase + + public function testMissingKolabPart() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $headers->method('__call') + ->with('getValue', array('X-Kolab-Type')) + ->will($this->returnValue('application/x-vnd.kolab.note')); +@@ -132,9 +132,9 @@ extends PHPUnit\Framework\TestCase + + public function testObjectRetainsHeadersIfLoaded() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $headers->method('__call') + ->with('getValue', array('X-Kolab-Type')) + ->will($this->returnValue('application/x-vnd.kolab.note')); +@@ -160,9 +160,9 @@ extends PHPUnit\Framework\TestCase + + public function testObjectFetchesHeadersOnRequest() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $this->folder->expects($this->once()) + ->method('getType') + ->will($this->returnValue('event')); +@@ -189,9 +189,9 @@ extends PHPUnit\Framework\TestCase + $content = fopen('php://temp', 'r+'); + fwrite($content, $data_string); + +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $this->folder->expects($this->once()) + ->method('getType') + ->will($this->returnValue('event')); +@@ -221,8 +221,8 @@ extends PHPUnit\Framework\TestCase + { + $object = new Horde_Kolab_Storage_Object(); + $object->create( +- $this->getMock('Horde_Kolab_Storage_Folder'), +- $this->getMock('Horde_Kolab_Storage_Object_Writer'), ++ $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(), ++ $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(), + 'event' + ); + } +@@ -320,9 +320,9 @@ extends PHPUnit\Framework\TestCase + + public function testSerializeUnserializeRetainsErrors() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $headers->method('__call') + ->with('getValue', array('X-Kolab-Type')) + ->will($this->returnValue('application/x-vnd.kolab.note')); +@@ -353,9 +353,9 @@ extends PHPUnit\Framework\TestCase + + public function testSerializeUnserializeRetainsType() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $this->folder->expects($this->once()) + ->method('getType') + ->will($this->returnValue('event')); +@@ -376,9 +376,9 @@ extends PHPUnit\Framework\TestCase + + public function testSerializeUnserializeRetainsBackendIdAndFolder() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $this->folder->expects($this->once()) + ->method('getType') + ->will($this->returnValue('event')); +@@ -408,7 +408,7 @@ extends PHPUnit\Framework\TestCase + $content = fopen('php://temp', 'r+'); + fwrite($content, $data_string); + +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $this->folder->expects($this->once()) + ->method('getType') +@@ -440,7 +440,7 @@ extends PHPUnit\Framework\TestCase + */ + public function testFetchingContentsFailsWithMissingFolder() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $this->folder->expects($this->once()) + ->method('getType') +@@ -463,7 +463,7 @@ extends PHPUnit\Framework\TestCase + */ + public function testFetchingContentsFailsWithMissingBackendId() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $this->folder->expects($this->once()) + ->method('getType') +@@ -486,8 +486,8 @@ extends PHPUnit\Framework\TestCase + */ + public function testFetchingContentsFailsWithMissingMimeId() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $this->folder->expects($this->once()) + ->method('getType') +@@ -516,11 +516,11 @@ extends PHPUnit\Framework\TestCase + $content = fopen('php://temp', 'r+'); + fwrite($content, $data_string); + +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $data->expects($this->once()) + ->method('load'); +- $headers = $this->getMock('Horde_Mime_Headers'); ++ $headers = $this->getMockBuilder('Horde_Mime_Headers')->getMock(); + $this->folder->expects($this->once()) + ->method('getType') + ->will($this->returnValue('event')); +@@ -545,11 +545,11 @@ extends PHPUnit\Framework\TestCase + public function testMimeEnvelope() + { + $driver = new Horde_Kolab_Storage_Stub_Driver('user'); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +- $writer = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $writer = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $object->setDriver($driver); + $object->create($folder, $writer, 'event'); +@@ -561,11 +561,11 @@ extends PHPUnit\Framework\TestCase + setlocale(LC_MESSAGES, 'C'); + + $driver = new Horde_Kolab_Storage_Stub_Driver('user'); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +- $writer = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $writer = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $object->setData(array('uid' => 'UID')); + $object->setDriver($driver); +@@ -597,18 +597,18 @@ extends PHPUnit\Framework\TestCase + + public function testSavedBackendId() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('appendMessage') + ->will($this->returnValue(1001)); + $driver->expects($this->once()) + ->method('fetchHeaders') + ->with('INBOX', 1001); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +- $writer = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $writer = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $object->setData(array('uid' => 'UID')); + $object->setDriver($driver); +@@ -621,15 +621,15 @@ extends PHPUnit\Framework\TestCase + */ + public function testDriverException() + { +- $driver = $this->getMock('Horde_Kolab_Storage_Driver'); ++ $driver = $this->getMockBuilder('Horde_Kolab_Storage_Driver')->getMock(); + $driver->expects($this->once()) + ->method('appendMessage') + ->will($this->returnValue(false)); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +- $writer = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $writer = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $object = new Horde_Kolab_Storage_Object(); + $object->setData(array('uid' => 'UID')); + $object->setDriver($driver); +@@ -659,7 +659,7 @@ extends PHPUnit\Framework\TestCase + + public function testSave() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $this->driver->expects($this->once()) + ->method('fetchComplete') + ->will( +@@ -699,7 +699,7 @@ extends PHPUnit\Framework\TestCase + */ + public function testSaveException() + { +- $data = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $data = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $this->driver->expects($this->once()) + ->method('fetchComplete') + ->will( +@@ -733,11 +733,11 @@ extends PHPUnit\Framework\TestCase + public function testKolabPart() + { + $driver = new Horde_Kolab_Storage_Stub_Driver('user'); +- $folder = $this->getMock('Horde_Kolab_Storage_Folder'); ++ $folder = $this->getMockBuilder('Horde_Kolab_Storage_Folder')->getMock(); + $folder->expects($this->once()) + ->method('getPath') + ->will($this->returnValue('INBOX')); +- $writer = $this->getMock('Horde_Kolab_Storage_Object_Writer'); ++ $writer = $this->getMockBuilder('Horde_Kolab_Storage_Object_Writer')->getMock(); + $writer->expects($this->once()) + ->method('save') + ->will($this->returnValue('')); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +@@ -33,39 +33,33 @@ extends PHPUnit\Framework\TestCase + public function testSynchronizeListReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $this->assertNull($synchronization->synchronizeList($list)); + } + + public function testListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + } + + public function testListSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['list']['test']); + } +@@ -73,12 +67,10 @@ extends PHPUnit\Framework\TestCase + public function testDuplicateListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $synchronization->synchronizeList($list); + } +@@ -86,18 +78,14 @@ extends PHPUnit\Framework\TestCase + public function testSynchronizeDataReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $this->assertNull($synchronization->synchronizeData($data)); + } + + public function testDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); +@@ -106,9 +94,7 @@ extends PHPUnit\Framework\TestCase + public function testDataSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); +@@ -119,9 +105,7 @@ extends PHPUnit\Framework\TestCase + public function testDuplicateDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +@@ -33,39 +33,33 @@ extends PHPUnit\Framework\TestCase + public function testSynchronizeListReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $this->assertNull($synchronization->synchronizeList($list)); + } + + public function testListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + } + + public function testListSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['list']['test']); + } +@@ -73,12 +67,10 @@ extends PHPUnit\Framework\TestCase + public function testDuplicateListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $synchronization->synchronizeList($list); + } +@@ -86,18 +78,14 @@ extends PHPUnit\Framework\TestCase + public function testSynchronizeDataReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $this->assertNull($synchronization->synchronizeData($data)); + } + + public function testDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); +@@ -106,9 +94,7 @@ extends PHPUnit\Framework\TestCase + public function testDataSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); +@@ -119,9 +105,7 @@ extends PHPUnit\Framework\TestCase + public function testDuplicateDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); +@@ -132,9 +116,7 @@ extends PHPUnit\Framework\TestCase + { + $this->markTestSkipped('Test with embedded "sleep()". Only useful for the development phase.'); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(1, 0); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->exactly(2)) + ->method('synchronize'); + $synchronization->synchronizeData($data); +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/SynchronizationTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/SynchronizationTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/SynchronizationTest.php +@@ -33,39 +33,33 @@ extends Horde_Kolab_Storage_TestCase + public function testSynchronizeListReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $this->assertNull($synchronization->synchronizeList($list)); + } + + public function testListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + } + + public function testListSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['list']['test']); + } +@@ -73,12 +67,10 @@ extends Horde_Kolab_Storage_TestCase + public function testDuplicateListSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $list = $this->getMock( +- 'Horde_Kolab_Storage_List_Tools', array(), array(), '', false, false +- ); ++ $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) + ->method('getListSynchronization') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Storage_List_Synchronization'))); ++ ->will($this->returnValue($this->getMockBuilder('Horde_Kolab_Storage_List_Synchronization')->getMock())); + $synchronization->synchronizeList($list); + $synchronization->synchronizeList($list); + } +@@ -86,18 +78,14 @@ extends Horde_Kolab_Storage_TestCase + public function testSynchronizeDataReturn() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $this->assertNull($synchronization->synchronizeData($data)); + } + + public function testDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); +@@ -106,9 +94,7 @@ extends Horde_Kolab_Storage_TestCase + public function testDataSynchronizationInSession() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('getId') + ->will($this->returnValue('test')); +@@ -119,9 +105,7 @@ extends Horde_Kolab_Storage_TestCase + public function testDuplicateDataSynchronization() + { + $synchronization = new Horde_Kolab_Storage_Synchronization(); +- $data = $this->getMock( +- 'Horde_Kolab_Storage_Data_Base', array(), array(), '', false, false +- ); ++ $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) + ->method('synchronize'); + $synchronization->synchronizeData($data); diff -pruN 2.2.3-1/debian/patches/0003-fix-tests-that-need-a-session.patch 2.2.3-1ubuntu1/debian/patches/0003-fix-tests-that-need-a-session.patch --- 2.2.3-1/debian/patches/0003-fix-tests-that-need-a-session.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/patches/0003-fix-tests-that-need-a-session.patch 2018-02-23 03:50:20.000000000 +0000 @@ -0,0 +1,143 @@ +Description: fix tests that require a session +Author: Matt Coleman +Origin: other +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/TimeBasedTest.php +@@ -30,8 +30,12 @@ + class Horde_Kolab_Storage_Unit_Synchronization_TimeBasedTest + extends PHPUnit\Framework\TestCase + { ++ /** ++ * @runInSeparateProcess ++ */ + public function testSynchronizeListReturn() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -40,8 +44,12 @@ extends PHPUnit\Framework\TestCase + $this->assertNull($synchronization->synchronizeList($list)); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testListSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -50,8 +58,12 @@ extends PHPUnit\Framework\TestCase + $synchronization->synchronizeList($list); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testListSynchronizationInSession() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -64,8 +76,12 @@ extends PHPUnit\Framework\TestCase + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['list']['test']); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDuplicateListSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -82,8 +98,12 @@ extends PHPUnit\Framework\TestCase + $this->assertNull($synchronization->synchronizeData($data)); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDataSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) +@@ -102,8 +122,12 @@ extends PHPUnit\Framework\TestCase + $this->assertTrue(isset($_SESSION['kolab_storage']['synchronization']['data']['test'])); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDuplicateDataSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_TimeBased(); + $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) +Index: php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +=================================================================== +--- php-horde-kolab-storage-2.2.3.orig/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php ++++ php-horde-kolab-storage-2.2.3/Horde_Kolab_Storage-2.2.3/test/Horde/Kolab/Storage/Unit/Synchronization/OncePerSessionTest.php +@@ -40,8 +40,12 @@ extends PHPUnit\Framework\TestCase + $this->assertNull($synchronization->synchronizeList($list)); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testListSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -64,8 +68,12 @@ extends PHPUnit\Framework\TestCase + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['list']['test']); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDuplicateListSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); + $list = $this->createMock('Horde_Kolab_Storage_List_Tools'); + $list->expects($this->once()) +@@ -82,8 +90,12 @@ extends PHPUnit\Framework\TestCase + $this->assertNull($synchronization->synchronizeData($data)); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDataSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); + $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) +@@ -102,8 +114,12 @@ extends PHPUnit\Framework\TestCase + $this->assertTrue($_SESSION['kolab_storage']['synchronization']['data']['test']); + } + ++ /** ++ * @runInSeparateProcess ++ */ + public function testDuplicateDataSynchronization() + { ++ session_start(); + $synchronization = new Horde_Kolab_Storage_Synchronization_OncePerSession(); + $data = $this->createMock('Horde_Kolab_Storage_Data_Base'); + $data->expects($this->once()) diff -pruN 2.2.3-1/debian/patches/series 2.2.3-1ubuntu1/debian/patches/series --- 2.2.3-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.3-1ubuntu1/debian/patches/series 2018-02-23 03:50:20.000000000 +0000 @@ -0,0 +1,3 @@ +0001-namespaced-phpunit-classes.patch +0002-phpunit-deprecated-getMock.patch +0003-fix-tests-that-need-a-session.patch