Merge branch 'master' into v3

Author: trowski

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 amphp
+Copyright (c) 2017-2021 amphp (Niklas Keller, Aaron Piotrowski, and contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -6,7 +6,7 @@
 
 **Required PHP Version**
 
-- PHP 7.0+
+- PHP 7.1+
 
 ## Installation
 
@@ -32,26 +32,8 @@ class BarTest extends AsyncTestCase
     {
         $socket = yield Socket\connect('tcp://localhost:12345');
         yield $socket->write('foobar');
-        
+
         $this->assertSame('foobar', yield ByteStream\buffer($socket));
     }
 }
 ```
-
-#### Deprecated Functionality
-
-This package also provides a PHPUnit `TestListener` to reset the global event loop after each test, but this is deprecated.
-
-```xml
-<phpunit>
-    <!-- ... -->
-
-    <!-- DEPRECATED, use AsyncTestCase instead -->
-    <listeners>
-        <!-- DEPRECATED, use AsyncTestCase instead --> 
-        <listener class="Amp\PHPUnit\LoopReset" />
-    </listeners>
-
-    <!-- ... -->
-</phpunit>
-```

src/AsyncTestCase.php

@@ -153,6 +153,10 @@ final protected function setMinimumRuntime(float $seconds): void
      */
     final protected function setTimeout(float $seconds): void
     {
+        if (isset($this->timeoutId)) {
+            EventLoop::cancel($this->timeoutId);
+        }
+
         $this->timeoutId = EventLoop::delay($seconds, function () use ($seconds): void {
             EventLoop::setErrorHandler(null);
 

test/AsyncTestCaseTest.php

@@ -123,10 +123,20 @@ public function testReturnValueFromDependentTest(string $value = null): void
 
     public function testSetTimeout(): void
     {
-        $this->setTimeout(0.1);
+        $this->setTimeout(0.5);
         $this->expectNotToPerformAssertions();
 
-        delay(0.05);
+        delay(0.25);
+    }
+
+    public function testSetTimeoutReplace(): void
+    {
+        $this->setTimeout(0.5);
+        $this->setTimeout(1);
+
+        delay(0.75);
+
+        $this->expectNotToPerformAssertions();
     }
 
     public function testSetTimeoutWithFuture(): Future
@@ -155,12 +165,12 @@ public function testSetTimeoutWithAwait(): void
 
     public function testSetMinimumRunTime(): void
     {
-        $this->setMinimumRuntime(0.1);
+        $this->setMinimumRuntime(1);
 
         $this->expectException(AssertionFailedError::class);
-        $this->expectExceptionMessageMatches("/Expected test to take at least 0.100s but instead took 0.\d{3}s/");
+        $this->expectExceptionMessageMatches("/Expected test to take at least 1.000s but instead took 0.\d{3}s/");
 
-        delay(0.05);
+        delay(0.5);
     }
 
     public function testCreateCallback(): void