From 15750f314ccccf80fc086adabdc738d4391fca22 Mon Sep 17 00:00:00 2001
From: Divarion-D <danil.dmitrievn@gmail.com>
Date: Wed, 24 Jun 2026 20:33:55 +0300
Subject: [PATCH] =?UTF-8?q?chore(psr4):=20phase=203=20(Core=20leaf)=20?=
 =?UTF-8?q?=E2=80=94=20namespace=20Core/Logging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move the Core/Logging layer into XcVm\Core\Logging (Logger, LoggerInterface,
FileLogger, DatabaseLogger, UpdateLogger). Composer PSR-4 now resolves them.

- Add namespace to the 5 logging classes; built-in \Throwable qualified in
  Logger; same-namespace LoggerInterface references unqualified.
- Add 'use XcVm\Core\Logging\...;' to the 16 referencing files (bootstrap,
  web/stream bootstraps, stream entry points, Database, EPG, update command/cron,
  auth, ministra) — call sites unchanged.
- Authenticator::logRecaptcha: drop the now-dead class_exists/method_exists
  guard (Logger is always autoloadable post-Composer) and call Logger::log
  directly.

Procedural Core/Error + Core/Config constants files (ErrorCodes/ErrorHandler/
AppConfig/Binaries/Paths — no classes) intentionally left global per plan.

Verified: php -l clean; PHPStan no errors; PHPUnit 295/295.
---
 src/Cli/Commands/UpdateCommand.php                     |  1 +
 src/Cli/CronJobs/UpdateCronJob.php                     |  1 +
 src/Core/Auth/Authenticator.php                        |  8 +++-----
 src/Core/Database/Database.php                         |  1 +
 src/Core/Http/RequestGuard.php                         |  1 +
 src/Core/Logging/DatabaseLogger.php                    |  2 ++
 src/Core/Logging/FileLogger.php                        |  2 ++
 src/Core/Logging/Logger.php                            | 10 ++++++----
 src/Core/Logging/LoggerInterface.php                   |  2 ++
 src/Core/Logging/UpdateLogger.php                      |  2 ++
 src/Domain/Epg/EPG.php                                 |  1 +
 .../bootstrap/StreamingRequestBootstrap.php            |  1 +
 src/Infrastructure/bootstrap/WebApiBootstrap.php       |  1 +
 src/Public/stream/auth.php                             |  1 +
 src/Public/stream/live.php                             |  1 +
 src/Public/stream/rtmp.php                             |  1 +
 src/Public/stream/timeshift.php                        |  1 +
 src/Public/stream/vod.php                              |  1 +
 src/Streaming/Auth/StreamAuthMiddleware.php            |  1 +
 src/bootstrap.php                                      |  1 +
 src/ministra/MinistraBootstrap.php                     |  1 +
 21 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/src/Cli/Commands/UpdateCommand.php b/src/Cli/Commands/UpdateCommand.php
