Merge branch '4.4' into 5.3

nicolas-grekas · nicolas-grekas · commit 88c008116af2 · 2021-12-29T11:09:56.000+01:00
* 4.4:
  [DependencyInjection][HttpKernel] Fix enum typed bindings
  [CI] Remove macOS jobs
  Suppress psalm error for UndefinedDocblockClass for PHP 8.1 classes
diff --git a/HttpClient/Test/HttpClientTestCase.php b/HttpClient/Test/HttpClientTestCase.php
@@ -835,9 +835,6 @@ public function testTimeoutWithActiveConcurrentStream()
         }
     }
 
-    /**
-     * @group transient-on-macos
-     */
     public function testTimeoutOnInitialize()
     {
         $p1 = TestHttpServer::start(8067);
@@ -871,9 +868,6 @@ public function testTimeoutOnInitialize()
         }
     }
 
-    /**
-     * @group transient-on-macos
-     */
     public function testTimeoutOnDestruct()
     {
         $p1 = TestHttpServer::start(8067);

Original file line number	Diff line number	Diff line change
`@@ -835,9 +835,6 @@ public function testTimeoutWithActiveConcurrentStream()`
`835`	`835`	`}`
`836`	`836`	`}`
`837`	`837`
`838`		`- /**`
`839`		`- * @group transient-on-macos`
`840`		`- */`
`841`	`838`	`public function testTimeoutOnInitialize()`
`842`	`839`	`{`
`843`	`840`	`$p1 = TestHttpServer::start(8067);`
`@@ -871,9 +868,6 @@ public function testTimeoutOnInitialize()`
`871`	`868`	`}`
`872`	`869`	`}`
`873`	`870`
`874`		`- /**`
`875`		`- * @group transient-on-macos`
`876`		`- */`
`877`	`871`	`public function testTimeoutOnDestruct()`
`878`	`872`	`{`
`879`	`873`	`$p1 = TestHttpServer::start(8067);`