diff -pruN 2.31.1+debian0-1/debian/changelog 2.31.1+debian0-1ubuntu1/debian/changelog --- 2.31.1+debian0-1/debian/changelog 2017-12-16 15:30:46.000000000 +0000 +++ 2.31.1+debian0-1ubuntu1/debian/changelog 2018-02-15 04:51:07.000000000 +0000 @@ -1,3 +1,11 @@ +php-horde-core (2.31.1+debian0-1ubuntu1) bionic; urgency=medium + + * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has + namespaced classes and replaced getMock with createMock. + * d/t/phpunit: pass bootstrap file path. + + -- Nishanth Aravamudan Wed, 14 Feb 2018 20:51:07 -0800 + php-horde-core (2.31.1+debian0-1) unstable; urgency=medium * New upstream version 2.31.1+debian0 diff -pruN 2.31.1+debian0-1/debian/control 2.31.1+debian0-1ubuntu1/debian/control --- 2.31.1+debian0-1/debian/control 2017-12-16 15:30:46.000000000 +0000 +++ 2.31.1+debian0-1ubuntu1/debian/control 2018-02-15 04:51:07.000000000 +0000 @@ -1,7 +1,8 @@ Source: php-horde-core 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 (>= 1~), pear-horde-channel, php-horde-role Standards-Version: 3.9.8 diff -pruN 2.31.1+debian0-1/debian/patches/phpunit6_compatibility.patch 2.31.1+debian0-1ubuntu1/debian/patches/phpunit6_compatibility.patch --- 2.31.1+debian0-1/debian/patches/phpunit6_compatibility.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.31.1+debian0-1ubuntu1/debian/patches/phpunit6_compatibility.patch 2018-02-15 04:51:03.000000000 +0000 @@ -0,0 +1,141 @@ +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-15 + +--- php-horde-core-2.31.1+debian0.orig/Horde_Core-2.31.1/test/Horde/Core/Factory/GroupTest.php ++++ php-horde-core-2.31.1+debian0/Horde_Core-2.31.1/test/Horde/Core/Factory/GroupTest.php +@@ -23,7 +23,7 @@ + * @author Gunnar Wrobel + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + */ +-class Horde_Core_Factory_GroupTest extends PHPUnit_Framework_TestCase ++class Horde_Core_Factory_GroupTest extends PHPUnit\Framework\TestCase + { + public function testMock() + { +--- php-horde-core-2.31.1+debian0.orig/Horde_Core-2.31.1/test/Horde/Core/Factory/KolabServerTest.php ++++ php-horde-core-2.31.1+debian0/Horde_Core-2.31.1/test/Horde/Core/Factory/KolabServerTest.php +@@ -23,25 +23,25 @@ + * @author Gunnar Wrobel + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + */ +-class Horde_Core_Factory_KolabServerTest extends PHPUnit_Framework_TestCase ++class Horde_Core_Factory_KolabServerTest extends PHPUnit\Framework\TestCase + { + public function setUp() + { + $this->markTestIncomplete('Needs some love'); + $GLOBALS['conf']['kolab']['server']['basedn'] = 'test'; +- $this->factory = $this->getMock( ++ $this->factory = $this->createMock( + 'Horde_Core_Factory_KolabServer', array(), array(), '', false, false + ); +- $this->objects = $this->getMock( ++ $this->objects = $this->createMock( + 'Horde_Kolab_Server_Objects_Interface' + ); +- $this->structure = $this->getMock( ++ $this->structure = $this->createMock( + 'Horde_Kolab_Server_Structure_Interface' + ); +- $this->search = $this->getMock( ++ $this->search = $this->createMock( + 'Horde_Kolab_Server_Search_Interface' + ); +- $this->schema = $this->getMock( ++ $this->schema = $this->createMock( + 'Horde_Kolab_Server_Schema_Interface' + ); + } +--- php-horde-core-2.31.1+debian0.orig/Horde_Core-2.31.1/test/Horde/Core/Factory/KolabSessionTest.php ++++ php-horde-core-2.31.1+debian0/Horde_Core-2.31.1/test/Horde/Core/Factory/KolabSessionTest.php +@@ -23,7 +23,7 @@ + * @author Gunnar Wrobel + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + */ +-class Horde_Core_Factory_KolabSessionTest extends PHPUnit_Framework_TestCase ++class Horde_Core_Factory_KolabSessionTest extends PHPUnit\Framework\TestCase + { + public function setUp() + { +@@ -36,8 +36,8 @@ class Horde_Core_Factory_KolabSessionTes + $injector = new Horde_Injector(new Horde_Injector_TopLevel()); + $server_factory = new Horde_Core_Factory_KolabServer($injector); + $factory = new Horde_Core_Factory_KolabSession($injector); +- $this->session_auth = $this->getMock('Horde_Kolab_Session_Auth_Interface'); +- $this->session_storage = $this->getMock('Horde_Kolab_Session_Storage_Interface'); ++ $this->session_auth = $this->createMock('Horde_Kolab_Session_Auth_Interface'); ++ $this->session_storage = $this->createMock('Horde_Kolab_Session_Storage_Interface'); + $injector->setInstance('Horde_Kolab_Session_Auth_Interface', $this->session_auth); + $injector->setInstance('Horde_Kolab_Session_Storage_Interface', $this->session_storage); + return $factory; +@@ -45,7 +45,7 @@ class Horde_Core_Factory_KolabSessionTes + + public function testMethodGetvalidatorHasResultHordekolabsessionvalid() + { +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $this->assertInstanceOf( + 'Horde_Kolab_Session_Valid_Interface', + $this->_getFactory()->getSessionValidator($session, $this->session_auth) +@@ -58,7 +58,7 @@ class Horde_Core_Factory_KolabSessionTes + $this->session_auth->expects($this->once()) + ->method('getCurrentUser') + ->will($this->returnValue('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')); +@@ -73,7 +73,7 @@ class Horde_Core_Factory_KolabSessionTes + public function testMethodGetsessionHasResultHordekolabsessionTheOldSessionIfAnOldSessionWasStoredAndValid() + { + $factory = $this->_getFactory(); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +@@ -89,7 +89,7 @@ class Horde_Core_Factory_KolabSessionTes + public function testMethodGetsessionHasResultHordekolabsessionANewSessionIfAnOldSessionWasStoredAndInvalid() + { + $factory = $this->_getFactory(); +- $session = $this->getMock('Horde_Kolab_Session'); ++ $session = $this->createMock('Horde_Kolab_Session'); + $session->expects($this->once()) + ->method('getMail') + ->will($this->returnValue('mail@example.org')); +@@ -133,8 +133,8 @@ class Horde_Core_Factory_KolabSessionTes + + public function testMethodGetsessionvalidatorHasResultHordekolabsessionvalidloggedIfConfiguredThatWay() + { +- $session = $this->getMock('Horde_Kolab_Session'); +- $auth = $this->getMock('Horde_Kolab_Session_Auth_Interface'); ++ $session = $this->createMock('Horde_Kolab_Session'); ++ $auth = $this->createMock('Horde_Kolab_Session_Auth_Interface'); + $GLOBALS['conf']['kolab']['session']['log'] = true; + $this->assertInstanceOf( + 'Horde_Kolab_Session_Valid_Decorator_Logged', +--- php-horde-core-2.31.1+debian0.orig/Horde_Core-2.31.1/test/Horde/Core/RegistryTest.php ++++ php-horde-core-2.31.1+debian0/Horde_Core-2.31.1/test/Horde/Core/RegistryTest.php +@@ -18,7 +18,7 @@ + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Core + */ +-class Horde_Core_RegistryTest extends PHPUnit_Framework_TestCase ++class Horde_Core_RegistryTest extends PHPUnit\Framework\TestCase + { + protected $_tmpdir; + +--- php-horde-core-2.31.1+debian0.orig/Horde_Core-2.31.1/test/Horde/Core/UrlTest.php ++++ php-horde-core-2.31.1+debian0/Horde_Core-2.31.1/test/Horde/Core/UrlTest.php +@@ -6,7 +6,7 @@ + * @package Core + * @subpackage UnitTests + */ +-class Horde_Core_UrlTest extends PHPUnit_Framework_TestCase ++class Horde_Core_UrlTest extends PHPUnit\Framework\TestCase + { + public function testUrl() + { diff -pruN 2.31.1+debian0-1/debian/patches/series 2.31.1+debian0-1ubuntu1/debian/patches/series --- 2.31.1+debian0-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 2.31.1+debian0-1ubuntu1/debian/patches/series 2018-02-15 04:50:26.000000000 +0000 @@ -0,0 +1 @@ +phpunit6_compatibility.patch diff -pruN 2.31.1+debian0-1/debian/tests/phpunit 2.31.1+debian0-1ubuntu1/debian/tests/phpunit --- 2.31.1+debian0-1/debian/tests/phpunit 2017-12-16 15:30:46.000000000 +0000 +++ 2.31.1+debian0-1ubuntu1/debian/tests/phpunit 2018-02-15 04:51:07.000000000 +0000 @@ -10,4 +10,4 @@ locale-gen # ... but not here cd Horde_Core*/test/./Horde/Core -su www-data --preserve-environment --shell /bin/sh --command 'phpunit -v .' +su www-data --preserve-environment --shell /bin/sh --command 'phpunit -v --bootstrap bootstrap.php .'