index 7bbab147..cbb30f78 100644
--- a/src/Cli/Commands/UpdateCommand.php
+++ b/src/Cli/Commands/UpdateCommand.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\UpdateLogger;
 /**
  * UpdateCommand — update command
  *
diff --git a/src/Cli/CronJobs/UpdateCronJob.php b/src/Cli/CronJobs/UpdateCronJob.php
index 6a0f29bd..493536d1 100644
--- a/src/Cli/CronJobs/UpdateCronJob.php
+++ b/src/Cli/CronJobs/UpdateCronJob.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\FileLogger;
 /**
  * UpdateCronJob — update cron job
  *
diff --git a/src/Core/Auth/Authenticator.php b/src/Core/Auth/Authenticator.php
index 8d575908..e04cdd4f 100644
--- a/src/Core/Auth/Authenticator.php
+++ b/src/Core/Auth/Authenticator.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+use XcVm\Core\Logging\Logger;
 
 /**
  * Authenticator — authenticator
@@ -68,11 +69,8 @@ class Authenticator {
 
 	/** Writes a reCAPTCHA diagnostic line to the panel log (visible on-screen in DEV_MODE). */
 	private static function logRecaptcha(string $rReason): void {
-		if (class_exists('Logger') && method_exists('Logger', 'log')) {
-			Logger::log('WARNING', '[reCAPTCHA] ' . $rReason, '', __FILE__, __LINE__);
-		} else {
-			error_log('[reCAPTCHA] ' . $rReason);
-		}
+		// Logger is always autoloadable (Composer PSR-4); no defensive guard needed.
+		Logger::log('WARNING', '[reCAPTCHA] ' . $rReason, '', __FILE__, __LINE__);
 	}
 
 	/**
diff --git a/src/Core/Database/Database.php b/src/Core/Database/Database.php
index 86b5bdcf..ac242751 100644
--- a/src/Core/Database/Database.php
+++ b/src/Core/Database/Database.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\FileLogger;
 /**
  * Database — database
  *
diff --git a/src/Core/Http/RequestGuard.php b/src/Core/Http/RequestGuard.php
index d31e80ea..093228b0 100644
--- a/src/Core/Http/RequestGuard.php
+++ b/src/Core/Http/RequestGuard.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\Logger;
 /**
  * Защита HTTP-запросов и инициализация логгера
  *
diff --git a/src/Core/Logging/DatabaseLogger.php b/src/Core/Logging/DatabaseLogger.php
index 643ee61a..7bcbd79a 100644
--- a/src/Core/Logging/DatabaseLogger.php
+++ b/src/Core/Logging/DatabaseLogger.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Logging;
+
 /**
  * Логгер клиентских запросов (запись в файл для последующей вставки в БД)
  *
diff --git a/src/Core/Logging/FileLogger.php b/src/Core/Logging/FileLogger.php
index 7a5fea72..32f4d97a 100644
--- a/src/Core/Logging/FileLogger.php
+++ b/src/Core/Logging/FileLogger.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Logging;
+
 /**
  * Файловый логгер
  *
diff --git a/src/Core/Logging/Logger.php b/src/Core/Logging/Logger.php
index 9ee03a63..9ced25a9 100644
--- a/src/Core/Logging/Logger.php
+++ b/src/Core/Logging/Logger.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Logging;
+
 /**
  * A centralized logger class for handling PHP errors, exceptions, and fatal errors.
  * Logs all events to a file in base64-encoded JSON format and optionally displays them on screen.
@@ -84,9 +86,9 @@ final class Logger {
     /**
      * Handler for uncaught exceptions.
      *
-     * @param Throwable $e The uncaught exception
+     * @param \Throwable $e The uncaught exception
      */
