Merge branch '5.3' into 5.4

* 5.3: [DependencyInjection][HttpKernel] Fix enum typed bindings make login link handler tests time sensitive [CI] Remove macOS jobs Suppress psalm error for UndefinedDocblockClass for PHP 8.1 classes
symfony · Dec 29, 2021 · 5e344f1 · 5e344f1
2 parents 5538a43 + 6b47b47
commit 5e344f1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/Tests/AsyncDecoratorTraitTest.php b/Tests/AsyncDecoratorTraitTest.php
@@ -54,9 +54,6 @@ public function request(string $method, string $url, array $options = []): Respo
         };
     }
 
-    /**
-     * @group transient-on-macos
-     */
     public function testTimeoutOnDestruct()
     {
         if (HttpClient::create() instanceof NativeHttpClient) {

diff --git a/Tests/HttpClientTestCase.php b/Tests/HttpClientTestCase.php
@@ -32,9 +32,6 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase
 {
     private static $vulcainStarted = false;
 
-    /**
-     * @group transient-on-macos
-     */
     public function testTimeoutOnDestruct()
     {
         if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {
-Original file line number
+Diff line change
@@ Expand Up @@
             };
         }
-        /**
-         * @group transient-on-macos
-         */
         public function testTimeoutOnDestruct()
         {
             if (HttpClient::create() instanceof NativeHttpClient) {
@@ Expand Down @@