- chore: force native functions

- chore: use PHP 8 types

Author: kodeart

Processors/Cli.php

@@ -13,25 +13,24 @@
 namespace Koded\Logging\Processors;
 
 /**
- * Log processor for CLI apps.
+ * Log processor for CLI.
  *
  */
 class Cli extends Processor
 {
-    /** @var string Message format */
-    protected $format = '> [timestamp][levelname] - message';
+    protected string $format = '> [timestamp][levelname] - message';
 
     /** @var resource */
     private $handle;
 
     public function __construct(array $settings)
     {
         parent::__construct($settings);
-        $this->handle = defined('STDERR') ? STDERR : fopen('php://stderr', 'w');
+        $this->handle = \defined('STDERR') ? STDERR : \fopen('php://stderr', 'w');
     }
 
     protected function process(array $message): void
     {
-        fwrite($this->handle, strtr($this->format, $message) . PHP_EOL);
+        \fwrite($this->handle, \strtr($this->format, $message) . PHP_EOL);
     }
 }

Processors/ErrorLog.php

@@ -20,6 +20,6 @@ class ErrorLog extends Processor
 {
     protected function process(array $message): void
     {
-        error_log(strtr($this->format, $message), 0);
+        \error_log(strtr($this->format, $message), 0);
     }
 }

Processors/File.php

@@ -31,8 +31,8 @@
  */
 class File extends Processor
 {
-    private $dir = '';
-    private $ext = '';
+    private string $dir = '';
+    private string $ext = '';
 
     /**
      * {@inheritdoc}
@@ -41,15 +41,15 @@ public function __construct(array $settings)
     {
         parent::__construct($settings);
 
-        umask(umask() | 0002);
+        \umask(\umask() | 0002);
         $this->ext = (string)($settings['extension'] ?? '.log');
-        $this->dir = rtrim((string)$settings['dir'], '/');
+        $this->dir = \rtrim((string)$settings['dir'], '/');
 
-        if (false === is_dir($this->dir)) {
+        if (false === \is_dir($this->dir)) {
             throw FileProcessorException::directoryDoesNotExist($this->dir);
         }
 
-        if (false === is_writable($this->dir)) {
+        if (false === \is_writable($this->dir)) {
             throw FileProcessorException::directoryIsNotWritable($this->dir);
         }
 
@@ -60,10 +60,10 @@ protected function process(array $message): void
     {
         try {
             // The filename should be calculated at the moment of writing
-            $dir = $this->dir . date('Y/m');
-            is_dir($dir) || mkdir($dir, 0775, true);
+            $dir = $this->dir . \date('Y/m');
+            \is_dir($dir) || \mkdir($dir, 0775, true);
 
-            file_put_contents($dir . '/' . date('d') . $this->ext, strtr($this->format, $message) . PHP_EOL,
+            \file_put_contents($dir . '/' . \date('d') . $this->ext, \strtr($this->format, $message) . PHP_EOL,
                 FILE_APPEND);
 
             // @codeCoverageIgnoreStart
@@ -78,20 +78,21 @@ protected function process(array $message): void
 class FileProcessorException extends KodedException
 {
     private const
-        E_DIRECTORY_DOES_NOT_EXIST = 1, E_DIRECTORY_NOT_WRITABLE = 2;
+        E_DIRECTORY_DOES_NOT_EXIST = 1,
+        E_DIRECTORY_NOT_WRITABLE = 2;
 
-    protected $messages = [
+    protected array $messages = [
         self::E_DIRECTORY_DOES_NOT_EXIST => 'Log directory ":dir" must exist',
         self::E_DIRECTORY_NOT_WRITABLE   => 'Log directory ":dir" must be writable',
     ];
 
-    public static function directoryDoesNotExist(string $directory): self
+    public static function directoryDoesNotExist(string $directory): static
     {
-        return new self(self::E_DIRECTORY_DOES_NOT_EXIST, [':dir' => $directory]);
+        return new static(static::E_DIRECTORY_DOES_NOT_EXIST, [':dir' => $directory]);
     }
 
-    public static function directoryIsNotWritable(string $directory): self
+    public static function directoryIsNotWritable(string $directory): static
     {
-        return new self(self::E_DIRECTORY_NOT_WRITABLE, [':dir' => $directory]);
+        return new static(static::E_DIRECTORY_NOT_WRITABLE, [':dir' => $directory]);
     }
 }

Processors/Memory.php

@@ -20,6 +20,6 @@ class Memory extends Processor
 {
     protected function process(array $message): void
     {
-        $this->formatted .= PHP_EOL . strtr($this->format, $message);
+        $this->formatted .= PHP_EOL . \strtr($this->format, $message);
     }
 }

Processors/Processor.php

@@ -27,7 +27,7 @@ abstract class Processor
     /**
      * @var string The log message format.
      */
-    protected $format = 'timestamp [levelname]: message';
+    protected string $format = 'timestamp [levelname]: message';
 
     /**
      * @var string Keeps all formatted log messages in this property.

Processors/Syslog.php

@@ -21,7 +21,7 @@
  */
 class Syslog extends Processor
 {
-    protected $format = '[levelname] message';
+    protected string $format = '[levelname] message';
 
     protected function process(array $message): void
     {
@@ -37,10 +37,10 @@ protected function process(array $message): void
         ];
 
         try {
-            openlog(null, LOG_CONS, LOG_USER);
-            syslog($levels[$message['level']] ?? LOG_DEBUG, strtr($this->format, $message));
+            \openlog(null, LOG_CONS, LOG_USER);
+            \syslog($levels[$message['level']] ?? LOG_DEBUG, \strtr($this->format, $message));
         } finally {
-            closelog();
+            \closelog();
         }
     }
 }