-    public static function handleException(Throwable $e): void {
+    public static function handleException(\Throwable $e): void {
         self::log(
             'EXCEPTION',
             $e->getMessage(),
@@ -181,11 +183,11 @@ final class Logger {
     /**
      * Builds a stack trace for an exception chain (including previous exceptions).
      *
-     * @param Throwable $e The exception
+     * @param \Throwable $e The exception
      *
      * @return string Formatted trace string
      */
-    private static function buildExceptionTrace(Throwable $e): string {
+    private static function buildExceptionTrace(\Throwable $e): string {
         $out = [];
 
         do {
diff --git a/src/Core/Logging/LoggerInterface.php b/src/Core/Logging/LoggerInterface.php
index 9a662267..bfe07dba 100644
--- a/src/Core/Logging/LoggerInterface.php
+++ b/src/Core/Logging/LoggerInterface.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Logging;
+
 /**
  * Контракт логирования
  *
diff --git a/src/Core/Logging/UpdateLogger.php b/src/Core/Logging/UpdateLogger.php
index e2254ae0..e99087bd 100644
--- a/src/Core/Logging/UpdateLogger.php
+++ b/src/Core/Logging/UpdateLogger.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace XcVm\Core\Logging;
+
 /**
  * UpdateLogger — dedicated log for system update operations.
  *
diff --git a/src/Domain/Epg/EPG.php b/src/Domain/Epg/EPG.php
index 1f02ef57..ddfc7504 100644
--- a/src/Domain/Epg/EPG.php
+++ b/src/Domain/Epg/EPG.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\FileLogger;
 /**
  * EPG — e p g
  *
diff --git a/src/Infrastructure/bootstrap/StreamingRequestBootstrap.php b/src/Infrastructure/bootstrap/StreamingRequestBootstrap.php
index 3946bb5f..aeaa55f6 100644
--- a/src/Infrastructure/bootstrap/StreamingRequestBootstrap.php
+++ b/src/Infrastructure/bootstrap/StreamingRequestBootstrap.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\Logger;
 /**
  * StreamingRequestBootstrap — bootstrap для streaming HTTP endpoint'ов
  *
diff --git a/src/Infrastructure/bootstrap/WebApiBootstrap.php b/src/Infrastructure/bootstrap/WebApiBootstrap.php
index f5420ac6..571a012c 100644
--- a/src/Infrastructure/bootstrap/WebApiBootstrap.php
+++ b/src/Infrastructure/bootstrap/WebApiBootstrap.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\Logger;
 /**
  * WebApiBootstrap — bootstrap для web API endpoint'ов
  *
diff --git a/src/Public/stream/auth.php b/src/Public/stream/auth.php
index 45a75b30..ef74701d 100644
--- a/src/Public/stream/auth.php
+++ b/src/Public/stream/auth.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * Stream authentication and session handler
  *
diff --git a/src/Public/stream/live.php b/src/Public/stream/live.php
index 4a3d0ecd..4856cc33 100644
--- a/src/Public/stream/live.php
+++ b/src/Public/stream/live.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * Live stream delivery endpoint
  *
diff --git a/src/Public/stream/rtmp.php b/src/Public/stream/rtmp.php
index df74e44d..840d03d1 100644
--- a/src/Public/stream/rtmp.php
+++ b/src/Public/stream/rtmp.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * RTMP stream handler
  *
diff --git a/src/Public/stream/timeshift.php b/src/Public/stream/timeshift.php
index 42556872..e35550bb 100644
--- a/src/Public/stream/timeshift.php
+++ b/src/Public/stream/timeshift.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * Timeshift stream endpoint
  *
diff --git a/src/Public/stream/vod.php b/src/Public/stream/vod.php
index 37d57164..1f3afd50 100644
--- a/src/Public/stream/vod.php
+++ b/src/Public/stream/vod.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * VOD stream delivery endpoint
  *
diff --git a/src/Streaming/Auth/StreamAuthMiddleware.php b/src/Streaming/Auth/StreamAuthMiddleware.php
index 44dd9205..dbf00859 100644
--- a/src/Streaming/Auth/StreamAuthMiddleware.php
+++ b/src/Streaming/Auth/StreamAuthMiddleware.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\DatabaseLogger;
 /**
  * Общий streaming auth middleware для live/vod/timeshift.
  *
diff --git a/src/bootstrap.php b/src/bootstrap.php
index d887d83e..c19d9dd3 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -54,6 +54,7 @@
  */
 
 declare(strict_types=0);
+use XcVm\Core\Logging\Logger;
 
 // ─────────────────────────────────────────────────────────────────
 //  1. Class autoloader
diff --git a/src/ministra/MinistraBootstrap.php b/src/ministra/MinistraBootstrap.php
index a177582c..697d8582 100644
--- a/src/ministra/MinistraBootstrap.php
+++ b/src/ministra/MinistraBootstrap.php
@@ -1,5 +1,6 @@
 <?php
 
+use XcVm\Core\Logging\Logger;
 /**
  * Named bootstrap for the Ministra (Stalker Portal) boundary.
  *