Skip to content

Commit

Permalink
Merge branch '5.1' into 5.2
Browse files Browse the repository at this point in the history
* 5.1:
  µCS fix
  CS fix
  CS fix
  [travis] use PHP 8.0 to patch return types and run deps=low
  Add me as a Notifier code owner
  Update sl_SI translations
  Don't trigger deprecation for deprecated aliases pointing to deprecated definitions
  [HttpFoundation] use atomic writes in MockFileSessionStorage
  Make EmailMessage & SmsMessage transport nullable
  remove unused argument
  [DI] fix param annotation
  [Config] Add \Symfony\Component\Config\Loader::load() return type
  Simplify PHP CS Fixer config
  Rename normalize param
  • Loading branch information
nicolas-grekas committed Jan 14, 2021
2 parents 7277fc7 + d3e8303 commit 08ceb3a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Tests/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1826,7 +1826,7 @@ public function testSignal()
$application = new Application();
$application->setAutoExit(false);
$application->setDispatcher($dispatcher);
$application->setSignalsToDispatchEvent(SIGALRM);
$application->setSignalsToDispatchEvent(\SIGALRM);
$application->add($command);

$this->assertFalse($command->signaled);
Expand Down Expand Up @@ -1909,7 +1909,7 @@ class SignableCommand extends Command implements SignalableCommandInterface

public function getSubscribedSignals(): array
{
return [SIGALRM];
return [\SIGALRM];
}

public function handleSignal(int $signal): void
Expand Down
4 changes: 2 additions & 2 deletions Tests/Output/ConsoleSectionOutputTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ConsoleSectionOutputTest extends TestCase

protected function setUp(): void
{
$this->stream = fopen('php://memory', 'r+b', false);
$this->stream = fopen('php://memory', 'r+', false);
}

protected function tearDown(): void
Expand Down Expand Up @@ -143,7 +143,7 @@ public function testMultipleSectionsOutput()

public function testClearSectionContainingQuestion()
{
$inputStream = fopen('php://memory', 'r+b', false);
$inputStream = fopen('php://memory', 'r+', false);
fwrite($inputStream, "Batman & Robin\n");
rewind($inputStream);

Expand Down

0 comments on commit 08ceb3a

Please sign in to comment.