Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 0526e8ff10f2 · 2021-12-29T09:52:59.000+01:00
* 5.4:
  Fix transient test
  Fix transient test
diff --git a/Tests/AsyncDecoratorTraitTest.php b/Tests/AsyncDecoratorTraitTest.php
@@ -54,6 +54,9 @@ public function request(string $method, string $url, array $options = []): Respo
         };
     }
 
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnDestruct()
     {
         if (HttpClient::create() instanceof NativeHttpClient) {

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ public function request(string $method, string $url, array $options = []): Respo`
`54`	`54`	`};`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ /**`
	`58`	`+ * @group transient-on-macos`
	`59`	`+ */`
`57`	`60`	`public function testTimeoutOnDestruct()`
`58`	`61`	`{`
`59`	`62`	`if (HttpClient::create() instanceof NativeHttpClient) {`