Merge branch '5.4' into 6.4

fabpot · fabpot · commit b6b5c876b3a4 · 2024-04-01T20:51:09.000+02:00
* 5.4:
  Revert bumping contract version
  stop all server processes after tests have run
diff --git a/Test/HttpClientTestCase.php b/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/Test/TestHttpServer.php b/Test/TestHttpServer.php
@@ -45,4 +45,11 @@ public static function start(int $port = 8057/* , string $workingDirectory = nul
 
         return $process;
     }
+
+    public static function stop(int $port = 8057)
+    {
+        if (isset(self::$process[$port])) {
+            self::$process[$port]->stop();
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,11 @@ public static function start(int $port = 8057/* , string $workingDirectory = nul`
`45`	`45`
`46`	`46`	`return $process;`
`47`	`47`	`}`
	`48`	`+`
	`49`	`+ public static function stop(int $port = 8057)`
	`50`	`+ {`
	`51`	`+ if (isset(self::$process[$port])) {`
	`52`	`+ self::$process[$port]->stop();`
	`53`	`+ }`
	`54`	`+ }`
`48`	`55`	`}`