Merge branch '7.0' into 7.1

* 7.0:
  Revert bumping contract version
  stop all server processes after tests have run

Author: fabpot

Tests/DataCollector/HttpClientDataCollectorTest.php

@@ -24,6 +24,11 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testItCollectsRequestCount()
     {
         $httpClient1 = $this->httpClientThatHasTracedRequests([

Tests/HttplugClientTest.php

@@ -32,6 +32,11 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testSendRequest()
     {
         $client = new HttplugClient(new NativeHttpClient());

Tests/Psr18ClientTest.php

@@ -28,6 +28,11 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testSendRequest()
     {
         $factory = new Psr17Factory();

Tests/RetryableHttpClientTest.php

@@ -27,6 +27,11 @@
 
 class RetryableHttpClientTest extends TestCase
 {
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testRetryOnError()
     {
         $client = new RetryableHttpClient(

Tests/TraceableHttpClientTest.php

@@ -29,6 +29,11 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testItTracesRequest()
     {
         $httpClient = $this->createMock(HttpClientInterface::class);