Skip to content

Commit b4b10ae

Browse files
committed
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
2 parents 0aa29ca + 47e37d8 commit b4b10ae

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

Tests/ApplicationTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,10 @@ protected function tearDown(): void
7171

7272
if (\function_exists('pcntl_signal')) {
7373
// We reset all signals to their default value to avoid side effects
74-
for ($i = 1; $i <= 15; ++$i) {
75-
if (9 === $i) {
76-
continue;
77-
}
78-
pcntl_signal($i, \SIG_DFL);
79-
}
74+
pcntl_signal(\SIGINT, \SIG_DFL);
75+
pcntl_signal(\SIGTERM, \SIG_DFL);
76+
pcntl_signal(\SIGUSR1, \SIG_DFL);
77+
pcntl_signal(\SIGUSR2, \SIG_DFL);
8078
}
8179
}
8280

Tests/ConsoleEventsTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ protected function tearDown(): void
3535
if (\function_exists('pcntl_signal')) {
3636
pcntl_async_signals(false);
3737
// We reset all signals to their default value to avoid side effects
38-
for ($i = 1; $i <= 15; ++$i) {
39-
if (9 === $i) {
40-
continue;
41-
}
42-
pcntl_signal($i, \SIG_DFL);
43-
}
38+
pcntl_signal(\SIGINT, \SIG_DFL);
39+
pcntl_signal(\SIGTERM, \SIG_DFL);
40+
pcntl_signal(\SIGUSR1, \SIG_DFL);
41+
pcntl_signal(\SIGUSR2, \SIG_DFL);
4442
}
4543
}
4644

Tests/SignalRegistry/SignalRegistryTest.php

+4-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,10 @@ protected function tearDown(): void
2323
{
2424
pcntl_async_signals(false);
2525
// We reset all signals to their default value to avoid side effects
26-
for ($i = 1; $i <= 15; ++$i) {
27-
if (9 === $i) {
28-
continue;
29-
}
30-
pcntl_signal($i, \SIG_DFL);
31-
}
26+
pcntl_signal(\SIGINT, \SIG_DFL);
27+
pcntl_signal(\SIGTERM, \SIG_DFL);
28+
pcntl_signal(\SIGUSR1, \SIG_DFL);
29+
pcntl_signal(\SIGUSR2, \SIG_DFL);
3230
}
3331

3432
public function testOneCallbackForASignalSignalIsHandled()

0 commit comments

Comments
 (0)