php-horde-mime review request

[Bryce Harrington]

On Mon, Sep 16, 2019 at 07:27:43AM -0700, Bryce Harrington wrote:
> On Mon, Sep 16, 2019 at 06:03:41AM -0700, Bryce Harrington wrote:
> > Can someone give a quick review of this bugfix for php-horde-mime?
> >
> > These are really simple fixes that I've verified in lxc solve the dep8
> > failure.  This isn't blocking the php transition but will close off the
> > last php-horde* package (for now).  It's essentially the same fix as the
> > one for php-horde-text-filter I did last week, so if there are any
> > issues with this fix they'll be applicable to that one too.
> 
> Sorry, forgot the link to the PPA:

And debdiff is attached

>     https://launchpad.net/~bryce/+archive/ubuntu/php-horde-mime/+packages
> 
> For reference, link to the error in excuses that this fixes:
> 
>     http://autopkgtest.ubuntu.com/packages/p/php-horde-mime/eoan/amd64
> 
> > Thanks,
> > Bryce
-------------- next part --------------
diff -Nru php-horde-mime-2.11.0/debian/changelog php-horde-mime-2.11.0/debian/changelog
--- php-horde-mime-2.11.0/debian/changelog	2019-02-07 14:07:56.000000000 +0000
+++ php-horde-mime-2.11.0/debian/changelog	2019-09-16 12:26:46.000000000 +0000
@@ -1,3 +1,11 @@
+php-horde-mime (2.11.0-2ubuntu2) eoan; urgency=medium
+
+  * d/patches/include_alltests.patch: Fix test failure with "Class
+    'Horde_Test_Case' not found" error.
+  * d/patches/test_add_assert.patch: Fix a minor warning about lack of any asserts.
+
+ -- Bryce Harrington <bryce at canonical.com>  Mon, 16 Sep 2019 12:26:46 +0000
+
 php-horde-mime (2.11.0-2ubuntu1) disco; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:
diff -Nru php-horde-mime-2.11.0/debian/control php-horde-mime-2.11.0/debian/control
--- php-horde-mime-2.11.0/debian/control	2019-02-07 14:07:56.000000000 +0000
+++ php-horde-mime-2.11.0/debian/control	2019-09-16 12:26:46.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-horde-mime
 Section: php
 Priority: optional
-Maintainer: Horde Maintainers <team+debian-horde-team at tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Horde Maintainers <team+debian-horde-team at tracker.debian.org>
 Uploaders: Mathieu Parent <sathieu at debian.org>
 Build-Depends: debhelper (>= 11), pkg-php-tools, pear-horde-channel
 Standards-Version: 4.1.4
diff -Nru php-horde-mime-2.11.0/debian/patches/include_alltests.patch php-horde-mime-2.11.0/debian/patches/include_alltests.patch
--- php-horde-mime-2.11.0/debian/patches/include_alltests.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-horde-mime-2.11.0/debian/patches/include_alltests.patch	2019-09-16 12:26:46.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix test failure with "Class 'Horde_Test_Case' not found"
+ error, by explicitly including AllTests.php.  I get the impression this
+ should really be automatically included but is not in our case.
+Author: Bryce Harrington <bryce at canonical.com>
+Origin: vendor
+Last-Update: 2019-09-16
+
+diff -Nurp php-horde-mime-2.11.0/Horde_Mime-2.11.0/test/Horde/Mime/Filter/EncodingTest.php php-horde-mime-2.11.0-fixed/Horde_Mime-2.11.0/test/Horde/Mime/Filter/EncodingTest.php
+--- php-horde-mime-2.11.0/Horde_Mime-2.11.0/test/Horde/Mime/Filter/EncodingTest.php	2018-01-14 22:49:19.000000000 +0000
++++ php-horde-mime-2.11.0-fixed/Horde_Mime-2.11.0/test/Horde/Mime/Filter/EncodingTest.php	2019-09-13 21:40:17.263283745 +0000
+@@ -1,4 +1,7 @@
+ <?php
++
++require_once 'test/Horde/Mime/AllTests.php';
++
+ /**
+  * Copyright 2014-2017 Horde LLC (http://www.horde.org/)
+  *
diff -Nru php-horde-mime-2.11.0/debian/patches/series php-horde-mime-2.11.0/debian/patches/series
--- php-horde-mime-2.11.0/debian/patches/series	2018-02-16 17:22:41.000000000 +0000
+++ php-horde-mime-2.11.0/debian/patches/series	2019-09-16 12:26:46.000000000 +0000
@@ -1 +1,3 @@
 phpunit6_compatibility.patch
+include_alltests.patch
+test_add_assert.patch
diff -Nru php-horde-mime-2.11.0/debian/patches/test_add_assert.patch php-horde-mime-2.11.0/debian/patches/test_add_assert.patch
--- php-horde-mime-2.11.0/debian/patches/test_add_assert.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-horde-mime-2.11.0/debian/patches/test_add_assert.patch	2019-09-16 12:26:46.000000000 +0000
@@ -0,0 +1,17 @@
+Description: Fix a minor warning about lack of any asserts in a test
+ case, by adding a trivial null object check.
+Author: Bryce Harrington <bryce at canonical.com>
+Origin: vendor
+Last-Update: 2019-09-16
+
+diff -Nurp php-horde-mime-2.11.0/Horde_Mime-2.11.0/test/Horde/Mime/HeadersTest.php php-horde-mime-2.11.0-fixed/Horde_Mime-2.11.0/test/Horde/Mime/HeadersTest.php
+--- php-horde-mime-2.11.0/Horde_Mime-2.11.0/test/Horde/Mime/HeadersTest.php	2019-09-13 21:43:16.000000000 +0000
++++ php-horde-mime-2.11.0-fixed/Horde_Mime-2.11.0/test/Horde/Mime/HeadersTest.php	2019-09-13 21:42:38.431218267 +0000
+@@ -688,6 +688,7 @@ class Horde_Mime_HeadersTest extends PHP
+     {
+         $hdrs = new Horde_Mime_Headers();
+ 
++	$this->assertNotNull($ob);
+         try {
+             $hdrs->addHeaderOb($ob, true);
+             if (!$valid) {