diff -pruN 2.2.0-1/debian/changelog 2.2.0-1ubuntu1/debian/changelog --- 2.2.0-1/debian/changelog 2017-06-30 20:03:42.000000000 +0000 +++ 2.2.0-1ubuntu1/debian/changelog 2018-02-20 22:58:12.000000000 +0000 @@ -1,3 +1,10 @@ +php-horde-support (2.2.0-1ubuntu1) bionic; urgency=medium + + * debian/patches/phpunit6_compat.patch: PHPUnit 6 has namespaced + classes. + + -- Nishanth Aravamudan Tue, 20 Feb 2018 14:58:12 -0800 + php-horde-support (2.2.0-1) unstable; urgency=medium * New upstream version 2.2.0 diff -pruN 2.2.0-1/debian/control 2.2.0-1ubuntu1/debian/control --- 2.2.0-1/debian/control 2017-06-30 20:03:42.000000000 +0000 +++ 2.2.0-1ubuntu1/debian/control 2018-02-20 22:58:12.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-support 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.0-1/debian/patches/phpunit6_compat.patch 2.2.0-1ubuntu1/debian/patches/phpunit6_compat.patch --- 2.2.0-1/debian/patches/phpunit6_compat.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-1ubuntu1/debian/patches/phpunit6_compat.patch 2018-02-20 22:58:12.000000000 +0000 @@ -0,0 +1,202 @@ +Description: PHPUnit 6 has namespaced classes + Also setExpectedExpectation -> excpectExpectation. +Author: Nishanth Aravamudan +Forwarded: Will be done by Nishanth Aravamudan +Last-Update: 2018-02-20 + +--- a/Horde_Support-2.2.0/test/Horde/Support/ArrayTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/ArrayTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_ArrayTest extends PHPUnit_Framework_TestCase ++class Horde_Support_ArrayTest extends PHPUnit\Framework\TestCase + { + public function testImplementsArrayAccess() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/BacktraceTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/BacktraceTest.php +@@ -19,7 +19,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_BacktraceTest extends PHPUnit_Framework_TestCase ++class Horde_Support_BacktraceTest extends PHPUnit\Framework\TestCase + { + // Keep these two methods on the top so that the line numbers don't change + // when new tests are added. +--- a/Horde_Support-2.2.0/test/Horde/Support/CaseInsensitiveArrayTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/CaseInsensitiveArrayTest.php +@@ -16,7 +16,7 @@ + * @package Support + * @subpackage UnitTests + */ +-class Horde_Support_CaseInsensitiveArrayTest extends PHPUnit_Framework_TestCase ++class Horde_Support_CaseInsensitiveArrayTest extends PHPUnit\Framework\TestCase + { + /** + * @dataProvider implementsProvider +--- a/Horde_Support-2.2.0/test/Horde/Support/CombineStreamTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/CombineStreamTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_CombineStreamTest extends PHPUnit_Framework_TestCase ++class Horde_Support_CombineStreamTest extends PHPUnit\Framework\TestCase + { + public function testUsage() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/ConsistentHashTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/ConsistentHashTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_ConsistentHashTest extends PHPUnit_Framework_TestCase ++class Horde_Support_ConsistentHashTest extends PHPUnit\Framework\TestCase + { + public function testAddUpdatesCount() + { +@@ -71,7 +71,7 @@ + public function testRemoveThrowsOnNonexistentNode() + { + $h = new Horde_Support_ConsistentHash; +- $this->setExpectedException('InvalidArgumentException'); ++ $this->expectException('InvalidArgumentException'); + $h->remove('a'); + } + +--- a/Horde_Support-2.2.0/test/Horde/Support/GuidTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/GuidTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_GuidTest extends PHPUnit_Framework_TestCase ++class Horde_Support_GuidTest extends PHPUnit\Framework\TestCase + { + public function testFormat() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/InflectorTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/InflectorTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_InflectorTest extends PHPUnit_Framework_TestCase ++class Horde_Support_InflectorTest extends PHPUnit\Framework\TestCase + { + /** + * Words to test +--- a/Horde_Support-2.2.0/test/Horde/Support/MemoryTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/MemoryTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_MemoryTest extends PHPUnit_Framework_TestCase ++class Horde_Support_MemoryTest extends PHPUnit\Framework\TestCase + { + public function testMemoryStart() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/Numerizer/Locale/BaseTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/Numerizer/Locale/BaseTest.php +@@ -10,7 +10,7 @@ + * @package Support + * @subpackage UnitTests + */ +-class Horde_Support_Numerizer_Locale_BaseTest extends PHPUnit_Framework_TestCase ++class Horde_Support_Numerizer_Locale_BaseTest extends PHPUnit\Framework\TestCase + { + public function testStraightParsing() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/Numerizer/Locale/DeTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/Numerizer/Locale/DeTest.php +@@ -10,7 +10,7 @@ + * @package Support + * @subpackage UnitTests + */ +-class Horde_Support_Numerizer_Locale_DeTest extends PHPUnit_Framework_TestCase ++class Horde_Support_Numerizer_Locale_DeTest extends PHPUnit\Framework\TestCase + { + public function testStraightParsing() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/ObjectStubTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/ObjectStubTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_ObjectStubTest extends PHPUnit_Framework_TestCase ++class Horde_Support_ObjectStubTest extends PHPUnit\Framework\TestCase + { + public function testUndefinedIndex() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/RandomidTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/RandomidTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_RandomidTest extends PHPUnit_Framework_TestCase ++class Horde_Support_RandomidTest extends PHPUnit\Framework\TestCase + { + public function testLength() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/StackTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/StackTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_StackTest extends PHPUnit_Framework_TestCase ++class Horde_Support_StackTest extends PHPUnit\Framework\TestCase + { + public function testEmptyConstructor() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/StringStreamTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/StringStreamTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_StringStreamTest extends PHPUnit_Framework_TestCase ++class Horde_Support_StringStreamTest extends PHPUnit\Framework\TestCase + { + public function testMemoryUsage() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/StubTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/StubTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_StubTest extends PHPUnit_Framework_TestCase ++class Horde_Support_StubTest extends PHPUnit\Framework\TestCase + { + public function testAnyOffsetIsGettable() + { +--- a/Horde_Support-2.2.0/test/Horde/Support/TimerTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/TimerTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_TimerTest extends PHPUnit_Framework_TestCase ++class Horde_Support_TimerTest extends PHPUnit\Framework\TestCase + { + /** + * test instantiating a normal timer +--- a/Horde_Support-2.2.0/test/Horde/Support/UuidTest.php ++++ b/Horde_Support-2.2.0/test/Horde/Support/UuidTest.php +@@ -14,7 +14,7 @@ + * @subpackage UnitTests + * @license http://www.horde.org/licenses/bsd + */ +-class Horde_Support_UuidTest extends PHPUnit_Framework_TestCase ++class Horde_Support_UuidTest extends PHPUnit\Framework\TestCase + { + public function testLength() + { diff -pruN 2.2.0-1/debian/patches/series 2.2.0-1ubuntu1/debian/patches/series --- 2.2.0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.0-1ubuntu1/debian/patches/series 2018-02-20 22:57:46.000000000 +0000 @@ -0,0 +1 @@ +phpunit6_compat.patch