Source: add PHP 8.2 native type hints, fix coding style

felixure · f3l1x · commit 9f6056af579b · 2026-01-13T16:53:57.000+01:00
diff --git a/src/AbstractLogger.php b/src/AbstractLogger.php
@@ -11,8 +11,7 @@
 abstract class AbstractLogger implements ILogger
 {
 
-	/** @var string */
-	protected $directory;
+	protected string $directory;
 
 	public function __construct(string $directory)
 	{
diff --git a/src/BlueScreenFileLogger.php b/src/BlueScreenFileLogger.php
@@ -15,19 +15,16 @@
 class BlueScreenFileLogger extends AbstractLogger implements ILogger
 {
 
-	/** @var BlueScreen|null */
-	private $blueScreen;
+	private ?BlueScreen $blueScreen = null;
 
 	public function __construct(string $directory, ?BlueScreen $blueScreen = null)
 	{
 		parent::__construct($directory);
+
 		$this->blueScreen = $blueScreen;
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	public function log($message, string $priority = ILogger::INFO): void
+	public function log(mixed $message, string $priority = ILogger::INFO): void
 	{
 		if (!is_dir($this->directory)) {
 			throw new InvalidStateException('Directory ' . $this->directory . ' is not found or is not directory.');
diff --git a/src/Exceptions/Runtime/Logger/SlackBadRequestException.php b/src/Exceptions/Runtime/Logger/SlackBadRequestException.php
@@ -8,14 +8,15 @@ final class SlackBadRequestException extends RuntimeException
 {
 
 	/** @var mixed[] */
-	private $request;
+	private array $request;
 
 	/**
 	 * @param mixed[] $request
 	 */
 	public function __construct(array $request)
 	{
 		parent::__construct();
+
 		$this->request = $request;
 	}
 
diff --git a/src/FileLogger.php b/src/FileLogger.php
@@ -14,10 +14,7 @@
 class FileLogger extends AbstractLogger implements ILogger
 {
 
-	/**
-	 * @param mixed $message
-	 */
-	public function log($message, string $priority = ILogger::INFO): void
+	public function log(mixed $message, string $priority = ILogger::INFO): void
 	{
 		if (!is_dir($this->directory)) {
 			throw new InvalidStateException('Directory "' . $this->directory . '" is not found or is not directory.');
diff --git a/src/ILogger.php b/src/ILogger.php
@@ -14,9 +14,6 @@ interface ILogger
 	public const EXCEPTION = TracyLogger::EXCEPTION;
 	public const CRITICAL = TracyLogger::CRITICAL;
 
-	/**
-	 * @param mixed $message
-	 */
-	public function log($message, string $priority = ILogger::INFO): void;
+	public function log(mixed $message, string $priority = ILogger::INFO): void;
 
 }
diff --git a/src/Mailer/FileMailer.php b/src/Mailer/FileMailer.php
@@ -8,18 +8,14 @@
 class FileMailer implements IMailer
 {
 
-	/** @var string */
-	private $directory;
+	private string $directory;
 
 	public function __construct(string $directory)
 	{
 		$this->directory = $directory;
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	public function send($message): void
+	public function send(mixed $message): void
 	{
 		/** @var string $host */
 		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['HTTP_HOST'] ?? php_uname('n'));
diff --git a/src/Mailer/IMailer.php b/src/Mailer/IMailer.php
@@ -5,9 +5,6 @@
 interface IMailer
 {
 
-	/**
-	 * @param mixed $message
-	 */
-	public function send($message): void;
+	public function send(mixed $message): void;
 
 }
diff --git a/src/Mailer/TracyMailer.php b/src/Mailer/TracyMailer.php
@@ -11,11 +11,10 @@
 class TracyMailer implements IMailer
 {
 
-	/** @var string|null */
-	private $from;
+	private ?string $from = null;
 
 	/** @var mixed[] */
-	private $to = [];
+	private array $to = [];
 
 	/**
 	 * @param mixed[] $to
@@ -26,10 +25,7 @@ public function __construct(?string $from, array $to)
 		$this->to = $to;
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	public function send($message): void
+	public function send(mixed $message): void
 	{
 		/** @var string $host */
 		$host = preg_replace('#[^\w.-]+#', '', $_SERVER['HTTP_HOST'] ?? php_uname('n'));
diff --git a/src/SendMailLogger.php b/src/SendMailLogger.php
@@ -8,18 +8,17 @@
 class SendMailLogger extends AbstractLogger
 {
 
-	/** @var string */
-	private $emailSnooze = '2 days';
+	private string $emailSnooze = '2 days';
 
-	/** @var IMailer */
-	private $mailer;
+	private IMailer $mailer;
 
 	/** @var string[] */
-	private $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];
+	private array $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];
 
 	public function __construct(IMailer $mailer, string $directory)
 	{
 		parent::__construct($directory);
+
 		$this->mailer = $mailer;
 	}
 
@@ -41,10 +40,7 @@ public function setMailer(IMailer $mailer): void
 		$this->mailer = $mailer;
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	public function log($message, string $priority = ILogger::INFO): void
+	public function log(mixed $message, string $priority = ILogger::INFO): void
 	{
 		if (!in_array($priority, $this->allowedPriority, true)) {
 			return;
diff --git a/src/Sentry/SentryLogger.php b/src/Sentry/SentryLogger.php
@@ -26,10 +26,10 @@ class SentryLogger implements ILogger
 	public const CONFIG_OPTIONS = 'options';
 
 	/** @var mixed[] */
-	protected $configuration;
+	protected array $configuration;
 
 	/** @var string[] */
-	private $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];
+	private array $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];
 
 	/**
 	 * @param mixed[] $configuration
@@ -58,9 +58,8 @@ public function setAllowedPriority(array $allowedPriority): void
 	/**
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingParameterTypeHint
 	 * @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
-	 * @param mixed $message
 	 */
-	public function log($message, string $priority = ILogger::INFO): void
+	public function log(mixed $message, string $priority = ILogger::INFO): void
 	{
 		if (!in_array($priority, $this->allowedPriority, true)) {
 			return;
@@ -77,10 +76,7 @@ public function log($message, string $priority = ILogger::INFO): void
 		$this->makeRequest($message, $scope);
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	protected function makeRequest($message, Scope $scope): void
+	protected function makeRequest(mixed $message, Scope $scope): void
 	{
 		$client = ClientBuilder::create($this->configuration[self::CONFIG_OPTIONS] + ['dsn' => $this->configuration[self::CONFIG_URL]])
 			->getClient();
diff --git a/src/Slack/Formatter/ExceptionFormatter.php b/src/Slack/Formatter/ExceptionFormatter.php
@@ -32,7 +32,7 @@ public function format(SlackContext $context, Throwable $exception, string $prio
 
 		$message = $attachment->createField();
 		$message->setTitle(':mag_right: Exception');
-		$message->setValue(get_class($exception));
+		$message->setValue($exception::class);
 
 		$message = $attachment->createField();
 		$message->setTitle(':envelope: Message');
diff --git a/src/Slack/Formatter/ExceptionPreviousExceptionsFormatter.php b/src/Slack/Formatter/ExceptionPreviousExceptionsFormatter.php
@@ -19,7 +19,7 @@ public function format(SlackContext $context, Throwable $exception, string $prio
 
 			$message = $attachment->createField();
 			$message->setTitle(':mag_right: Exception');
-			$message->setValue(get_class($previous));
+			$message->setValue($previous::class);
 
 			$message = $attachment->createField();
 			$message->setTitle(':envelope: Message');
diff --git a/src/Slack/Formatter/ExceptionStackTraceFormatter.php b/src/Slack/Formatter/ExceptionStackTraceFormatter.php
@@ -16,15 +16,18 @@ public function format(SlackContext $context, Throwable $exception, string $prio
 
 		$context = clone $context;
 		$attachment = $context->createAttachment();
-		$attachment->setText(sprintf('*Stack trace* (_%s_)', get_class($exception)));
+		$attachment->setText(sprintf('*Stack trace* (_%s_)', $exception::class));
 		$attachment->setMarkdown();
 
 		foreach ($exception->getTrace() as $id => $trace) {
 			$func = $attachment->createField();
 			$func->setTitle(sprintf(':fireworks: Trace #%s', $id + 1));
 			$file = $attachment->createField();
 			$file->setTitle(':open_file_folder: File');
-			$file->setValue('```Function: ' . $trace['function'] . "\nFile: " . $trace['file'] . ':' . $trace['line'] . '```');
+			$fileInfo = isset($trace['file']) && isset($trace['line'])
+				? $trace['file'] . ':' . $trace['line']
+				: '[internal function]';
+			$file->setValue('```Function: ' . $trace['function'] . "\nFile: " . $fileInfo . '```');
 		}
 
 		return $context;
diff --git a/src/Slack/Formatter/SlackContext.php b/src/Slack/Formatter/SlackContext.php
@@ -8,16 +8,16 @@ final class SlackContext
 {
 
 	/** @var mixed[] */
-	private $config = [];
+	private array $config = [];
 
 	/** @var mixed[] */
-	private $data = [];
+	private array $data = [];
 
 	/** @var SlackContextField[] */
-	private $fields = [];
+	private array $fields = [];
 
 	/** @var SlackContextAttachment[] */
-	private $attachments = [];
+	private array $attachments = [];
 
 	/**
 	 * @param mixed[] $config
@@ -27,11 +27,7 @@ public function __construct(array $config)
 		$this->config = $config;
 	}
 
-	/**
-	 * @param mixed $default
-	 * @return mixed
-	 */
-	public function getConfig(string $key, $default = null)
+	public function getConfig(string $key, mixed $default = null): mixed
 	{
 		return func_num_args() > 1
 			? Arrays::get($this->config, explode('.', $key), $default)
diff --git a/src/Slack/Formatter/SlackContextAttachment.php b/src/Slack/Formatter/SlackContextAttachment.php
@@ -6,10 +6,10 @@ final class SlackContextAttachment
 {
 
 	/** @var mixed[] */
-	private $data = [];
+	private array $data = [];
 
 	/** @var SlackContextField[] */
-	private $fields = [];
+	private array $fields = [];
 
 	public function setFallback(string $fallback): void
 	{
diff --git a/src/Slack/Formatter/SlackContextField.php b/src/Slack/Formatter/SlackContextField.php
@@ -6,7 +6,7 @@ final class SlackContextField
 {
 
 	/** @var mixed[] */
-	private $data = [];
+	private array $data = [];
 
 	public function setTitle(string $title): void
 	{
diff --git a/src/Slack/SlackLogger.php b/src/Slack/SlackLogger.php
@@ -13,10 +13,10 @@ final class SlackLogger implements ILogger
 {
 
 	/** @var mixed[] */
-	private $config;
+	private array $config;
 
 	/** @var IFormatter[] */
-	private $formatters = [];
+	private array $formatters = [];
 
 	/**
 	 * @param mixed[] $config
@@ -31,10 +31,7 @@ public function addFormatter(IFormatter $formatter): void
 		$this->formatters[] = $formatter;
 	}
 
-	/**
-	 * @param mixed $message
-	 */
-	public function log($message, string $priority = ILogger::INFO): void
+	public function log(mixed $message, string $priority = ILogger::INFO): void
 	{
 		if (!in_array($priority, [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL], true)) {
 			return;
@@ -65,29 +62,28 @@ protected function makeRequest(SlackContext $context): void
 				'header' => 'Content-type: application/x-www-form-urlencoded',
 				'timeout' => $this->get('timeout', 30),
 				'content' => http_build_query([
-					'payload' => json_encode(array_filter($context->toArray())),
+					'payload' => json_encode(array_filter($context->toArray(), fn ($value): bool => $value !== null)),
 				]),
 			],
 		];
 
 		$response = @file_get_contents($url, false, stream_context_create($streamcontext));
 
+		// PHP 8.4+ uses http_get_last_response_headers(), older versions use $http_response_header
+		$headers = PHP_VERSION_ID >= 80400 ? http_get_last_response_headers() : ($http_response_header ?? []);
+
 		if ($response !== 'ok') {
 			throw new SlackBadRequestException([
 				'url' => $url,
 				'context' => $streamcontext,
 				'response' => [
-					'headers' => $http_response_header,
+					'headers' => $headers,
 				],
 			]);
 		}
 	}
 
-	/**
-	 * @param mixed $default
-	 * @return mixed
-	 */
-	protected function get(string $key, $default = null)
+	protected function get(string $key, mixed $default = null): mixed
 	{
 		return func_num_args() > 1
 			? Arrays::get($this->config, explode('.', $key), $default)
diff --git a/src/UniversalLogger.php b/src/UniversalLogger.php
@@ -8,7 +8,7 @@ class UniversalLogger implements TracyLogger
 {
 
 	/** @var ILogger[] */
-	private $loggers = [];
+	private array $loggers = [];
 
 	public function addLogger(ILogger $logger): void
 	{

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,7 @@`
`11`	`11`	`abstract class AbstractLogger implements ILogger`
`12`	`12`	`{`
`13`	`13`
`14`		`- /** @var string */`
`15`		`- protected $directory;`
	`14`	`+ protected string $directory;`
`16`	`15`
`17`	`16`	`public function __construct(string $directory)`
`18`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,19 +15,16 @@`
`15`	`15`	`class BlueScreenFileLogger extends AbstractLogger implements ILogger`
`16`	`16`	`{`
`17`	`17`
`18`		`- /** @var BlueScreen\|null */`
`19`		`- private $blueScreen;`
	`18`	`+ private ?BlueScreen $blueScreen = null;`
`20`	`19`
`21`	`20`	`public function __construct(string $directory, ?BlueScreen $blueScreen = null)`
`22`	`21`	`{`
`23`	`22`	`parent::__construct($directory);`
	`23`	`+`
`24`	`24`	`$this->blueScreen = $blueScreen;`
`25`	`25`	`}`
`26`	`26`
`27`		`- /**`
`28`		`- * @param mixed $message`
`29`		`- */`
`30`		`- public function log($message, string $priority = ILogger::INFO): void`
	`27`	`+ public function log(mixed $message, string $priority = ILogger::INFO): void`
`31`	`28`	`{`
`32`	`29`	`if (!is_dir($this->directory)) {`
`33`	`30`	`throw new InvalidStateException('Directory ' . $this->directory . ' is not found or is not directory.');`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,15 @@ final class SlackBadRequestException extends RuntimeException`
`8`	`8`	`{`
`9`	`9`
`10`	`10`	`/** @var mixed[] */`
`11`		`- private $request;`
	`11`	`+ private array $request;`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`* @param mixed[] $request`
`15`	`15`	`*/`
`16`	`16`	`public function __construct(array $request)`
`17`	`17`	`{`
`18`	`18`	`parent::__construct();`
	`19`	`+`
`19`	`20`	`$this->request = $request;`
`20`	`21`	`}`
`21`	`22`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,7 @@`
`14`	`14`	`class FileLogger extends AbstractLogger implements ILogger`
`15`	`15`	`{`
`16`	`16`
`17`		`- /**`
`18`		`- * @param mixed $message`
`19`		`- */`
`20`		`- public function log($message, string $priority = ILogger::INFO): void`
	`17`	`+ public function log(mixed $message, string $priority = ILogger::INFO): void`
`21`	`18`	`{`
`22`	`19`	`if (!is_dir($this->directory)) {`
`23`	`20`	`throw new InvalidStateException('Directory "' . $this->directory . '" is not found or is not directory.');`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ interface ILogger`
`14`	`14`	`public const EXCEPTION = TracyLogger::EXCEPTION;`
`15`	`15`	`public const CRITICAL = TracyLogger::CRITICAL;`
`16`	`16`
`17`		`- /**`
`18`		`- * @param mixed $message`
`19`		`- */`
`20`		`- public function log($message, string $priority = ILogger::INFO): void;`
	`17`	`+ public function log(mixed $message, string $priority = ILogger::INFO): void;`
`21`	`18`
`22`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,14 @@`
`8`	`8`	`class FileMailer implements IMailer`
`9`	`9`	`{`
`10`	`10`
`11`		`- /** @var string */`
`12`		`- private $directory;`
	`11`	`+ private string $directory;`
`13`	`12`
`14`	`13`	`public function __construct(string $directory)`
`15`	`14`	`{`
`16`	`15`	`$this->directory = $directory;`
`17`	`16`	`}`
`18`	`17`
`19`		`- /**`
`20`		`- * @param mixed $message`
`21`		`- */`
`22`		`- public function send($message): void`
	`18`	`+ public function send(mixed $message): void`
`23`	`19`	`{`
`24`	`20`	`/** @var string $host */`
`25`	`21`	`$host = preg_replace('#[^\w.-]+#', '', $_SERVER['HTTP_HOST'] ?? php_uname('n'));`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,6 @@`
`5`	`5`	`interface IMailer`
`6`	`6`	`{`
`7`	`7`
`8`		`- /**`
`9`		`- * @param mixed $message`
`10`		`- */`
`11`		`- public function send($message): void;`
	`8`	`+ public function send(mixed $message): void;`
`12`	`9`
`13`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,18 +8,17 @@`
`8`	`8`	`class SendMailLogger extends AbstractLogger`
`9`	`9`	`{`
`10`	`10`
`11`		`- /** @var string */`
`12`		`- private $emailSnooze = '2 days';`
	`11`	`+ private string $emailSnooze = '2 days';`
`13`	`12`
`14`		`- /** @var IMailer */`
`15`		`- private $mailer;`
	`13`	`+ private IMailer $mailer;`
`16`	`14`
`17`	`15`	`/** @var string[] */`
`18`		`- private $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];`
	`16`	`+ private array $allowedPriority = [ILogger::ERROR, ILogger::EXCEPTION, ILogger::CRITICAL];`
`19`	`17`
`20`	`18`	`public function __construct(IMailer $mailer, string $directory)`
`21`	`19`	`{`
`22`	`20`	`parent::__construct($directory);`
	`21`	`+`
`23`	`22`	`$this->mailer = $mailer;`
`24`	`23`	`}`
`25`	`24`
`@@ -41,10 +40,7 @@ public function setMailer(IMailer $mailer): void`
`41`	`40`	`$this->mailer = $mailer;`
`42`	`41`	`}`
`43`	`42`
`44`		`- /**`
`45`		`- * @param mixed $message`
`46`		`- */`
`47`		`- public function log($message, string $priority = ILogger::INFO): void`
	`43`	`+ public function log(mixed $message, string $priority = ILogger::INFO): void`
`48`	`44`	`{`
`49`	`45`	`if (!in_array($priority, $this->allowedPriority, true)) {`
`50`	`46`	`return;`