Просмотр исходного кода

Improvement for the fix

To follow @Seldaek improvement recommendations.
Sorry for the rookie mistakes :)
Pierre Lannoy 6 лет назад
Родитель
Сommit
144f2299ed
1 измененных файлов с 6 добавлено и 11 удалено
  1. 6 11
      src/Monolog/Handler/SyslogUdpHandler.php

+ 6 - 11
src/Monolog/Handler/SyslogUdpHandler.php

@@ -82,7 +82,7 @@ class SyslogUdpHandler extends AbstractSyslogHandler
     /**
      * Make common syslog header (see rfc5424 or rfc3164)
      */
-    protected function makeCommonSyslogHeader(int $severity, DateTimeImmutable $datetime): string
+    protected function makeCommonSyslogHeader(int $severity, DateTimeInterface $datetime): string
     {
         $priority = $severity + $this->facility;
 
@@ -95,12 +95,12 @@ class SyslogUdpHandler extends AbstractSyslogHandler
         }
 
         if ($this->rfc === self::RFC3164) {
-	    	$datetime->setTimezone(new \DateTimeZone('UTC'));
-	    }
-		$date = $datetime->format($this->dateFormats[$this->rfc]);
+	    $datetime->setTimezone(new \DateTimeZone('UTC'));
+	}
+	$date = $datetime->format($this->dateFormats[$this->rfc]);
 
-	    if ($this->rfc === self::RFC3164) {
-        	return "<$priority>" .
+	if ($this->rfc === self::RFC3164) {
+            return "<$priority>" .
                 $date . " " .
                 $hostname . " " .
                 $this->ident . "[" . $pid . "]: ";
@@ -113,11 +113,6 @@ class SyslogUdpHandler extends AbstractSyslogHandler
         }
     }
 
-    protected function getDateTime(): string
-    {
-        return date($this->dateFormats[$this->rfc]);
-    }
-
     /**
      * Inject your own socket, mainly used for testing
      */