[HttpClient] Fix early cleanup of pushed HTTP/2 responses

Author: lyrixx

HttpClient/Test/Fixtures/web/index.php

@@ -155,6 +155,27 @@
             usleep(500);
         }
         exit;
+
+    case '/json':
+        header("Content-Type: application/json");
+        echo json_encode([
+            'documents' => [
+                ['id' => '/json/1'],
+                ['id' => '/json/2'],
+                ['id' => '/json/3'],
+            ],
+        ]);
+        exit;
+
+    case '/json/1':
+    case '/json/2':
+    case '/json/3':
+        header("Content-Type: application/json");
+        echo json_encode([
+            'title' => $vars['REQUEST_URI'],
+        ]);
+
+        exit;
 }
 
 header('Content-Type: application/json', true);

HttpClient/Test/HttpClientTestCase.php

@@ -24,8 +24,6 @@
  */
 abstract class HttpClientTestCase extends TestCase
 {
-    private static $server;
-
     public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();

HttpClient/Test/TestHttpServer.php

@@ -19,31 +19,22 @@
  */
 class TestHttpServer
 {
-    private static $server;
+    private static $started;
 
     public static function start()
     {
-        if (null !== self::$server) {
+        if (self::$started) {
             return;
         }
 
         $finder = new PhpExecutableFinder();
         $process = new Process(array_merge([$finder->find(false)], $finder->findArguments(), ['-dopcache.enable=0', '-dvariables_order=EGPCS', '-S', '127.0.0.1:8057']));
         $process->setWorkingDirectory(__DIR__.'/Fixtures/web');
-        $process->setTimeout(300);
         $process->start();
 
-        self::$server = new class() {
-            public $process;
-
-            public function __destruct()
-            {
-                $this->process->stop();
-            }
-        };
-
-        self::$server->process = $process;
-
+        register_shutdown_function([$process, 'stop']);
         sleep('\\' === \DIRECTORY_SEPARATOR ? 10 : 1);
+
+        self::$started = true;
     }
 }