Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[wip] Bugfix/tests window compat #68

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Console/Display/ConcatenatingDisplay.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function __construct(array $displays)

public function render(OutputFormatterInterface $formatter, Status $status): string
{
return implode(PHP_EOL, array_map(function (Display $display) use ($formatter, $status) {
return implode("\n", array_map(function (Display $display) use ($formatter, $status) {
return $display->render($formatter, $status);
}, $this->displays));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Console/Display/ReportListDisplay.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function render(OutputFormatterInterface $formatter, Status $status): str
);
}

return implode(PHP_EOL, $statuses);
return implode("\n", $statuses);
}

private function resolveFormat(bool $last, Report $report)
Expand Down
2 changes: 1 addition & 1 deletion lib/Console/Display/StatusLineDisplay.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function render(OutputFormatterInterface $formatter, Status $status): str
number_format($status->failurePercentage(), 2)
);

return implode(PHP_EOL, [
return implode("\n", [
str_repeat('-', FormatterHelper::strlenWithoutDecoration($formatter, $line)),
$line,
]);
Expand Down
2 changes: 1 addition & 1 deletion lib/Model/Publisher/JsonStreamPublisher.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(OutputStream $outputStream)
public function publish(Report $report): void
{
\Amp\asyncCall(function (Report $report) {
yield $this->outputStream->write(json_encode($report->toArray()).PHP_EOL);
yield $this->outputStream->write(json_encode($report->toArray())."\n");
}, $report);
}
}
3 changes: 2 additions & 1 deletion tests/EndToEnd/EndToEndTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ protected function assertProcessSuccess(Process $process)
protected function finkProcess(array $args): Process
{
$fink = new Process(array_merge([
'bin/fink'
'php',
'bin/fink',
], $args), __DIR__ . '/../..');
return $fink;
}
Expand Down