diff -pruN 6.2.21-1/debian/changelog 6.2.21-1ubuntu2/debian/changelog --- 6.2.21-1/debian/changelog 2017-09-27 19:06:26.000000000 +0000 +++ 6.2.21-1ubuntu2/debian/changelog 2019-09-10 18:03:41.000000000 +0000 @@ -1,3 +1,18 @@ +php-horde-imp (6.2.21-1ubuntu2) eoan; urgency=medium + + * No-change rebuild for PHP7.3 + + -- Bryce Harrington Tue, 10 Sep 2019 18:03:41 +0000 + +php-horde-imp (6.2.21-1ubuntu1) bionic; urgency=medium + + * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has + namespaced classes and replaced getMock with createMock. + * debian/patches/horde_registry_member_changed.patch: + Horde_Registry::getCharset does not exist. + + -- Nishanth Aravamudan Fri, 16 Feb 2018 09:19:06 -0800 + php-horde-imp (6.2.21-1) unstable; urgency=medium * New upstream version 6.2.21 diff -pruN 6.2.21-1/debian/control 6.2.21-1ubuntu2/debian/control --- 6.2.21-1/debian/control 2017-09-27 19:06:26.000000000 +0000 +++ 6.2.21-1ubuntu2/debian/control 2018-02-16 17:19:06.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-imp 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, php-horde-role Standards-Version: 3.9.8 diff -pruN 6.2.21-1/debian/patches/horde_registry_member_changed.patch 6.2.21-1ubuntu2/debian/patches/horde_registry_member_changed.patch --- 6.2.21-1/debian/patches/horde_registry_member_changed.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.2.21-1ubuntu2/debian/patches/horde_registry_member_changed.patch 2018-02-16 17:19:06.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Horde_Registry::getCharset does not exist + This causes PHPUnit to emit warnings, which with PHPUnit 6 results in + a non-zero exit code. +Author: Nishanth Aravamudan +Forwarded: Will be done by Nishanth Aravamudan +Last-Update: 2018-02-16 + +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/Mime/Viewer/ItipTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/Mime/Viewer/ItipTest.php +@@ -52,7 +52,7 @@ extends PHPUnit\Framework\TestCase + + $registry = $this->createMock('Horde_Registry', array(), array(), '', false); + $registry->expects($this->any()) +- ->method('getCharset') ++ ->method('getEmailCharset') + ->will($this->returnValue('UTF-8')); + $registry->expects($this->any()) + ->method('remoteHost') diff -pruN 6.2.21-1/debian/patches/phpunit6_compatibility.patch 6.2.21-1ubuntu2/debian/patches/phpunit6_compatibility.patch --- 6.2.21-1/debian/patches/phpunit6_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 6.2.21-1ubuntu2/debian/patches/phpunit6_compatibility.patch 2018-02-16 17:19:02.000000000 +0000 @@ -0,0 +1,156 @@ +Description: PHPUnit 6 has namespaced classes and replaced getMock with createMock +Author: Nishanth Aravamudan +Forwarded: Will be done by Nishanth Aravamudan +Last-Update: 2018-02-16 + +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/ComposeTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/ComposeTest.php +@@ -23,7 +23,7 @@ + * @package IMP + * @subpackage UnitTests + */ +-class Imp_Unit_ComposeTest extends PHPUnit_Framework_TestCase ++class Imp_Unit_ComposeTest extends PHPUnit\Framework\TestCase + { + public function testBug10431() + { +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/MboxParseTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/MboxParseTest.php +@@ -23,7 +23,7 @@ + * @package IMP + * @subpackage UnitTests + */ +-class Imp_Unit_MboxParseTest extends PHPUnit_Framework_TestCase ++class Imp_Unit_MboxParseTest extends PHPUnit\Framework\TestCase + { + public function testMboxParse() + { +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/Mime/Viewer/HtmlTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/Mime/Viewer/HtmlTest.php +@@ -23,13 +23,13 @@ + * @package IMP + * @subpackage UnitTests + */ +-class Imp_Unit_Mime_Viewer_HtmlTest extends PHPUnit_Framework_TestCase ++class Imp_Unit_Mime_Viewer_HtmlTest extends PHPUnit\Framework\TestCase + { + public function setUp() + { +- $GLOBALS['browser'] = $this->getMock('Horde_Browser'); ++ $GLOBALS['browser'] = $this->createMock('Horde_Browser'); + +- $prefs = $this->getMock('Horde_Prefs', array(), array(), '', false); ++ $prefs = $this->createMock('Horde_Prefs', array(), array(), '', false); + $prefs->expects($this->any()) + ->method('getValue') + ->will($this->returnValue(false)); +@@ -52,7 +52,7 @@ class Imp_Unit_Mime_Viewer_HtmlTest exte + ); + + $v = new IMP_Stub_Mime_Viewer_Html(new Horde_Mime_Part(), array( +- 'browser' => $this->getMock('Horde_Browser'), ++ 'browser' => $this->createMock('Horde_Browser'), + 'charset' => 'UTF-8' + )); + +@@ -79,7 +79,7 @@ class Imp_Unit_Mime_Viewer_HtmlTest exte + ); + + $v = new IMP_Stub_Mime_Viewer_Html(new Horde_Mime_Part(), array( +- 'browser' => $this->getMock('Horde_Browser'), ++ 'browser' => $this->createMock('Horde_Browser'), + 'charset' => 'UTF-8' + )); + +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/Mime/Viewer/ItipTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/Mime/Viewer/ItipTest.php +@@ -25,7 +25,7 @@ + * @subpackage UnitTests + */ + class Imp_Unit_Mime_Viewer_ItipTest +-extends PHPUnit_Framework_TestCase ++extends PHPUnit\Framework\TestCase + { + private $_contents; + private $_contentsCharset; +@@ -44,13 +44,13 @@ extends PHPUnit_Framework_TestCase + $this->_oldtz = date_default_timezone_get(); + date_default_timezone_set('UTC'); + +- $injector = $this->getMock('Horde_Injector', array(), array(), '', false); ++ $injector = $this->createMock('Horde_Injector', array(), array(), '', false); + $injector->expects($this->any()) + ->method('getInstance') + ->will($this->returnCallback(array($this, '_injectorGetInstance'))); + $GLOBALS['injector'] = $injector; + +- $registry = $this->getMock('Horde_Registry', array(), array(), '', false); ++ $registry = $this->createMock('Horde_Registry', array(), array(), '', false); + $registry->expects($this->any()) + ->method('getCharset') + ->will($this->returnValue('UTF-8')); +@@ -59,7 +59,7 @@ extends PHPUnit_Framework_TestCase + ->will($this->returnValue((object)array('addr' => '1.2.3.4', 'host' => 'example.com', 'proxy' => false))); + $GLOBALS['registry'] = $registry; + +- $notification = $this->getMock('Horde_Notification_Handler', array(), array(), '', false); ++ $notification = $this->createMock('Horde_Notification_Handler', array(), array(), '', false); + $notification->expects($this->any()) + ->method('push') + ->will($this->returnCallback(array($this, '_notificationHandler'))); +@@ -85,7 +85,7 @@ extends PHPUnit_Framework_TestCase + + case 'IMP_Contents': + if (!isset($this->_contents)) { +- $contents= $this->getMock('IMP_Contents', array(), array(), '', false); ++ $contents= $this->createMock('IMP_Contents', array(), array(), '', false); + $contents->expects($this->any()) + ->method('getMIMEPart') + ->will($this->returnCallback(array($this, '_getMimePart'))); +@@ -95,7 +95,7 @@ extends PHPUnit_Framework_TestCase + + case 'IMP_Factory_Contents': + if (!isset($this->_contentsFactory)) { +- $cf = $this->getMock('IMP_Factory_Contents', array(), array(), '', false); ++ $cf = $this->createMock('IMP_Factory_Contents', array(), array(), '', false); + $cf->expects($this->any()) + ->method('create') + ->will($this->returnValue($this->_injectorGetInstance('IMP_Contents'))); +@@ -105,7 +105,7 @@ extends PHPUnit_Framework_TestCase + + case 'IMP_Factory_Imap': + if (!isset($this->_imapFactory)) { +- $imap = $this->getMock('IMP_Factory_Imap', array(), array(), '', false); ++ $imap = $this->createMock('IMP_Factory_Imap', array(), array(), '', false); + $imap->expects($this->any()) + ->method('create') + ->will($this->returnValue(new IMP_Stub_Imap())); +@@ -115,7 +115,7 @@ extends PHPUnit_Framework_TestCase + + case 'IMP_Factory_Mailbox': + if (!isset($this->_mailbox)) { +- $mbox = $this->getMock('IMP_Factory_Mailbox', array(), array(), '', false); ++ $mbox = $this->createMock('IMP_Factory_Mailbox', array(), array(), '', false); + $mbox->expects($this->any()) + ->method('create') + ->will($this->returnValue(new IMP_Mailbox('foo'))); +@@ -125,7 +125,7 @@ extends PHPUnit_Framework_TestCase + + case 'IMP_Identity': + if (!isset($this->_identity)) { +- $identity = $this->getMock('Horde_Core_Prefs_Identity', array(), array(), '', false); ++ $identity = $this->createMock('Horde_Core_Prefs_Identity', array(), array(), '', false); + $identity->expects($this->any()) + ->method('setDefault') + ->will($this->returnCallback(array($this, '_identitySetDefault'))); +--- php-horde-imp-6.2.21.orig/imp-6.2.21/test/Imp/Unit/QuotaTest.php ++++ php-horde-imp-6.2.21/imp-6.2.21/test/Imp/Unit/QuotaTest.php +@@ -23,7 +23,7 @@ + * @package IMP + * @subpackage UnitTests + */ +-class Imp_Unit_QuotaTest extends PHPUnit_Framework_TestCase ++class Imp_Unit_QuotaTest extends PHPUnit\Framework\TestCase + { + public function testMaildir() + { diff -pruN 6.2.21-1/debian/patches/series 6.2.21-1ubuntu2/debian/patches/series --- 6.2.21-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 6.2.21-1ubuntu2/debian/patches/series 2018-02-16 17:19:06.000000000 +0000 @@ -0,0 +1,2 @@ +phpunit6_compatibility.patch +horde_registry_member_changed.patch