diff -Nru php-react-promise-2.4.1/debian/changelog php-react-promise-2.4.1/debian/changelog
--- php-react-promise-2.4.1/debian/changelog	2016-05-04 00:40:39.000000000 +0000
+++ php-react-promise-2.4.1/debian/changelog	2018-02-16 22:38:01.000000000 +0000
@@ -1,3 +1,10 @@
+php-react-promise (2.4.1-1ubuntu1) bionic; urgency=medium
+
+  * debian/patches/phpunit6_compatibility.patch: PHPUnit 6 has non-BC
+    changes.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 16 Feb 2018 14:38:01 -0800
+
 php-react-promise (2.4.1-1) unstable; urgency=medium
 
   [ Jan Sorgalla ]
diff -Nru php-react-promise-2.4.1/debian/control php-react-promise-2.4.1/debian/control
--- php-react-promise-2.4.1/debian/control	2016-05-04 00:38:51.000000000 +0000
+++ php-react-promise-2.4.1/debian/control	2018-02-16 22:38:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: php-react-promise
 Section: php
 Priority: optional
-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper (>= 9), phpab, phpunit, pkg-php-tools (>= 1.7~)
 Standards-Version: 3.9.8
diff -Nru php-react-promise-2.4.1/debian/patches/phpunit6_compatibility.patch php-react-promise-2.4.1/debian/patches/phpunit6_compatibility.patch
--- php-react-promise-2.4.1/debian/patches/phpunit6_compatibility.patch	1970-01-01 00:00:00.000000000 +0000
+++ php-react-promise-2.4.1/debian/patches/phpunit6_compatibility.patch	2018-02-16 22:37:59.000000000 +0000
@@ -0,0 +1,420 @@
+Description: PHPUnit 6 has non-BC changes
+ Namespaced classes, getMock -> createMock, setExpectedExpectation ->
+ expectExpectation.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Forwarded: Will be done by Nishanth Aravamudan
+Last-Update: 2018-02-16
+
+--- php-react-promise-2.4.1.orig/tests/CancellationQueueTest.php
++++ php-react-promise-2.4.1/tests/CancellationQueueTest.php
+@@ -72,9 +72,9 @@ class CancellationQueueTest extends Test
+     /** @test */
+     public function rethrowsExceptionsThrownFromCancel()
+     {
+-        $this->setExpectedException('\Exception', 'test');
++        $this->expectException('\Exception', 'test');
+ 
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel')
+--- php-react-promise-2.4.1.orig/tests/FulfilledPromiseTest.php
++++ php-react-promise-2.4.1/tests/FulfilledPromiseTest.php
+@@ -43,7 +43,7 @@ class FulfilledPromiseTest extends TestC
+     /** @test */
+     public function shouldThrowExceptionIfConstructedWithAPromise()
+     {
+-        $this->setExpectedException('\InvalidArgumentException');
++        $this->expectException('\InvalidArgumentException');
+ 
+         return new FulfilledPromise(new FulfilledPromise());
+     }
+--- php-react-promise-2.4.1.orig/tests/FunctionAnyTest.php
++++ php-react-promise-2.4.1/tests/FunctionAnyTest.php
+@@ -150,7 +150,7 @@ class FunctionAnyTest extends TestCase
+     /** @test */
+     public function shouldCancelInputPromise()
+     {
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel');
+@@ -161,12 +161,12 @@ class FunctionAnyTest extends TestCase
+     /** @test */
+     public function shouldCancelInputArrayPromises()
+     {
+-        $mock1 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock1 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock1
+             ->expects($this->once())
+             ->method('cancel');
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+@@ -186,7 +186,7 @@ class FunctionAnyTest extends TestCase
+         $deferred = New Deferred($mock);
+         $deferred->resolve();
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+--- php-react-promise-2.4.1.orig/tests/FunctionMapTest.php
++++ php-react-promise-2.4.1/tests/FunctionMapTest.php
+@@ -141,7 +141,7 @@ class FunctionMapTest extends TestCase
+     /** @test */
+     public function shouldCancelInputPromise()
+     {
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel');
+@@ -155,12 +155,12 @@ class FunctionMapTest extends TestCase
+     /** @test */
+     public function shouldCancelInputArrayPromises()
+     {
+-        $mock1 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock1 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock1
+             ->expects($this->once())
+             ->method('cancel');
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+--- php-react-promise-2.4.1.orig/tests/FunctionRaceTest.php
++++ php-react-promise-2.4.1/tests/FunctionRaceTest.php
+@@ -137,7 +137,7 @@ class FunctionRaceTest extends TestCase
+     /** @test */
+     public function shouldCancelInputPromise()
+     {
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel');
+@@ -148,12 +148,12 @@ class FunctionRaceTest extends TestCase
+     /** @test */
+     public function shouldCancelInputArrayPromises()
+     {
+-        $mock1 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock1 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock1
+             ->expects($this->once())
+             ->method('cancel');
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+@@ -172,7 +172,7 @@ class FunctionRaceTest extends TestCase
+         $deferred = New Deferred($mock);
+         $deferred->resolve();
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+@@ -191,7 +191,7 @@ class FunctionRaceTest extends TestCase
+         $deferred = New Deferred($mock);
+         $deferred->reject();
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+--- php-react-promise-2.4.1.orig/tests/FunctionReduceTest.php
++++ php-react-promise-2.4.1/tests/FunctionReduceTest.php
+@@ -307,7 +307,7 @@ class FunctionReduceTest extends TestCas
+     /** @test */
+     public function shouldCancelInputPromise()
+     {
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel');
+@@ -322,12 +322,12 @@ class FunctionReduceTest extends TestCas
+     /** @test */
+     public function shouldCancelInputArrayPromises()
+     {
+-        $mock1 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock1 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock1
+             ->expects($this->once())
+             ->method('cancel');
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+--- php-react-promise-2.4.1.orig/tests/FunctionResolveTest.php
++++ php-react-promise-2.4.1/tests/FunctionResolveTest.php
+@@ -162,7 +162,7 @@ class FunctionResolveTest extends TestCa
+     /** @test */
+     public function returnsExtendePromiseForSimplePromise()
+     {
+-        $promise = $this->getMock('React\Promise\PromiseInterface');
++        $promise = $this->createMock('React\Promise\PromiseInterface');
+ 
+         $this->assertInstanceOf('React\Promise\ExtendedPromiseInterface', resolve($promise));
+     }
+--- php-react-promise-2.4.1.orig/tests/FunctionSomeTest.php
++++ php-react-promise-2.4.1/tests/FunctionSomeTest.php
+@@ -184,7 +184,7 @@ class FunctionSomeTest extends TestCase
+     /** @test */
+     public function shouldCancelInputPromise()
+     {
+-        $mock = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock
+             ->expects($this->once())
+             ->method('cancel');
+@@ -195,12 +195,12 @@ class FunctionSomeTest extends TestCase
+     /** @test */
+     public function shouldCancelInputArrayPromises()
+     {
+-        $mock1 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock1 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock1
+             ->expects($this->once())
+             ->method('cancel');
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+@@ -219,7 +219,7 @@ class FunctionSomeTest extends TestCase
+         $deferred = New Deferred($mock);
+         $deferred->resolve();
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+@@ -238,7 +238,7 @@ class FunctionSomeTest extends TestCase
+         $deferred = New Deferred($mock);
+         $deferred->reject();
+ 
+-        $mock2 = $this->getMock('React\Promise\CancellablePromiseInterface');
++        $mock2 = $this->createMock('React\Promise\CancellablePromiseInterface');
+         $mock2
+             ->expects($this->once())
+             ->method('cancel');
+--- php-react-promise-2.4.1.orig/tests/PromiseTest/NotifyTestTrait.php
++++ php-react-promise-2.4.1/tests/PromiseTest/NotifyTestTrait.php
+@@ -326,7 +326,7 @@ trait NotifyTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(null, null, function () {
+             throw new \Exception('UnhandledRejectionException');
+--- php-react-promise-2.4.1.orig/tests/PromiseTest/PromiseFulfilledTestTrait.php
++++ php-react-promise-2.4.1/tests/PromiseTest/PromiseFulfilledTestTrait.php
+@@ -216,7 +216,7 @@ trait PromiseFulfilledTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $adapter->resolve(1);
+         $this->assertNull($adapter->promise()->done(function () {
+@@ -229,7 +229,7 @@ trait PromiseFulfilledTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $adapter->resolve(1);
+         $this->assertNull($adapter->promise()->done(function () {
+--- php-react-promise-2.4.1.orig/tests/PromiseTest/PromiseRejectedTestTrait.php
++++ php-react-promise-2.4.1/tests/PromiseTest/PromiseRejectedTestTrait.php
+@@ -204,7 +204,7 @@ trait PromiseRejectedTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $adapter->reject(1);
+         $this->assertNull($adapter->promise()->done(null, function () {
+@@ -217,7 +217,7 @@ trait PromiseRejectedTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $adapter->reject(1);
+         $this->assertNull($adapter->promise()->done());
+@@ -247,7 +247,7 @@ trait PromiseRejectedTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $adapter->reject(1);
+         $this->assertNull($adapter->promise()->done(null, function () {
+@@ -260,7 +260,7 @@ trait PromiseRejectedTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $adapter->reject(1);
+         $this->assertNull($adapter->promise()->done(null, function () {
+@@ -273,7 +273,7 @@ trait PromiseRejectedTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $adapter->reject(new \Exception('UnhandledRejectionException'));
+         $this->assertNull($adapter->promise()->done());
+@@ -282,7 +282,7 @@ trait PromiseRejectedTestTrait
+     /** @test */
+     public function doneShouldThrowWithDeepNestingPromiseChainsForRejectedPromise()
+     {
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $exception = new \Exception('UnhandledRejectionException');
+ 
+--- php-react-promise-2.4.1.orig/tests/PromiseTest/RejectTestTrait.php
++++ php-react-promise-2.4.1/tests/PromiseTest/RejectTestTrait.php
+@@ -149,7 +149,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(null, function () {
+             throw new \Exception('UnhandledRejectionException');
+@@ -162,7 +162,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done());
+         $adapter->reject(1);
+@@ -173,7 +173,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(null, function () {
+             return \React\Promise\reject();
+@@ -186,7 +186,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(null, function () {
+             return \React\Promise\reject(new \Exception('UnhandledRejectionException'));
+@@ -199,7 +199,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $d = new Deferred();
+         $promise = $d->promise();
+@@ -216,7 +216,7 @@ trait RejectTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done());
+         $adapter->reject(new \Exception('UnhandledRejectionException'));
+@@ -225,7 +225,7 @@ trait RejectTestTrait
+     /** @test */
+     public function doneShouldThrowWithDeepNestingPromiseChains()
+     {
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $exception = new \Exception('UnhandledRejectionException');
+ 
+--- php-react-promise-2.4.1.orig/tests/PromiseTest/ResolveTestTrait.php
++++ php-react-promise-2.4.1/tests/PromiseTest/ResolveTestTrait.php
+@@ -132,7 +132,7 @@ trait ResolveTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('\Exception', 'UnhandledRejectionException');
++        $this->expectException('\Exception', 'UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(function () {
+             throw new \Exception('UnhandledRejectionException');
+@@ -145,7 +145,7 @@ trait ResolveTestTrait
+     {
+         $adapter = $this->getPromiseTestAdapter();
+ 
+-        $this->setExpectedException('React\\Promise\\UnhandledRejectionException');
++        $this->expectException('React\\Promise\\UnhandledRejectionException');
+ 
+         $this->assertNull($adapter->promise()->done(function () {
+             return \React\Promise\reject();
+--- php-react-promise-2.4.1.orig/tests/RejectedPromiseTest.php
++++ php-react-promise-2.4.1/tests/RejectedPromiseTest.php
+@@ -43,7 +43,7 @@ class RejectedPromiseTest extends TestCa
+     /** @test */
+     public function shouldThrowExceptionIfConstructedWithAPromise()
+     {
+-        $this->setExpectedException('\InvalidArgumentException');
++        $this->expectException('\InvalidArgumentException');
+ 
+         return new RejectedPromise(new RejectedPromise());
+     }
+--- php-react-promise-2.4.1.orig/tests/TestCase.php
++++ php-react-promise-2.4.1/tests/TestCase.php
+@@ -2,7 +2,7 @@
+ 
+ namespace React\Promise;
+ 
+-class TestCase extends \PHPUnit_Framework_TestCase
++class TestCase extends \PHPUnit\Framework\TestCase
+ {
+     public function expectCallableExactly($amount)
+     {
+@@ -36,6 +36,6 @@ class TestCase extends \PHPUnit_Framewor
+ 
+     public function createCallableMock()
+     {
+-        return $this->getMock('React\\Promise\Stub\CallableStub');
++        return $this->createMock('React\\Promise\Stub\CallableStub');
+     }
+ }
diff -Nru php-react-promise-2.4.1/debian/patches/series php-react-promise-2.4.1/debian/patches/series
--- php-react-promise-2.4.1/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ php-react-promise-2.4.1/debian/patches/series	2018-02-16 22:36:52.000000000 +0000
@@ -0,0 +1 @@
+phpunit6_compatibility.patch