22
33namespace Amp \PHPUnit \Test ;
44
5- use Amp \Deferred ;
5+ use Amp \DeferredFuture ;
66use Amp \Future ;
77use Amp \PHPUnit \AsyncTestCase ;
88use Amp \PHPUnit \LoopCaughtException ;
@@ -27,13 +27,13 @@ public function cleanup(): void
2727
2828 public function testThatMethodRunsInLoopContext (): Future
2929 {
30- $ returnDeferred = new Deferred ; // make sure our test runs to completion
31- $ testDeferred = new Deferred ; // used by our defer callback to ensure we're running on the Loop
30+ $ returnDeferred = new DeferredFuture ; // make sure our test runs to completion
31+ $ testDeferred = new DeferredFuture ; // used by our defer callback to ensure we're running on the Loop
3232
3333 EventLoop::queue (function () use ($ testDeferred , $ returnDeferred ): void {
3434 $ data = $ testDeferred ->getFuture ()->await ();
3535 self ::assertEquals ('foobar ' , $ data , 'Expected the data to be what was resolved in EventLoop::defer ' );
36- $ returnDeferred ->complete (null );
36+ $ returnDeferred ->complete ();
3737 });
3838
3939 EventLoop::queue (function () use ($ testDeferred ): void {
@@ -45,7 +45,7 @@ public function testThatMethodRunsInLoopContext(): Future
4545
4646 public function testThatWeHandleNullReturn (): void
4747 {
48- $ testDeferred = new Deferred ;
48+ $ testDeferred = new DeferredFuture ;
4949 $ testData = new \stdClass ;
5050 $ testData ->val = null ;
5151 EventLoop::defer (function () use ($ testData , $ testDeferred ) {
@@ -60,7 +60,7 @@ public function testThatWeHandleNullReturn(): void
6060
6161 public function testReturningFuture (): Future
6262 {
63- $ deferred = new Deferred ;
63+ $ deferred = new DeferredFuture ;
6464
6565 EventLoop::delay (0.1 , fn () => $ deferred ->complete ('value ' ));
6666
@@ -136,9 +136,9 @@ public function testSetTimeoutWithFuture(): Future
136136 $ this ->expectException (AssertionFailedError::class);
137137 $ this ->expectExceptionMessage ('Expected test to complete before 0.100s time limit ' );
138138
139- $ deferred = new Deferred ;
139+ $ deferred = new DeferredFuture ;
140140
141- EventLoop::delay (0.2 , fn () => $ deferred ->complete (null ));
141+ EventLoop::delay (0.2 , fn () => $ deferred ->complete ());
142142
143143 return $ deferred ->getFuture ();
144144 }
@@ -183,7 +183,7 @@ public function testThrowToEventLoop(): void
183183 $ pattern = "/(.+) thrown to event loop error handler: (.*)/ " ;
184184 $ this ->expectExceptionMessageMatches ($ pattern );
185185
186- (new Deferred )->getFuture ()->await ();
186+ (new DeferredFuture )->getFuture ()->await ();
187187 }
188188
189189 public function testCleanupInvoked (): void
0 commit comments