Package: php-horde-activesync
Version: 2.39.0-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu cosmic ubuntu-patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* debian/patches/phpunit6_removed_setExpectedException.patch: PHPUnit6
has removed setExpectedException.
* d/t/phpunit: explicitly specify bootstrap file.
Thanks for considering the patch.
*** /tmp/tmptAScrg/php-horde-activesync_2.39.0-1ubuntu1.debdiff
diff -Nru
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
---
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
1969-12-31 16:00:00.000000000 -0800
+++
php-horde-activesync-2.39.0/debian/patches/phpunit6_removed_setExpectedException.patch
2018-02-14 11:53:17.000000000 -0800
@@ -0,0 +1,45 @@
+Description: PHPUnit6 has removed setExpectedException
+ Replaced with expectException.
+Author: Nishanth Aravamudan <nish.aravamu...@canonical.com>
+Last-Update: 2018-02-14
+
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/CacheTest.php
++++
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/CacheTest.php
+@@ -30,7 +30,7 @@ class Horde_ActiveSync_CacheTest extends
+
+ public function testInvalidPropertyAccess()
+ {
+- $this->setExpectedException('InvalidArgumentException');
++ $this->expectException('InvalidArgumentException');
+ $cache = new Horde_ActiveSync_SyncCache($this->_state, 'devid',
'userone');
+ $cache->collections;
+ }
+@@ -55,4 +55,4 @@ class Horde_ActiveSync_CacheTest extends
+ $this->assertEquals(false, $cache->validateTimestamps());
+ }
+
+-}
+\ No newline at end of file
++}
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/ContactTest.php
++++
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/ContactTest.php
+@@ -15,7 +15,7 @@ class Horde_ActiveSync_ContactTest exten
+ {
+ $contact = new Horde_ActiveSync_Message_Contact();
+
+- $this->setExpectedException('InvalidArgumentException');
++ $this->expectException('InvalidArgumentException');
+ $contact->unknown = 'test';
+ $test = $contact->unknown;
+ }
+---
php-horde-activesync-2.39.0.orig/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/StateTest/Base.php
++++
php-horde-activesync-2.39.0/Horde_ActiveSync-2.39.0/test/Horde/ActiveSync/StateTest/Base.php
+@@ -16,7 +16,7 @@ class Horde_ActiveSync_StateTest_Base ex
+ // First with no existing deivce.
+ $this->assertEquals(false,
(boolean)self::$state->deviceExists('dev123', 'mike'));
+
+- // Can't use setExpectedException here since it stops the rest
++ // Can't use expectException here since it stops the rest
+ // of the method from running when it's thrown.
+ try {
+ self::$state->loadDeviceInfo('dev123', 'mike');
diff -Nru php-horde-activesync-2.39.0/debian/patches/series
php-horde-activesync-2.39.0/debian/patches/series
--- php-horde-activesync-2.39.0/debian/patches/series 1969-12-31
16:00:00.000000000 -0800
+++ php-horde-activesync-2.39.0/debian/patches/series 2018-02-14
11:52:48.000000000 -0800
@@ -0,0 +1 @@
+phpunit6_removed_setExpectedException.patch
diff -Nru php-horde-activesync-2.39.0/debian/tests/phpunit
php-horde-activesync-2.39.0/debian/tests/phpunit
--- php-horde-activesync-2.39.0/debian/tests/phpunit 2017-12-16
07:56:23.000000000 -0800
+++ php-horde-activesync-2.39.0/debian/tests/phpunit 2018-02-14
11:51:34.000000000 -0800
@@ -9,4 +9,4 @@
mysql -e "create database IF NOT EXISTS test; ALTER USER 'root'@'localhost'
IDENTIFIED WITH 'mysql_native_password' BY 'r00t';" -uroot
cd Horde_ActiveSync*/test/./Horde/ActiveSync
-phpunit -v .
+phpunit --bootstrap bootstrap.php -v .
-- System Information:
Debian Release: buster/sid
APT prefers bionic-updates
APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500, 'bionic')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.15.0-20-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
--
