[pkg-horde] Bug#889165: php-horde-test: PHPUnit 6.0.0 renamed many classes

[Nishanth Aravamudan]

Package: php-horde-test
Version: 2.6.3+debian0-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu bionic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

## ---------------- REPLACE THIS WITH ACTUAL INFORMATION ---------------------
## Please add all necessary information about why the change needed to go in
## Ubuntu, quote policy, spec or any other background material and why it can
## and should be used in Debian too.  If the patch is composed of multiple
## independent pieces, please send them as separate bug reports.
## ---------------- REPLACE THIS WITH ACTUAL INFORMATION ---------------------


  * debian/patches/phpunit_renamed_phpunit_classes.patch: PHPUnit 6 has
    renamed a number of classes to be namespaced.


Thanks for considering the patch.

*** /tmp/tmpXMG2z4/php-horde-test_2.6.3+debian0-1ubuntu1.debdiff
diff -Nru php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch
--- php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch	1969-12-31 16:00:00.000000000 -0800
+++ php-horde-test-2.6.3+debian0/debian/patches/phpunit_renamed_phpunit_classes.patch	2018-02-02 13:04:04.000000000 -0800
@@ -0,0 +1,47 @@
+Description: PHPUnit 6 has renamed a number of classes to be namespaced
+ Relevenat PHPUnit change: https://github.com/sebastianbergmann/phpunit/commit/ba2241e6e0a634dc333b6e1d2fd6d0e8c16c2f57
+Author: Nishanth Aravamudan <nish.aravamudan at canonical.com>
+Last-Update: 2018-02-02
+
+--- php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/AllTests.php
++++ php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/AllTests.php
+@@ -81,7 +81,7 @@ class Horde_Test_AllTests
+         chdir($this->_dir);
+         $old_error = error_reporting();
+         $suite = $this->suite();
+-        $runner = new PHPUnit_TextUI_TestRunner();
++        $runner = new PHPUnit\TextUI\TestRunner();
+         $result = $runner->doRun($suite, array('colors' => 'auto'), false);
+         error_reporting($old_error);
+         chdir($old_dir);
+@@ -91,7 +91,7 @@ class Horde_Test_AllTests
+     /**
+      * Collect the unit tests of this directory into a new suite.
+      *
+-     * @return PHPUnit_Framework_TestSuite The test suite.
++     * @return PHPUnit\Framework\TestSuite The test suite.
+      */
+     public function suite()
+     {
+--- php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/AllTests/TestRunner.php
++++ php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/AllTests/TestRunner.php
+@@ -22,7 +22,7 @@
+  * @link      http://www.horde.org/components/Horde_Test
+  * @package   Test
+  */
+-class Horde_Test_AllTests_TestRunner extends PHPUnit_Runner_BaseTestRunner
++class Horde_Test_AllTests_TestRunner extends PHPUnit\Runner\BaseTestRunner
+ {
+     /**
+      * Get the test suite.
+--- php-horde-test-2.6.3+debian0.orig/Horde_Test-2.6.3/lib/Horde/Test/Case.php
++++ php-horde-test-2.6.3+debian0/Horde_Test-2.6.3/lib/Horde/Test/Case.php
+@@ -27,7 +27,7 @@
+  * @license  http://www.horde.org/licenses/lgpl21 LGPL
+  * @link     http://www.horde.org/components/Horde_Test
+  */
+-class Horde_Test_Case extends PHPUnit_Framework_TestCase
++class Horde_Test_Case extends PHPUnit\Framework\TestCase
+ {
+     /**
+      * Useful shorthand if you are mocking a class with a private constructor
diff -Nru php-horde-test-2.6.3+debian0/debian/patches/series php-horde-test-2.6.3+debian0/debian/patches/series
--- php-horde-test-2.6.3+debian0/debian/patches/series	1969-12-31 16:00:00.000000000 -0800
+++ php-horde-test-2.6.3+debian0/debian/patches/series	2018-02-02 13:03:02.000000000 -0800
@@ -0,0 +1 @@
+phpunit_renamed_phpunit_classes.patch


-- System Information:
Debian Release: buster/sid
  APT prefers bionic
  APT policy: (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.13.0-25-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

-- 
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd