Merge branch '7.0' into 7.1

* 7.0: be explicit about the signal to reset fix Finder test using the ftp wrapper by switching the server being used use firewall-specific user checkers when manually logging in users
symfony · Jul 24, 2024 · b4b10ae · b4b10ae
2 parents 0aa29ca + 47e37d8
commit b4b10ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/Tests/ApplicationTest.php b/Tests/ApplicationTest.php
@@ -71,12 +71,10 @@ protected function tearDown(): void
 
         if (\function_exists('pcntl_signal')) {
             // We reset all signals to their default value to avoid side effects
-            for ($i = 1; $i <= 15; ++$i) {
-                if (9 === $i) {
-                    continue;
-                }
-                pcntl_signal($i, \SIG_DFL);
-            }
+            pcntl_signal(\SIGINT, \SIG_DFL);
+            pcntl_signal(\SIGTERM, \SIG_DFL);
+            pcntl_signal(\SIGUSR1, \SIG_DFL);
+            pcntl_signal(\SIGUSR2, \SIG_DFL);
         }
     }
 

diff --git a/Tests/ConsoleEventsTest.php b/Tests/ConsoleEventsTest.php
@@ -35,12 +35,10 @@ protected function tearDown(): void
         if (\function_exists('pcntl_signal')) {
             pcntl_async_signals(false);
             // We reset all signals to their default value to avoid side effects
-            for ($i = 1; $i <= 15; ++$i) {
-                if (9 === $i) {
-                    continue;
-                }
-                pcntl_signal($i, \SIG_DFL);
-            }
+            pcntl_signal(\SIGINT, \SIG_DFL);
+            pcntl_signal(\SIGTERM, \SIG_DFL);
+            pcntl_signal(\SIGUSR1, \SIG_DFL);
+            pcntl_signal(\SIGUSR2, \SIG_DFL);
         }
     }
 

diff --git a/Tests/SignalRegistry/SignalRegistryTest.php b/Tests/SignalRegistry/SignalRegistryTest.php
@@ -23,12 +23,10 @@ protected function tearDown(): void
     {
         pcntl_async_signals(false);
         // We reset all signals to their default value to avoid side effects
-        for ($i = 1; $i <= 15; ++$i) {
-            if (9 === $i) {
-                continue;
-            }
-            pcntl_signal($i, \SIG_DFL);
-        }
+        pcntl_signal(\SIGINT, \SIG_DFL);
+        pcntl_signal(\SIGTERM, \SIG_DFL);
+        pcntl_signal(\SIGUSR1, \SIG_DFL);
+        pcntl_signal(\SIGUSR2, \SIG_DFL);
     }
 
     public function testOneCallbackForASignalSignalIsHandled()