stop all server processes after tests have run

xabbuh · xabbuh · commit 36345e077e21 · 2024-03-26T20:42:53.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/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([
diff --git a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php b/src/Symfony/Component/HttpClient/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());
diff --git a/src/Symfony/Component/HttpClient/Tests/Psr18ClientTest.php b/src/Symfony/Component/HttpClient/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();
diff --git a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
@@ -27,6 +27,11 @@
 
 class RetryableHttpClientTest extends TestCase
 {
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop();
+    }
+
     public function testRetryOnError()
     {
         $client = new RetryableHttpClient(
diff --git a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php b/src/Symfony/Component/HttpClient/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);
diff --git a/src/Symfony/Component/HttpClient/composer.json b/src/Symfony/Component/HttpClient/composer.json
@@ -25,7 +25,7 @@
         "php": ">=7.2.5",
         "psr/log": "^1|^2|^3",
         "symfony/deprecation-contracts": "^2.1|^3",
-        "symfony/http-client-contracts": "^2.4",
+        "symfony/http-client-contracts": "^2.6",
         "symfony/polyfill-php73": "^1.11",
         "symfony/polyfill-php80": "^1.16",
         "symfony/service-contracts": "^1.0|^2|^3"
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -28,6 +28,12 @@ public static function setUpBeforeClass(): void
         TestHttpServer::start();
     }
 
+    public static function tearDownAfterClass(): void
+    {
+        TestHttpServer::stop(8067);
+        TestHttpServer::stop(8077);
+    }
+
     abstract protected function getHttpClient(string $testCase): HttpClientInterface;
 
     public function testGetRequest()
diff --git a/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php b/src/Symfony/Contracts/HttpClient/Test/TestHttpServer.php
@@ -43,4 +43,11 @@ public static function start(int $port = 8057)
 
         return $process;
     }
+
+    public static function stop(int $port = 8057)
+    {
+        if (isset(self::$process[$port])) {
+            self::$process[$port]->stop();
+        }
+    }
 }
diff --git a/src/Symfony/Contracts/composer.json b/src/Symfony/Contracts/composer.json
@@ -52,7 +52,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "2.5-dev"
+            "dev-main": "2.6-dev"
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,11 @@ public static function setUpBeforeClass(): void`
`24`	`24`	`TestHttpServer::start();`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public static function tearDownAfterClass(): void`
	`28`	`+ {`
	`29`	`+ TestHttpServer::stop();`
	`30`	`+ }`
	`31`	`+`
`27`	`32`	`public function testItCollectsRequestCount()`
`28`	`33`	`{`
`29`	`34`	`$httpClient1 = $this->httpClientThatHasTracedRequests([`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ public static function setUpBeforeClass(): void`
`32`	`32`	`TestHttpServer::start();`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ public static function tearDownAfterClass(): void`
	`36`	`+ {`
	`37`	`+ TestHttpServer::stop();`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`public function testSendRequest()`
`36`	`41`	`{`
`37`	`42`	`$client = new HttplugClient(new NativeHttpClient());`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@ public static function setUpBeforeClass(): void`
`28`	`28`	`TestHttpServer::start();`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ public static function tearDownAfterClass(): void`
	`32`	`+ {`
	`33`	`+ TestHttpServer::stop();`
	`34`	`+ }`
	`35`	`+`
`31`	`36`	`public function testSendRequest()`
`32`	`37`	`{`
`33`	`38`	`$factory = new Psr17Factory();`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,11 @@`
`27`	`27`
`28`	`28`	`class RetryableHttpClientTest extends TestCase`
`29`	`29`	`{`
	`30`	`+ public static function tearDownAfterClass(): void`
	`31`	`+ {`
	`32`	`+ TestHttpServer::stop();`
	`33`	`+ }`
	`34`	`+`
`30`	`35`	`public function testRetryOnError()`
`31`	`36`	`{`
`32`	`37`	`$client = new RetryableHttpClient(`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ public static function setUpBeforeClass(): void`
`29`	`29`	`TestHttpServer::start();`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ public static function tearDownAfterClass(): void`
	`33`	`+ {`
	`34`	`+ TestHttpServer::stop();`
	`35`	`+ }`
	`36`	`+`
`32`	`37`	`public function testItTracesRequest()`
`33`	`38`	`{`
`34`	`39`	`$httpClient = $this->createMock(HttpClientInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -43,4 +43,11 @@ public static function start(int $port = 8057)`
`43`	`43`
`44`	`44`	`return $process;`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ public static function stop(int $port = 8057)`
	`48`	`+ {`
	`49`	`+ if (isset(self::$process[$port])) {`
	`50`	`+ self::$process[$port]->stop();`
	`51`	`+ }`
	`52`	`+ }`
`46`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`"minimum-stability": "dev",`
`53`	`53`	`"extra": {`
`54`	`54`	`"branch-alias": {`
`55`		`- "dev-main": "2.5-dev"`
	`55`	`+ "dev-main": "2.6-dev"`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`