Merge branch '4.4' into 5.3

* 4.4:
  Skip transient tests on macos

Author: nicolas-grekas

.github/workflows/unit-tests.yml

@@ -74,7 +74,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
 
           echo COLUMNS=120 >> $GITHUB_ENV
-          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
+          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)

src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php

@@ -835,19 +835,22 @@ public function testTimeoutWithActiveConcurrentStream()
         }
     }
 
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnInitialize()
     {
         $p1 = TestHttpServer::start(8067);
-        $p2 = TestHttpServer::start(8078);
+        $p2 = TestHttpServer::start(8077);
 
         $client = $this->getHttpClient(__FUNCTION__);
         $start = microtime(true);
         $responses = [];
 
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
 
         try {
             foreach ($responses as $response) {
@@ -868,19 +871,22 @@ public function testTimeoutOnInitialize()
         }
     }
 
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnDestruct()
     {
         $p1 = TestHttpServer::start(8067);
-        $p2 = TestHttpServer::start(8078);
+        $p2 = TestHttpServer::start(8077);
 
         $client = $this->getHttpClient(__FUNCTION__);
         $start = microtime(true);
         $responses = [];
 
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
 
         try {
             while ($response = array_shift($responses)) {