diff -pruN 2.0.3-3/debian/changelog 2.0.3-3ubuntu2/debian/changelog --- 2.0.3-3/debian/changelog 2016-06-08 06:57:53.000000000 +0000 +++ 2.0.3-3ubuntu2/debian/changelog 2018-02-20 17:32:11.000000000 +0000 @@ -1,3 +1,18 @@ +php-horde-kolab-session (2.0.3-3ubuntu2) bionic; urgency=medium + + * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced + constructors and replaced getMock with createMock. + + -- Nishanth Aravamudan Tue, 20 Feb 2018 09:32:11 -0800 + +php-horde-kolab-session (2.0.3-3ubuntu1) artful; urgency=medium + + * debian/patches/php71_no_constructor.patch: + Horde_Kolab_Session_Storage_Session has no constructor. Thanks to + Jan Schneider . + + -- Nishanth Aravamudan Tue, 02 May 2017 10:48:47 -0700 + php-horde-kolab-session (2.0.3-3) unstable; urgency=medium * Update Standards-Version to 3.9.8, no change diff -pruN 2.0.3-3/debian/control 2.0.3-3ubuntu2/debian/control --- 2.0.3-3/debian/control 2016-06-08 06:57:53.000000000 +0000 +++ 2.0.3-3ubuntu2/debian/control 2017-05-02 17:48:47.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-kolab-session 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.0.3-3/debian/patches/php71_no_constructor.patch 2.0.3-3ubuntu2/debian/patches/php71_no_constructor.patch --- 2.0.3-3/debian/patches/php71_no_constructor.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.3-3ubuntu2/debian/patches/php71_no_constructor.patch 2017-05-02 17:48:44.000000000 +0000 @@ -0,0 +1,32 @@ +Description: Horde_Kolab_Session_Storage_Session has no constructor +Author: Jan Schneider +Origin: upstream, https://github.com/horde/horde/commit/f0f147704f2dcce9ba1f1488e03e16c5006cde23 +Forwarded: not-needed +Reviewed-By: Nishanth Aravamudan +Last-Update: 2017-05-02 + +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Storage/SessionTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Storage/SessionTest.php +@@ -40,19 +40,19 @@ class Horde_Kolab_Session_Unit_Storage_S + public function testLoad() + { + $_SESSION['kolab_session'] = array('data'); +- $storage = new Horde_Kolab_Session_Storage_Session($session); ++ $storage = new Horde_Kolab_Session_Storage_Session(); + $this->assertEquals($storage->load(), array('data')); + } + + public function testEmpty() + { +- $storage = new Horde_Kolab_Session_Storage_Session($session); ++ $storage = new Horde_Kolab_Session_Storage_Session(); + $this->assertEquals($storage->load(), array()); + } + + public function testSave() + { +- $storage = new Horde_Kolab_Session_Storage_Session($session); ++ $storage = new Horde_Kolab_Session_Storage_Session(); + $storage->save(array('data')); + $this->assertEquals($_SESSION['kolab_session'], array('data')); + } diff -pruN 2.0.3-3/debian/patches/phpunit6_compat.patch 2.0.3-3ubuntu2/debian/patches/phpunit6_compat.patch --- 2.0.3-3/debian/patches/phpunit6_compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.3-3ubuntu2/debian/patches/phpunit6_compat.patch 2018-02-20 17:32:07.000000000 +0000 @@ -0,0 +1,405 @@ +Description: PHPUnit 6 has namespaced constructors and replaced getMock with createMock +Author: Nishanth Aravamudan +Forwarded: Will be done by Nishanth Aravamudan +Last-Update: 2018-02-20 + +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Integration/AnonymousTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Integration/AnonymousTest.php +@@ -31,7 +31,7 @@ class Horde_Kolab_Session_Integration_An + { + public function testMethodConnectHasPostconditionThatTheConnectionHasBeenEstablishedAsAnonymousUserIfRequired() + { +- $user = $this->getMock( ++ $user = $this->createMock( + 'Horde_Kolab_Server_Object_Hash', array(), array(), '', false, false + ); + $user->expects($this->exactly(5)) +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Integration/ValidTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Integration/ValidTest.php +@@ -29,7 +29,7 @@ class Horde_Kolab_Session_Integration_Va + { + public function setUp() + { +- $this->user = $this->getMock( ++ $this->user = $this->createMock( + 'Horde_Kolab_Server_Object_Hash', array(), array(), '', false, false + ); + } +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/TestCase.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/TestCase.php +@@ -25,37 +25,37 @@ + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @link http://pear.horde.org/index.php?package=Kolab_Session + */ +-class Horde_Kolab_Session_TestCase extends PHPUnit_Framework_TestCase ++class Horde_Kolab_Session_TestCase extends PHPUnit\Framework\TestCase + { + protected function _getComposite() + { +- return $this->getMock('Horde_Kolab_Server_Composite', array(), array(), '', false, false); ++ return $this->createMock('Horde_Kolab_Server_Composite', array(), array(), '', false, false); + } + + protected function _getMockedComposite() + { + return new Horde_Kolab_Server_Composite( +- $this->getMock('Horde_Kolab_Server_Interface'), +- $this->getMock('Horde_Kolab_Server_Objects_Interface'), +- $this->getMock('Horde_Kolab_Server_Structure_Interface'), +- $this->getMock('Horde_Kolab_Server_Search_Interface'), +- $this->getMock('Horde_Kolab_Server_Schema_Interface') ++ $this->createMock('Horde_Kolab_Server_Interface'), ++ $this->createMock('Horde_Kolab_Server_Objects_Interface'), ++ $this->createMock('Horde_Kolab_Server_Structure_Interface'), ++ $this->createMock('Horde_Kolab_Server_Search_Interface'), ++ $this->createMock('Horde_Kolab_Server_Schema_Interface') + ); + } + + protected function setupLogger() + { +- $this->logger = $this->getMock('Horde_Log_Logger'); ++ $this->logger = $this->createMock('Horde_Log_Logger'); + } + + protected function setupStorage() + { +- $this->storage = $this->getMock('Horde_Kolab_Session_Storage'); ++ $this->storage = $this->createMock('Horde_Kolab_Session_Storage'); + } + + protected function setupFactoryMocks() + { + $this->server = $this->_getMockedComposite(); +- $this->session_storage = $this->getMock('Horde_Kolab_Session_Storage'); ++ $this->session_storage = $this->createMock('Horde_Kolab_Session_Storage'); + } + } +\ No newline at end of file +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/BaseTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/BaseTest.php +@@ -29,7 +29,7 @@ class Horde_Kolab_Session_Unit_BaseTest + { + public function setUp() + { +- $this->user = $this->getMock( ++ $this->user = $this->createMock( + 'Horde_Kolab_Server_Object_Hash', array(), array(), '', false, false + ); + } +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/AnonymousTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/AnonymousTest.php +@@ -30,7 +30,7 @@ extends Horde_Kolab_Session_TestCase + { + public function testMethodConnectHasPostconditionThatTheConnectionHasBeenEstablishedAsAnonymousUserIfRequired() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('connect') + ->with('anonymous', array('password' => 'pass')); +@@ -42,7 +42,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetidReturnsNullIfConnectedUserIsAnonymousUser() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getId') + ->will($this->returnValue('anonymous')); +@@ -54,7 +54,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodConnectGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('connect') + ->with(array('password' => 'pass')); +@@ -66,7 +66,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetidGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getId') + ->will($this->returnValue('1')); +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/BaseTest.php +@@ -30,7 +30,7 @@ extends Horde_Kolab_Session_TestCase + { + public function testMethodConnectGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('connect') + ->with(array('password' => 'pass')); +@@ -42,7 +42,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetidGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getId') + ->will($this->returnValue('1')); +@@ -54,7 +54,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetmailGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('1')); +@@ -66,7 +66,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetuidGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getUid') + ->will($this->returnValue('1')); +@@ -78,7 +78,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetnameGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getName') + ->will($this->returnValue('1')); +@@ -90,7 +90,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetimapserverGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getImapServer') + ->will($this->returnValue('1')); +@@ -102,7 +102,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetfreebusyserverGetsDelegated() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getFreebusyServer') + ->will($this->returnValue('1')); +@@ -114,7 +114,7 @@ extends Horde_Kolab_Session_TestCase + + public function testImport() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('import') + ->with(array('test')); +@@ -126,7 +126,7 @@ extends Horde_Kolab_Session_TestCase + + public function testExport() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('export') + ->will($this->returnValue(array('export'))); +@@ -138,7 +138,7 @@ extends Horde_Kolab_Session_TestCase + + public function testPurge() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('purge'); + $anonymous = new Horde_Kolab_Session_Decorator_Base( +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/LoggedTest.php +@@ -37,7 +37,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodConnectHasPostconditionThatASuccessfulConnectionGetsLogged() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('connect') + ->with(array('password' => 'pass')); +@@ -60,7 +60,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodConnectHasPostconditionThatAnUnsuccessfulConnectionGetsLogged() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('connect') + ->will($this->throwException(new Horde_Kolab_Session_Exception('Error.'))); +@@ -87,7 +87,7 @@ extends Horde_Kolab_Session_TestCase + + public function testExport() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('export') + ->will($this->returnValue('test')); +@@ -110,7 +110,7 @@ extends Horde_Kolab_Session_TestCase + + public function testImport() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('import') + ->with(array('test')); +@@ -133,7 +133,7 @@ extends Horde_Kolab_Session_TestCase + + public function testPurge() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('purge'); + $session->expects($this->once()) +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/StoredTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Decorator/StoredTest.php +@@ -43,7 +43,7 @@ extends Horde_Kolab_Session_TestCase + $this->storage->expects($this->once()) + ->method('save') + ->with(array('export')); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('export') + ->will($this->returnValue(array('export'))); +@@ -60,7 +60,7 @@ extends Horde_Kolab_Session_TestCase + $this->storage->expects($this->once()) + ->method('load') + ->will($this->returnValue(array())); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $stored = new Horde_Kolab_Session_Decorator_Stored($session, $this->storage); + $stored->import(array('import')); + } +@@ -73,7 +73,7 @@ extends Horde_Kolab_Session_TestCase + $this->storage->expects($this->once()) + ->method('save') + ->with(array()); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $stored = new Horde_Kolab_Session_Decorator_Stored($session, $this->storage); + $stored->purge(); + $stored->shutdown(); +@@ -84,7 +84,7 @@ extends Horde_Kolab_Session_TestCase + $this->storage->expects($this->once()) + ->method('load') + ->will($this->returnValue(array())); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('export') + ->will($this->returnValue(array())); +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Valid/BaseTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Valid/BaseTest.php +@@ -30,7 +30,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanTrueIfTheSessionIsNotConnectedAndTheCurrentUserIsAnonymous() + { + $auth = false; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('')); +@@ -41,7 +41,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanFalseIfTheSessionIsNotConnected() + { + $auth = 'mail@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('')); +@@ -52,7 +52,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserDoesNotMatchTheCurrentUserOfTheSession() + { + $auth = 'somebody@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +@@ -63,7 +63,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndNoNewUserWasSet() + { + $auth = 'mail@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +@@ -74,7 +74,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesNeitherTheCurrentUserMailAndUid() + { + $auth = 'mail@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +@@ -85,7 +85,7 @@ class Horde_Kolab_Session_Unit_Valid_Bas + public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesEitherTheCurrentUserMailAndUid() + { + $auth = 'mail@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +--- php-horde-kolab-session-2.0.3.orig/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Valid/Decorator/LoggedTest.php ++++ php-horde-kolab-session-2.0.3/Horde_Kolab_Session-2.0.3/test/Horde/Kolab/Session/Unit/Valid/Decorator/LoggedTest.php +@@ -38,7 +38,7 @@ extends Horde_Kolab_Session_TestCase + public function testMethodValidateHasPostconditionThatAnInvalidSessionGetsLogged() + { + $auth = 'auth@example.org'; +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->exactly(2)) + ->method('getMail') + ->will($this->returnValue('somebody@example.org')); +@@ -63,13 +63,13 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodValidateGetsDelegated() + { +- $valid = $this->getMock('Horde_Kolab_Session_Valid'); ++ $valid = $this->createMock('Horde_Kolab_Session_Valid'); + $valid->expects($this->once()) + ->method('validate') + ->will($this->returnValue(true)); + $valid->expects($this->once()) + ->method('getSession') +- ->will($this->returnValue($this->getMock('Horde_Kolab_Session'))); ++ ->will($this->returnValue($this->createMock('Horde_Kolab_Session'))); + $logged = new Horde_Kolab_Session_Valid_Decorator_Logged( + $valid, $this->logger + ); +@@ -78,7 +78,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetsessionGetsDelegated() + { +- $valid = $this->getMock('Horde_Kolab_Session_Valid'); ++ $valid = $this->createMock('Horde_Kolab_Session_Valid'); + $valid->expects($this->once()) + ->method('getSession'); + $logged = new Horde_Kolab_Session_Valid_Decorator_Logged($valid, $this->logger); +@@ -87,7 +87,7 @@ extends Horde_Kolab_Session_TestCase + + public function testMethodGetauthGetsDelegated() + { +- $valid = $this->getMock('Horde_Kolab_Session_Valid'); ++ $valid = $this->createMock('Horde_Kolab_Session_Valid'); + $valid->expects($this->once()) + ->method('getAuth'); + $logged = new Horde_Kolab_Session_Valid_Decorator_Logged($valid, $this->logger); diff -pruN 2.0.3-3/debian/patches/series 2.0.3-3ubuntu2/debian/patches/series --- 2.0.3-3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.0.3-3ubuntu2/debian/patches/series 2018-02-20 17:31:37.000000000 +0000 @@ -0,0 +1,2 @@ +php71_no_constructor.patch +phpunit6_compat.patch