1
0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-22 00:56:08 +02:00

Merge branch '1.x'

This commit is contained in:
Jordi Boggiano
2016-09-25 17:41:12 +02:00
3 changed files with 59 additions and 28 deletions

View File

@@ -53,19 +53,19 @@ class SyslogUdpHandler extends AbstractSyslogHandler
$this->socket->close();
}
private function splitMessageIntoLines($message)
private function splitMessageIntoLines($message): array
{
if (is_array($message)) {
$message = implode("\n", $message);
}
return preg_split('/$\R?^/m', $message);
return preg_split('/$\R?^/m', (string) $message, -1, PREG_SPLIT_NO_EMPTY);
}
/**
* Make common syslog header (see rfc5424)
*/
protected function makeCommonSyslogHeader($severity)
protected function makeCommonSyslogHeader($severity): string
{
$priority = $severity + $this->facility;
@@ -75,7 +75,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
/**
* Inject your own socket, mainly used for testing
*/
public function setSocket($socket)
public function setSocket(UdpSocket $socket)
{
$this->socket = $socket;
}